Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b672d64 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Harish Chegondi <harish.chegondi@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/20160222221011.702452407@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent cf6d445f

arch/x86/events/intel/uncore.c

+26 −0
Original line number Diff line number Diff line
@@ -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();