Skip to content

Commit

Permalink
x86/mm/cpa: Use flush_tlb_kernel_range()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Peter Zijlstra authored and Thomas Gleixner committed Sep 27, 2018
1 parent ddd07b7 commit a7295fd
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/x86/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a7295fd

Please sign in to comment.