perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: 68055915c1c22489f9658bd2b7391bb11b2cf4e4 perf/x86/intel/uncore: Fix boot crash on SBOX PMU on Haswell-EP
Misc fixes: two Intel uncore driver fixes, a CPU-hotplug fix and a build dependencies fix.
Thanks,
Ingo
------------------>
Andi Kleen (2):
perf/x86/intel/uncore: Fix IRP uncore register offsets on Haswell EP perf/x86/intel/uncore: Fix boot crash on SBOX PMU on Haswell-EP
Mark Rutland (1):
perf: Fix corruption of sibling list with hotplug
Peter Zijlstra (Intel) (1):
perf/x86: Fix embarrasing typo
arch/x86/Kconfig | 2 +- .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 49 ++++++++++++++++++++-- kernel/events/core.c | 8 ++-- 3 files changed, 51 insertions(+), 8 deletions(-)
arch/x86/Kconfig +1 -1
@@ -144,7 +144,7 @@ config INSTRUCTION_DECODER config PERF_EVENTS_INTEL_UNCORE def_bool y - depends on PERF_EVENTS && SUP_SUP_INTEL && PCI + depends on PERF_EVENTS && CPU_SUP_INTEL && PCI config OUTPUT_FORMAT string
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +45 -4
85 lines not on this page · raw message
kernel/events/core.c +5 -3
@@ -1562,8 +1562,10 @@ static void perf_remove_from_context(struct perf_event *event, bool detach_groupif (!task) {/* -* Per cpu events are removed via an smp call and -* the removal is always successful. +* Per cpu events are removed via an smp call. The removal can +* fail if the CPU is currently offline, but in that case we +* already called __perf_remove_from_context from +* perf_event_exit_cpu. */ cpu_function_call (event->cpu, __perf_remove_from_context, &re);return ;
@@ -8117,7 +8119,7 @@ static void perf_pmu_rotate_stop(struct pmu *pmu)static void __perf_event_exit_context (void *__info) { -struct remove_event re = { .detach_group = false }; +struct remove_event re = { .detach_group = true };struct perf_event_context *ctx = __info;perf_pmu_rotate_stop (ctx->pmu);