arm64: mm: Optimise tlb flush logic where we have >4K granule

The tlb maintainence functions: __cpu_flush_user_tlb_range and
__cpu_flush_kern_tlb_range do not take into consideration the page
granule when looping through the address range, and repeatedly flush
tlb entries for the same page when operating with 64K pages.

This patch re-works the logic s.t. we instead advance the loop by
 1 << (PAGE_SHIFT - 12), so avoid repeating ourselves.

Also the routines have been converted from assembler to static inline
functions to aid with legibility and potential compiler optimisations.

The isb() has been removed from flush_tlb_kernel_range(.) as it is
only needed when changing the execute permission of a mapping. If one
needs to set an area of the kernel as execute/non-execute an isb()
must be inserted after the call to flush_tlb_kernel_range.

Cc: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 25 insertions, 5 deletions

diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h
index 8b482035cfc2..7881d7dbb9ba 100644
--- a/arch/arm64/include/asm/tlbflush.h
+++ b/arch/arm64/include/asm/tlbflush.h
@@ -98,11 +98,31 @@ static inline void flush_tlb_page(struct vm_area_struct *vma,
         dsb();
 }
 
-/*
- * Convert calls to our calling convention.
- */
-#define flush_tlb_range(vma,start,end)  __cpu_flush_user_tlb_range(start,end,vma)
-#define flush_tlb_kernel_range(s,e)     __cpu_flush_kern_tlb_range(s,e)
+static inline void flush_tlb_range(struct vm_area_struct *vma,
+                                        unsigned long start, unsigned long end)
+{
+        unsigned long asid = (unsigned long)ASID(vma->vm_mm) << 48;
+        unsigned long addr;
+        start = asid | (start >> 12);
+        end = asid | (end >> 12);
+
+        dsb(ishst);
+        for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12))
+                asm("tlbi vae1is, %0" : : "r"(addr));
+        dsb(ish);
+}
+
+static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        unsigned long addr;
+        start >>= 12;
+        end >>= 12;
+
+        dsb(ishst);
+        for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12))
+                asm("tlbi vaae1is, %0" : : "r"(addr));
+        dsb(ish);
+}
 
 /*
  * On AArch64, the cache coherency is handled via the set_pte_at() function.