Skip to content

Commit 752a0d1

Browse files
ryanhrobctmarinas
authored andcommitted
arm64: mm: Provide level hint for flush_tlb_page()
Previously tlb invalidations issued by __flush_tlb_page() did not contain a level hint. From the core API documentation, this function is clearly only ever intended to target level 3 (PTE) tlb entries: | 4) ``void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)`` | | This time we need to remove the PAGE_SIZE sized translation | from the TLB. However, the arm64 documentation is more relaxed allowing any last level: | this operation only invalidates a single, last-level page-table | entry and therefore does not affect any walk-caches It turns out that the function was actually being used to invalidate a level 2 mapping via flush_tlb_fix_spurious_fault_pmd(). The bug was benign because the level hint was not set so the HW would still invalidate the PMD mapping, and also because the TLBF_NONOTIFY flag was set, the bounds of the mapping were never used for anything else. Now that we have the new and improved range-invalidation API, it is trival to fix flush_tlb_fix_spurious_fault_pmd() to explicitly flush the whole range (locally, without notification and last level only). So let's do that, and then update __flush_tlb_page() to hint level 3. Reviewed-by: Linu Cherian <linu.cherian@arm.com> Signed-off-by: Ryan Roberts <ryan.roberts@arm.com> [catalin.marinas@arm.com: use "level 3" in the __flush_tlb_page() description] [catalin.marinas@arm.com: tweak the commit message to include the core API text] Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 15397e3 commit 752a0d1

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

arch/arm64/include/asm/pgtable.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ static inline void arch_leave_lazy_mmu_mode(void)
103103
#define flush_tlb_fix_spurious_fault(vma, address, ptep) \
104104
__flush_tlb_page(vma, address, TLBF_NOBROADCAST | TLBF_NONOTIFY)
105105

106-
#define flush_tlb_fix_spurious_fault_pmd(vma, address, pmdp) \
107-
__flush_tlb_page(vma, address, TLBF_NOBROADCAST | TLBF_NONOTIFY)
106+
#define flush_tlb_fix_spurious_fault_pmd(vma, address, pmdp) \
107+
__flush_tlb_range(vma, address, address + PMD_SIZE, PMD_SIZE, 2, \
108+
TLBF_NOBROADCAST | TLBF_NONOTIFY | TLBF_NOWALKCACHE)
108109

109110
/*
110111
* ZERO_PAGE is a global shared page that is always zero: used

arch/arm64/include/asm/tlbflush.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static inline void __tlbi_sync_s1ish_hyp(void)
300300
* __flush_tlb_page(vma, addr, flags)
301301
* Invalidate a single user mapping for address 'addr' in the
302302
* address space corresponding to 'vma->mm'. Note that this
303-
* operation only invalidates a single, last-level page-table entry
303+
* operation only invalidates a single level 3 page-table entry
304304
* and therefore does not affect any walk-caches. flags may contain
305305
* any combination of TLBF_NONOTIFY (don't call mmu notifiers),
306306
* TLBF_NOSYNC (don't issue trailing dsb) and TLBF_NOBROADCAST
@@ -591,7 +591,7 @@ static inline void __flush_tlb_page(struct vm_area_struct *vma,
591591
unsigned long start = round_down(uaddr, PAGE_SIZE);
592592
unsigned long end = start + PAGE_SIZE;
593593

594-
__do_flush_tlb_range(vma, start, end, PAGE_SIZE, TLBI_TTL_UNKNOWN,
594+
__do_flush_tlb_range(vma, start, end, PAGE_SIZE, 3,
595595
TLBF_NOWALKCACHE | flags);
596596
}
597597

0 commit comments

Comments
 (0)