iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mm/cpa: Move CLFLUSH test into cpa_flush_array()

Browse Source 
Rather than guarding cpa_flush_array() users with a CLFLUSH test, put
it inside.

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/20180919085948.087848187@infradead.org
This commit is contained in:
Peter Zijlstra 2018-09-19 10:50:22 +02:00 committed by Thomas Gleixner
parent 5f464b33b1
commit fce2ce9544
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/x86/mm/pageattr.c
View File

@ -328,6 +328,11 @@ static void cpa_flush_array(unsigned long baddr, unsigned long *start,
BUG_ON(irqs_disabled() && !early_boot_irqs_disabled); BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
if (!static_cpu_has(X86_FEATURE_CLFLUSH)) {
cpa_flush_all(cache);
return;
}
flush_tlb_kernel_range(baddr, baddr + PAGE_SIZE * numpages); flush_tlb_kernel_range(baddr, baddr + PAGE_SIZE * numpages);
if (!cache) if (!cache)
@ -1756,19 +1761,19 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
cache = !!pgprot2cachemode(mask_set); cache = !!pgprot2cachemode(mask_set);
/* /*
* On success we use CLFLUSH, when the CPU supports it to * On error; flush everything to be sure.
* avoid the WBINVD. If the CPU does not support it and in the
* error case we fall back to cpa_flush_all (which uses
* WBINVD):
*/ */
if (!ret && boot_cpu_has(X86_FEATURE_CLFLUSH)) { if (ret) {
if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
cpa_flush_array(baddr, addr, numpages, cache,
cpa.flags, pages);
} else
cpa_flush_range(baddr, numpages, cache);
} else
cpa_flush_all(cache); cpa_flush_all(cache);
goto out;
}
if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
cpa_flush_array(baddr, addr, numpages, cache,
cpa.flags, pages);
} else {
cpa_flush_range(baddr, numpages, cache);
}
out: out:
return ret; return ret;