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 <[email protected]> --- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -751,6 +751,30 @@ static void uncore_pmu_unregister(struct 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 = uncore_msr_uncores; + + while (*types) + __uncore_exit_boxes(*types++, smp_processor_id()); +} + static void uncore_free_boxes(struct intel_uncore_pmu *pmu) { int pkg, maxpkg = topology_max_packages(); @@ -1352,6 +1376,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();
