lkml.org 
[lkml]   [2018]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 7/8] x86/mm/cpa: Factor common code between cpa_flush_*()
The start of cpa_flush_range() and cpa_flush_array() is the same, use
a common function.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/mm/pageattr.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)

--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -285,22 +285,28 @@ static void cpa_flush_all(unsigned long
on_each_cpu(__cpa_flush_all, (void *) cache, 1);
}

-static void cpa_flush_range(unsigned long start, int numpages, int cache)
+static bool __cpa_flush_range(unsigned long start, int numpages, int cache)
{
- unsigned int i, level;
- unsigned long addr;
-
BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
+
WARN_ON(PAGE_ALIGN(start) != start);

if (!static_cpu_has(X86_FEATURE_CLFLUSH)) {
cpa_flush_all(cache);
- return;
+ return true;
}

flush_tlb_kernel_range(start, start + PAGE_SIZE * numpages);

- if (!cache)
+ return !cache;
+}
+
+static void cpa_flush_range(unsigned long start, int numpages, int cache)
+{
+ unsigned int i, level;
+ unsigned long addr;
+
+ if (__cpa_flush_range(start, numpages, cache))
return;

/*
@@ -326,16 +332,7 @@ static void cpa_flush_array(unsigned lon
{
unsigned int i, level;

- 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);
-
- if (!cache)
+ if (__cpa_flush_range(baddr, numpages, cache))
return;

/*

\
 
 \ /
  Last update: 2018-09-19 11:01    [W:0.164 / U:6.908 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site