From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932768AbcFCKzi (ORCPT ); Fri, 3 Jun 2016 06:55:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56490 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752422AbcFCKzG (ORCPT ); Fri, 3 Jun 2016 06:55:06 -0400 Date: Fri, 3 Jun 2016 03:54:23 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: acme@redhat.com, mingo@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, eranian@google.com, ak@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@redhat.com, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, peterz@infradead.org Reply-To: mingo@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, eranian@google.com, ak@linux.intel.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, tglx@linutronix.de, peterz@infradead.org, vincent.weaver@maine.edu In-Reply-To: <1463703002-19686-6-git-send-email-andi@firstfloor.org> References: <1463703002-19686-6-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel: Use new topology_max_smt_threads() in HT leak workaround Git-Commit-ID: 030ba6cd105c68ce919c5e239853b567490cd059 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 030ba6cd105c68ce919c5e239853b567490cd059 Gitweb: http://git.kernel.org/tip/030ba6cd105c68ce919c5e239853b567490cd059 Author: Andi Kleen AuthorDate: Thu, 19 May 2016 17:09:59 -0700 Committer: Ingo Molnar CommitDate: Fri, 3 Jun 2016 09:41:25 +0200 perf/x86/intel: Use new topology_max_smt_threads() in HT leak workaround Now that we have topology_max_smt_threads() use it to detect the HT workarounds for older CPUs. Signed-off-by: Andi Kleen Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: acme@kernel.org Cc: jolsa@kernel.org Link: http://lkml.kernel.org/r/1463703002-19686-6-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar --- 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 593b167..5081b4c 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3989,16 +3989,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 (topology_max_smt_threads() > 1) { pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n"); return 0; }