linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bin.yang@intel.com, hpa@zytor.com, dave.hansen@intel.com,
	mingo@kernel.org, tglx@linutronix.de,
	linux-kernel@vger.kernel.org, mark.gross@intel.com,
	peterz@infradead.org
Subject: [tip:x86/mm] x86/mm/cpa: Factor common code between cpa_flush_*()
Date: Thu, 27 Sep 2018 11:55:20 -0700	[thread overview]
Message-ID: <tip-47e262ac5b84015c4a101ff51767c464fb7497a6@git.kernel.org> (raw)
In-Reply-To: <20180919085948.138859183@infradead.org>

Commit-ID:  47e262ac5b84015c4a101ff51767c464fb7497a6
Gitweb:     https://git.kernel.org/tip/47e262ac5b84015c4a101ff51767c464fb7497a6
Author:     Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 19 Sep 2018 10:50:23 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 27 Sep 2018 20:39:42 +0200

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>
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.138859183@infradead.org

---
 arch/x86/mm/pageattr.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 33d89d505f93..dc552824e86a 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -285,22 +285,28 @@ static void cpa_flush_all(unsigned long cache)
 	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 long baddr, unsigned long *start,
 {
 	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;
 
 	/*

  reply	other threads:[~2018-09-27 18:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-19  8:50 [PATCH 0/8] x86/mm/cpa: Further optimizations Peter Zijlstra
2018-09-19  8:50 ` [PATCH 1/8] x86/mm/cpa: Use flush_tlb_all() Peter Zijlstra
2018-09-19  9:15   ` Peter Zijlstra
2018-09-19 10:08     ` Thomas Gleixner
2018-09-27 18:51   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 2/8] x86/mm/cpa: Move flush_tlb_all() Peter Zijlstra
2018-09-21 21:34   ` Dave Hansen
2018-09-22 10:37     ` Peter Zijlstra
2018-09-24 16:11       ` Dave Hansen
2018-09-27 18:52   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 3/8] x86/mm/cpa: Unconditionally avoid WBINDV when we can Peter Zijlstra
2018-09-27 18:53   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 4/8] x86/mm/cpa: Use flush_tlb_kernel_range() Peter Zijlstra
2018-09-27 18:53   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 5/8] x86/mm/cpa: Move CLFLUSH test into cpa_flush_range() Peter Zijlstra
2018-09-27 18:54   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 6/8] x86/mm/cpa: Move CLFLUSH test into cpa_flush_array() Peter Zijlstra
2018-09-27 18:54   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-19  8:50 ` [PATCH 7/8] x86/mm/cpa: Factor common code between cpa_flush_*() Peter Zijlstra
2018-09-27 18:55   ` tip-bot for Peter Zijlstra [this message]
2018-09-19  8:50 ` [PATCH 8/8] x86/mm/cpa: Optimize __cpa_flush_range() Peter Zijlstra
2018-09-27 18:55   ` [tip:x86/mm] " tip-bot for Peter Zijlstra
2018-09-21 22:50 ` [PATCH 0/8] x86/mm/cpa: Further optimizations Dave Hansen
2018-09-21 22:50 ` Dave Hansen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-47e262ac5b84015c4a101ff51767c464fb7497a6@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bin.yang@intel.com \
    --cc=dave.hansen@intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mark.gross@intel.com \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).