Skip to contentSkip to conversation

perf/x86: fix uncore PCI fixed counter handling

PATCH In review Stephane Eranian 3 participants 3 messages Sep 9, 2013 – Sep 12, 2013

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

PATCH 1/1 perf/x86: fix uncore PCI fixed counter handling

There was a bug in the handling of SNB-EP/IVB-EP uncore PCI fixed counters, e.g., IMC. It would cause erratic values to be returned for the IMC clockticks event. This was due to a bogus hwc->config value which was then written to PCI config space. The fixed counter has most fields marked as reserved with hw reset values of 0. Yet the kernel was defaulting to a hwc->config = ~0 and that was causing the issues. The patch sets the hwc->config values for fixed uncore event to 0. Now, the values of imc clockticks is correct.

$ perf stat -a -C 0 -e uncore_imc_0/clockticks/ -I 1000 sleep 10

---

arch/x86/kernel/cpu/perf_event_intel_uncore.c +4 -2
index f14d9df..dfb4aa54 100644
@@ -2707,7 +2707,7 @@ uncore_get_event_constraint(struct intel_uncore_box *box, struct perf_event *eve
 			return c;
 	}
 
-	if (event->hw.config == ~0ULL)
+	if (event->attr.config == UNCORE_FIXED_EVENT)
 		return &constraint_fixed;
 
 	if (type->constraints) {
@@ -3011,7 +3011,9 @@ static int uncore_pmu_event_init(struct perf_event *event)
 		 */
 		if (pmu->type->single_fixed && pmu->pmu_idx > 0)
 			return -EINVAL;
-		hwc->config = ~0ULL;
+
+		/* fixed counters have event field hardcoded to zero */
+		hwc->config = 0ULL;
 	} else {
 		hwc->config = event->attr.config & pmu->type->event_mask;
 		if (pmu->type->ops->hw_config) {
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Stephane Eranian

There was a bug in the handling of SNB-EP/IVB-EP uncore PCI fixed counters, e.g., IMC. It would cause erratic values to be returned for the IMC clockticks event. This was due to a bogus hwc->config value which was then written to PCI config space. The fixed counter has most fields marked as reserved with hw reset values of 0. Yet the kernel was defaulting to a hwc->config = ~0 and that was causing the issues. The patch sets the hwc->config values for fixed uncore event to 0. Now, the values of imc clockticks is correct.

Quoted 1 line
$ perf stat -a -C 0 -e uncore_imc_0/clockticks/ -I 1000 sleep 10

Looks good to me.

-Andi

#2 lore raw

[tip:perf/urgent] perf/x86: Fix uncore PCI fixed counter handling

In reply to Stephane Eranian
perf/x86: Fix uncore PCI fixed counter handling
Commit-ID:  dbc33f7016747bfce64f3d1e3af63f1251fcbf85
Gitweb:     http://git.kernel.org/tip/dbc33f7016747bfce64f3d1e3af63f1251fcbf85
Author:     Stephane Eranian <[email protected]>
AuthorDate: Mon, 9 Sep 2013 12:53:50 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 12 Sep 2013 08:42:37 +0200

perf/x86: Fix uncore PCI fixed counter handling

There was a bug in the handling of SNB-EP/IVB-EP uncore PCI fixed counters, e.g., IMC.

It would cause erratic values to be returned for the IMC clockticks event. This was due to a bogus hwc->config value which was then written to PCI config space.

The erratic values can be seen via:

  $ perf stat -a -C 0 -e uncore_imc_0/clockticks/ -I 1000 sleep 10

The fixed counter has most fields marked as reserved with hw reset values of 0. Yet the kernel was defaulting to a hwc->config = ~0 and that was causing the issues.

This patch sets the hwc->config values for fixed uncore event to 0. Now, the values of IMC clockticks is correct.

---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +4 -2
index fd8011e..8ed4458 100644
@@ -2808,7 +2808,7 @@ uncore_get_event_constraint(struct intel_uncore_box *box, struct perf_event *eve
 			return c;
 	}
 
-	if (event->hw.config == ~0ULL)
+	if (event->attr.config == UNCORE_FIXED_EVENT)
 		return &constraint_fixed;
 
 	if (type->constraints) {
@@ -3112,7 +3112,9 @@ static int uncore_pmu_event_init(struct perf_event *event)
 		 */
 		if (pmu->type->single_fixed && pmu->pmu_idx > 0)
 			return -EINVAL;
-		hwc->config = ~0ULL;
+
+		/* fixed counters have event field hardcoded to zero */
+		hwc->config = 0ULL;
 	} else {
 		hwc->config = event->attr.config & pmu->type->event_mask;
 		if (pmu->type->ops->hw_config) {