Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'perf-urgent-2024-04-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 perf fix from Ingo Molnar:
"Fix a combined PEBS events bug on x86 Intel CPUs"
* tag 'perf-urgent-2024-04-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel/ds: Don't clear ->pebs_data_cfg for the last PEBS event
+4
-4
+4
-4
arch/x86/events/intel/ds.c
+4
-4
arch/x86/events/intel/ds.c
···
1237
1237
struct pmu *pmu = event->pmu;
1238
1238
1239
1239
/*
1240
-
* Make sure we get updated with the first PEBS
1241
-
* event. It will trigger also during removal, but
1242
-
* that does not hurt:
1240
+
* Make sure we get updated with the first PEBS event.
1241
+
* During removal, ->pebs_data_cfg is still valid for
1242
+
* the last PEBS event. Don't clear it.
1243
1243
*/
1244
-
if (cpuc->n_pebs == 1)
1244
+
if ((cpuc->n_pebs == 1) && add)
1245
1245
cpuc->pebs_data_cfg = PEBS_UPDATE_DS_SW;
1246
1246
1247
1247
if (needed_cb != pebs_needs_sched_cb(cpuc)) {