From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179AbcB2LJL (ORCPT ); Mon, 29 Feb 2016 06:09:11 -0500 Received: from torg.zytor.com ([198.137.202.12]:53646 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753774AbcB2LJH (ORCPT ); Mon, 29 Feb 2016 06:09:07 -0500 Date: Mon, 29 Feb 2016 03:08:02 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: vincent.weaver@maine.edu, kan.liang@intel.com, acme@redhat.com, hpa@zytor.com, andi.kleen@intel.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, harish.chegondi@intel.com, jacob.jun.pan@linux.intel.com, jolsa@redhat.com, bp@alien8.de, eranian@google.com, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, andi.kleen@intel.com, kan.liang@intel.com, vincent.weaver@maine.edu, eranian@google.com, torvalds@linux-foundation.org, jolsa@redhat.com, bp@alien8.de, jacob.jun.pan@linux.intel.com, harish.chegondi@intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <20160222221011.702452407@linutronix.de> References: <20160222221011.702452407@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/uncore: Clear all hardware state on exit Git-Commit-ID: 7b672d6433f0f31c95be74b649090cd8b3a6388d 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: 7b672d6433f0f31c95be74b649090cd8b3a6388d Gitweb: http://git.kernel.org/tip/7b672d6433f0f31c95be74b649090cd8b3a6388d Author: Thomas Gleixner AuthorDate: Mon, 22 Feb 2016 22:19:17 +0000 Committer: Ingo Molnar CommitDate: Mon, 29 Feb 2016 09:35:19 +0100 perf/x86/intel/uncore: Clear all hardware state on exit The only missing bit is to completely clear the hardware state on failure exit. This is now a pretty simple exercise. Undo the box->init_box() setup on all packages which have been initialized so far. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Cc: Andi Kleen Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Harish Chegondi Cc: Jacob Pan Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vince Weaver Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20160222221011.702452407@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 096fc0d..5ad8e52 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -754,6 +754,30 @@ static void uncore_pmu_unregister(struct intel_uncore_pmu *pmu) pmu->registered = false; } +static void __init __uncore_exit_boxes(struct intel_uncore_type *type, int cpu) +{ + struct intel_uncore_pmu *pmu = type->pmus; + struct intel_uncore_box *box; + int i, pkg; + + if (pmu) { + pkg = topology_physical_package_id(cpu); + for (i = 0; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[pkg]; + if (box) + uncore_box_exit(box); + } + } +} + +static void __init uncore_exit_boxes(void *dummy) +{ + struct intel_uncore_type **types; + + for (types = uncore_msr_uncores; *types; types++) + __uncore_exit_boxes(*types++, smp_processor_id()); +} + static void uncore_free_boxes(struct intel_uncore_pmu *pmu) { int pkg; @@ -1376,6 +1400,8 @@ static int __init intel_uncore_init(void) return 0; err: + /* Undo box->init_box() */ + on_each_cpu_mask(&uncore_cpu_mask, uncore_exit_boxes, NULL, 1); uncore_types_exit(uncore_msr_uncores); uncore_pci_exit(); cpu_notifier_register_done();