Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1389558

[PATCH 04/11] x86, perf: Use new ht_on flag in HT leak workaround

Show all headers | View raw

From: Andi Kleen <ak@linux.intel.com>

Now that we have a convenient ht_on flag in x86_pmu use it
to detect the HT workarounds for older CPUs.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 arch/x86/events/intel/core.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 2af56c268b53..4efe9347bb82 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4012,16 +4012,14 @@ __init int intel_pmu_init(void)
  */
 static __init int fixup_ht_bug(void)
 {
-	int cpu = smp_processor_id();
-	int w, c;
+	int c;
 	/*
 	 * problem not present on this CPU model, nothing to do
 	 */
 	if (!(x86_pmu.flags & PMU_FL_EXCL_ENABLED))
 		return 0;
 
-	w = cpumask_weight(topology_sibling_cpumask(cpu));
-	if (w > 1) {
+	if (x86_pmu.ht_on) {
 		pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n");
 		return 0;
 	}
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Add top down metrics to perf stat Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200
  [PATCH 09/11] perf, tools, stat: Basic support for TopDown in perf stat Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200
  [PATCH 07/11] perf, tools, stat: Avoid fractional digits for integer scales Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200
  [PATCH 01/11] x86, perf: Support sysfs files depending on SMT status Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200
    Re: [PATCH 01/11] x86, perf: Support sysfs files depending on SMT  status Peter Zijlstra <peterz@infradead.org> - 2016-04-28 10:10 +0200
      Re: [PATCH 01/11] x86, perf: Support sysfs files depending on SMT  status Peter Zijlstra <peterz@infradead.org> - 2016-04-28 10:20 +0200
  [PATCH 04/11] x86, perf: Use new ht_on flag in HT leak workaround Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200
  [PATCH 05/11] perf, tools: Parse an .aggr-per-core event attribute Andi Kleen <andi@firstfloor.org> - 2016-04-27 22:10 +0200

csiph-web