Skip to contentSkip to conversation

x86:perf_counter cleanup

git-pull -tip Jaswinder Singh Rajput 3 participants 9 messages Mar 8, 2009 x86

lore
Share & tools
lore
#0 lore raw

The following changes since commit 880860e392d92c457e8116cdee39ec4d109174ee:
Paul Mackerras (1):
perfcounters/powerpc: add support for POWER4 processors

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git perfcounters/core

Jaswinder Singh Rajput (2):
x86: perf_counter.c remove unused variables
x86: perf_counter.c fix style problems

 arch/x86/kernel/cpu/perf_counter.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

Complete diff:

arch/x86/kernel/cpu/perf_counter.c +6 -10
index f585371..7460895 100644
@@ -17,7 +17,6 @@
 #include <linux/kdebug.h>
 #include <linux/sched.h>
 
-#include <asm/perf_counter.h>
 #include <asm/apic.h>
 
 static bool perf_counters_initialized __read_mostly;
@@ -263,6 +262,9 @@ static u64 pmc_amd_save_disable_all(void)
 	return enabled;
 }
 
+/*
+ * Exported because of ACPI idle
+ */
 u64 hw_perf_save_disable(void)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -270,9 +272,6 @@ u64 hw_perf_save_disable(void)
 
 	return pmc_ops->save_disable_all();
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
 static void pmc_intel_restore_all(u64 ctrl)
@@ -301,6 +300,9 @@ static void pmc_amd_restore_all(u64 ctrl)
 	}
 }
 
+/*
+ * Exported because of ACPI idle
+ */
 void hw_perf_restore(u64 ctrl)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -308,9 +310,6 @@ void hw_perf_restore(u64 ctrl)
 
 	pmc_ops->restore_all(ctrl);
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_restore);
 
 static u64 pmc_intel_get_status(u64 mask)
@@ -954,9 +953,6 @@ static struct pmc_x86_ops *pmc_intel_init(void)
 
 static struct pmc_x86_ops *pmc_amd_init(void)
 {
-	u64 old;
-	int bits;
-
 	nr_counters_generic = 4;
 	nr_counters_fixed = 0;
 	counter_value_mask = 0x0000FFFFFFFFFFFFULL;
#1 lore raw
Quoted 27 lines · Jaswinder Singh Rajput
arch/x86/kernel/cpu/perf_counter.c +6 -3
+/*
+ * Exported because of ACPI idle
+ */
 u64 hw_perf_save_disable(void)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -270,9 +272,6 @@ u64 hw_perf_save_disable(void)
 
 	return pmc_ops->save_disable_all();
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
 static void pmc_intel_restore_all(u64 ctrl)
@@ -301,6 +300,9 @@ static void pmc_amd_restore_all(u64 ctrl)
 	}
 }
 
+/*
+ * Exported because of ACPI idle
+ */
 void hw_perf_restore(u64 ctrl)
 {
 	if (unlikely(!perf_counters_initialized))

arch/x86/kernel/cpu/perf_counter.c void hw_perf_restore(u64 ctrl) · line 313

Quoted 7 lines
arch/x86/kernel/cpu/perf_counter.c +0 -3
@@ -308,9 +310,6 @@ void hw_perf_restore(u64 ctrl)
 
 	pmc_ops->restore_all(ctrl);
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_restore);

Please leave those comments where they are, they do not describe the function, but comment on the export.

#2 lore raw

Hello Peter,

Quoted 30 lines · Peter Zijlstra
Quoted 28 lines · Jaswinder Singh Rajput
arch/x86/kernel/cpu/perf_counter.c +6 -3
+/*
+ * Exported because of ACPI idle
+ */
 u64 hw_perf_save_disable(void)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -270,9 +272,6 @@ u64 hw_perf_save_disable(void)
 
 	return pmc_ops->save_disable_all();
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
 static void pmc_intel_restore_all(u64 ctrl)
@@ -301,6 +300,9 @@ static void pmc_amd_restore_all(u64 ctrl)
 	}
 }
 
+/*
+ * Exported because of ACPI idle
+ */
 void hw_perf_restore(u64 ctrl)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -308,9 +310,6 @@ void hw_perf_restore(u64 ctrl)
 
Quoted 9 lines

arch/x86/kernel/cpu/perf_counter.c void hw_perf_restore(u64 ctrl) · line 313

Quoted 6 lines
arch/x86/kernel/cpu/perf_counter.c +0 -3
 	pmc_ops->restore_all(ctrl);
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_restore);

Please leave those comments where they are, they do not describe the function, but comment on the export.

Have you checked this:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-tip.git;a=commitdiff;h=1ae843834668af3a30484e256fb27dc1a49f59cb

These leads to warnings:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

So we have two options:
1. which I already shown above
2. remove these comments

Please let me know, which option you will prefer.

Thanks,
--
JSR

#3 lore raw
Quoted 43 lines · Jaswinder Singh Rajput

Hello Peter,

Quoted 30 lines · Peter Zijlstra
Quoted 28 lines · Jaswinder Singh Rajput
arch/x86/kernel/cpu/perf_counter.c +6 -3
+/*
+ * Exported because of ACPI idle
+ */
 u64 hw_perf_save_disable(void)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -270,9 +272,6 @@ u64 hw_perf_save_disable(void)
 
 	return pmc_ops->save_disable_all();
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
 static void pmc_intel_restore_all(u64 ctrl)
@@ -301,6 +300,9 @@ static void pmc_amd_restore_all(u64 ctrl)
 	}
 }
 
+/*
+ * Exported because of ACPI idle
+ */
 void hw_perf_restore(u64 ctrl)
 {
 	if (unlikely(!perf_counters_initialized))
@@ -308,9 +310,6 @@ void hw_perf_restore(u64 ctrl)
 
Quoted 9 lines

arch/x86/kernel/cpu/perf_counter.c void hw_perf_restore(u64 ctrl) · line 313

Quoted 6 lines
arch/x86/kernel/cpu/perf_counter.c +0 -3
 	pmc_ops->restore_all(ctrl);
 }
-/*
- * Exported because of ACPI idle
- */
 EXPORT_SYMBOL_GPL(hw_perf_restore);

Please leave those comments where they are, they do not describe the function, but comment on the export.

Quoted 6 lines

Have you checked this:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-tip.git;a=commitdiff;h=1ae843834668af3a30484e256fb27dc1a49f59cb

These leads to warnings:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

ignore those checkpatch warnings, they are wrong in this case.

Quoted 3 lines

So we have two options:
1. which I already shown above
2. remove these comments

3. ignore incorrect warnings

Ingo

#4 lore raw
Quoted 6 lines · Ingo Molnar
Quoted 3 lines · Jaswinder Singh Rajput

These leads to warnings:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

ignore those checkpatch warnings, they are wrong in this case.

OK, ignored for time being.

Log messages available at:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-tip.git;a=shortlog;h=perfcounters/core

So here is new pull request:

The following changes since commit 880860e392d92c457e8116cdee39ec4d109174ee:
Paul Mackerras (1):
perfcounters/powerpc: add support for POWER4 processors

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git perfcounters/core

Jaswinder Singh Rajput (2):
x86: perf_counter.c remove unused variables
x86: perf_counter.c remove duplicate header file

 arch/x86/kernel/cpu/perf_counter.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Complete diff:

arch/x86/kernel/cpu/perf_counter.c +0 -4
index f585371..79d88bf 100644
@@ -17,7 +17,6 @@
 #include <linux/kdebug.h>
 #include <linux/sched.h>
 
-#include <asm/perf_counter.h>
 #include <asm/apic.h>
 
 static bool perf_counters_initialized __read_mostly;
@@ -954,9 +953,6 @@ static struct pmc_x86_ops *pmc_intel_init(void)
 
 static struct pmc_x86_ops *pmc_amd_init(void)
 {
-	u64 old;
-	int bits;
-
 	nr_counters_generic = 4;
 	nr_counters_fixed = 0;
 	counter_value_mask = 0x0000FFFFFFFFFFFFULL;
#5 lore raw
In reply to Jaswinder Singh Rajput
Quoted 3 lines · Jaswinder Singh Rajput

These leads to warnings:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

Its the exception that makes the rule ;-)

#6 lore raw
In reply to Jaswinder Singh Rajput

Review

Quoted 9 lines · Jaswinder Singh Rajput

static struct pmc_x86_ops *pmc_amd_init(void)
{

(quoted diff) +0 -3
-       u64 old;
-       int bits;
-
        nr_counters_generic = 4;
        nr_counters_fixed = 0;
        counter_value_mask = 0x0000FFFFFFFFFFFFULL;

I would rather we try something like the below:

arch/x86/kernel/cpu/perf_counter.c +30 -3
index f585371..ccb4f79 100644
@@ -957,12 +957,39 @@ static struct pmc_x86_ops *pmc_amd_init(void)
 	u64 old;
 	int bits;
 
+	pr_info("AMD Performance Monitoring support detected.\n");
+
 	nr_counters_generic = 4;
 	nr_counters_fixed = 0;
-	counter_value_mask = 0x0000FFFFFFFFFFFFULL;
-	counter_value_bits = 48;
+	counter_value_mask = ~0ULL;
 
-	pr_info("AMD Performance Monitoring support detected.\n");
+	rdmsrl(MSR_K7_PERFCTR0, old);
+	wrmsrl(MSR_K7_PERFCTR0, counter_value_mask);
+
+	/*
+	 * Ensure the counter_value_mask write, is completed before
+	 * we try to read it back.
+	 */ 
+	mb();
+
+	/* read the truncated mask */
+	rdmsrl(MSR_K7_PERFCTR0, counter_value_mask);
+	wrmsrl(MSR_K7_PERFCTR0, old);
+
+	bits = 32 + fls(counter_value_mask >> 32);
+	if (bits == 32)
+		bits = fls((u32)counter_value_mask);
+	counter_value_bits = bits;
+
+	if (counter_value_bits != 48 ||
+	    counter_value_mask != ((1ULL << counter_value_bits) - 1)) {
+		printk(KERN_ERR "Bad cpu! speculated through full memory barrier!\n");
+		printk(KERN_ERR " ... old value: %llx\n", old);
+		printk(KERN_ERR " ... new value: %llx\n", counter_value_mask);
+
+		counter_value_bits = 48;
+		counter_value_mask = 0x0000FFFFFFFFFFFFULL;
+	}
 
 	return &pmc_amd_ops;
 }
#7 lore raw
In reply to Jaswinder Singh Rajput

An actual cleanup would be:

---
Subject: perf_counters: cleanup amd64 code a little
From: Peter Zijlstra <[email protected]>
Date: Thu Mar 05 21:18:49 CET 2009

Use and actual unsigned long bitmap instead of casting our way around.

---
 arch/x86/kernel/cpu/perf_counter.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -4
Index: linux-2.6/arch/x86/kernel/cpu/perf_counter.c
===================================================================
@@ -37,7 +37,7 @@ struct cpu_hw_counters {
 	unsigned long		used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 	unsigned long		interrupts;
 	u64			throttle_ctrl;
-	u64			active_mask;
+	unsigned long		active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 	int			enabled;
 };
 
@@ -291,7 +291,7 @@ static void pmc_amd_restore_all(u64 ctrl
 		return;
 
 	for (idx = 0; idx < nr_counters_generic; idx++) {
-		if (test_bit(idx, (unsigned long *)&cpuc->active_mask)) {
+		if (test_bit(idx, cpuc->active_mask)) {
 			u64 val;
 
 			rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
@@ -377,7 +377,7 @@ static void pmc_amd_enable(int idx, u64 
 {
 	struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
 
-	set_bit(idx, (unsigned long *)&cpuc->active_mask);
+	set_bit(idx, cpuc->active_mask);
 	if (cpuc->enabled)
 		config |= ARCH_PERFMON_EVENTSEL0_ENABLE;
 
@@ -401,7 +401,7 @@ static void pmc_amd_disable(int idx, u64
 {
 	struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
 
-	clear_bit(idx, (unsigned long *)&cpuc->active_mask);
+	clear_bit(idx, cpuc->active_mask);
 	wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
 
 }
#8 lore raw

[tip:perfcounters/core] x86: perf_counter cleanup

Commit-ID:  184fe4ab1f2e4dfa45584889bb3820031648386b
Gitweb:     http://git.kernel.org/tip/184fe4ab1f2e4dfa45584889bb3820031648386b
Author:     "Peter Zijlstra" <[email protected]>
AuthorDate: Sun, 8 Mar 2009 11:34:19 +0100
Commit:     Ingo Molnar <[email protected]>
CommitDate: Sun, 8 Mar 2009 16:24:49 +0100

x86: perf_counter cleanup

Use and actual unsigned long bitmap instead of casting our way around.

Cc Jaswinder Singh Rajput <[email protected]>

LKML-Reference: <1236508459.22914.3645.camel@twins>

---
 arch/x86/kernel/cpu/perf_counter.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -4
index f585371..1df4210 100644
@@ -37,7 +37,7 @@ struct cpu_hw_counters {
 	unsigned long		used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 	unsigned long		interrupts;
 	u64			throttle_ctrl;
-	u64			active_mask;
+	unsigned long		active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 	int			enabled;
 };
 
@@ -291,7 +291,7 @@ static void pmc_amd_restore_all(u64 ctrl)
 		return;
 
 	for (idx = 0; idx < nr_counters_generic; idx++) {
-		if (test_bit(idx, (unsigned long *)&cpuc->active_mask)) {
+		if (test_bit(idx, cpuc->active_mask)) {
 			u64 val;
 
 			rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
@@ -377,7 +377,7 @@ static void pmc_amd_enable(int idx, u64 config)
 {
 	struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
 
-	set_bit(idx, (unsigned long *)&cpuc->active_mask);
+	set_bit(idx, cpuc->active_mask);
 	if (cpuc->enabled)
 		config |= ARCH_PERFMON_EVENTSEL0_ENABLE;
 
@@ -401,7 +401,7 @@ static void pmc_amd_disable(int idx, u64 config)
 {
 	struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
 
-	clear_bit(idx, (unsigned long *)&cpuc->active_mask);
+	clear_bit(idx, cpuc->active_mask);
 	wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
 
 }