Skip to contentSkip to conversation

x86: Misc bug fixes in pageattr.c

PATCH In review [email protected] 2 participants 4 messages May 22, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover x86: Misc bug fixes in pageattr.c

Couple of misc bugfixes in pageattr.c found by looking at the code while working on an unrelated patch.

#2 lore raw

PATCH 2/2 x86: cpa_flush_array wbinvd should be done on all CPUs

cpa_flush_array seems to prefer wbinvd() over clflush at 4M threshold. clflush needs to be done on only one CPU as per instruction definition. wbinvd() however, should be done on all CPUs.

---
 arch/x86/mm/pageattr.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
arch/x86/mm/pageattr.c +7 -1
index 2cc019a..0f9052b 100644
@@ -204,6 +204,11 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
 	}
 }
 
+static void wbinvd_local(void *unused)
+{
+	wbinvd();
+}
+
 static void cpa_flush_array(unsigned long *start, int numpages, int cache,
 			    int in_flags, struct page **pages)
 {
@@ -219,7 +224,8 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
 	/* 4M threshold */
 	if (numpages >= 1024) {
 		if (boot_cpu_data.x86 >= 4)
-			wbinvd();
+			on_each_cpu(wbinvd_local, NULL, 1);
+
 		return;
 	}
 	/*
Signature · 3 lines
1.6.0.6

-- 
#1 lore raw

PATCH 1/2 x86: bugfix wbinvd() model check instead of family check

In reply to [email protected]

wbinvd is supported on all CPUs 486 or later. But, pageattr.c is checking x86_model >= 4 before wbinvd(), which looks like an oversight bug. It was first introduced at one place by changeset d7c8f21a8cad0228c7c5ce2bb6dbd95d1ee49d13 and got copied over to second place in the same file later.

---
 arch/x86/mm/pageattr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/pageattr.c +2 -2
index 797f9f1..2cc019a 100644
@@ -153,7 +153,7 @@ static void __cpa_flush_all(void *arg)
 	 */
 	__flush_tlb_all();
 
-	if (cache && boot_cpu_data.x86_model >= 4)
+	if (cache && boot_cpu_data.x86 >= 4)
 		wbinvd();
 }
 
@@ -218,7 +218,7 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
 
 	/* 4M threshold */
 	if (numpages >= 1024) {
-		if (boot_cpu_data.x86_model >= 4)
+		if (boot_cpu_data.x86 >= 4)
 			wbinvd();
 		return;
 	}
Signature · 3 lines
1.6.0.6

--