Skip to content

Commit 64212d6

Browse files
ryanhrobctmarinas
authored andcommitted
arm64: mm: Refactor flush_tlb_page() to use __tlbi_level_asid()
Now that we have __tlbi_level_asid(), let's refactor the *flush_tlb_page*() variants to use it rather than open coding. The emitted tlbi(s) is/are intended to be exactly the same as before; no TTL hint is provided. Although the spec for flush_tlb_page() allows for setting the TTL hint to 3, it turns out that flush_tlb_fix_spurious_fault_pmd() depends on local_flush_tlb_page_nonotify() to invalidate the level 2 entry. This will be fixed separately. Reviewed-by: Linu Cherian <linu.cherian@arm.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Signed-off-by: Ryan Roberts <ryan.roberts@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent c753d66 commit 64212d6

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

arch/arm64/include/asm/tlbflush.h

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,8 @@ static inline void flush_tlb_mm(struct mm_struct *mm)
346346
static inline void __local_flush_tlb_page_nonotify_nosync(struct mm_struct *mm,
347347
unsigned long uaddr)
348348
{
349-
unsigned long addr;
350-
351349
dsb(nshst);
352-
addr = __TLBI_VADDR(uaddr, ASID(mm));
353-
__tlbi(vale1, addr);
354-
__tlbi_user(vale1, addr);
350+
__tlbi_level_asid(vale1, uaddr, TLBI_TTL_UNKNOWN, ASID(mm));
355351
}
356352

357353
static inline void local_flush_tlb_page_nonotify(struct vm_area_struct *vma,
@@ -373,12 +369,8 @@ static inline void local_flush_tlb_page(struct vm_area_struct *vma,
373369
static inline void __flush_tlb_page_nosync(struct mm_struct *mm,
374370
unsigned long uaddr)
375371
{
376-
unsigned long addr;
377-
378372
dsb(ishst);
379-
addr = __TLBI_VADDR(uaddr, ASID(mm));
380-
__tlbi(vale1is, addr);
381-
__tlbi_user(vale1is, addr);
373+
__tlbi_level_asid(vale1is, uaddr, TLBI_TTL_UNKNOWN, ASID(mm));
382374
mmu_notifier_arch_invalidate_secondary_tlbs(mm, uaddr & PAGE_MASK,
383375
(uaddr & PAGE_MASK) + PAGE_SIZE);
384376
}

0 commit comments

Comments
 (0)