]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
x86/mm/cpa: Use flush_tlb_kernel_range()
authorPeter Zijlstra <peterz@infradead.org>
Wed, 19 Sep 2018 08:50:20 +0000 (10:50 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 27 Sep 2018 18:39:41 +0000 (20:39 +0200)
Both cpa_flush_range() and cpa_flush_array() have a well specified
range, use that to do a range based TLB invalidate.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: Bin Yang <bin.yang@intel.com>
Cc: Mark Gross <mark.gross@intel.com>
Link: https://lkml.kernel.org/r/20180919085947.985193217@infradead.org
arch/x86/mm/pageattr.c

index bd9b0ac0735251bf82ff9b84f471f9da0196c0ab..02eb18403594aa81fcac92d91d47931e78a3abb4 100644 (file)
@@ -293,7 +293,7 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
        BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
        WARN_ON(PAGE_ALIGN(start) != start);
 
-       flush_tlb_all();
+       flush_tlb_kernel_range(start, start + PAGE_SIZE * numpages);
 
        if (!cache)
                return;
@@ -315,14 +315,15 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
        }
 }
 
-static void cpa_flush_array(unsigned long *start, int numpages, int cache,
+static void cpa_flush_array(unsigned long baddr, unsigned long *start,
+                           int numpages, int cache,
                            int in_flags, struct page **pages)
 {
        unsigned int i, level;
 
        BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
 
-       flush_tlb_all();
+       flush_tlb_kernel_range(baddr, baddr + PAGE_SIZE * numpages);
 
        if (!cache)
                return;
@@ -1757,7 +1758,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
         */
        if (!ret && boot_cpu_has(X86_FEATURE_CLFLUSH)) {
                if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
-                       cpa_flush_array(addr, numpages, cache,
+                       cpa_flush_array(baddr, addr, numpages, cache,
                                        cpa.flags, pages);
                } else
                        cpa_flush_range(baddr, numpages, cache);