Skip to contentSkip to conversation

perf events fixes

GIT PULL Merged Ingo Molnar 2 participants 2 messages Mar 21, 2025

Subsystems (2)
x86 perf events
lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

Linus,

Please pull the latest perf/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2025-03-21

# HEAD: 7e512f5ad24458e2c930b5be5d96ddf9e176e05d perf/x86/rapl: Fix error handling in init_rapl_pmus()

Two fixes: an RAPL PMU driver error handling fix, and an AMD IBS software filter fix.

Thanks,

Ingo

------------------>
Dhananjay Ugwekar (1):
perf/x86/rapl: Fix error handling in init_rapl_pmus()

Namhyung Kim (1):
perf/x86: Check data address for IBS software filter

 arch/x86/events/amd/ibs.c | 10 ++++++----
 arch/x86/events/rapl.c    |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)
arch/x86/events/amd/ibs.c +6 -4
index e7a8b8758e08..c46500592002 100644
@@ -1128,8 +1128,13 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
 		regs.flags |= PERF_EFLAGS_EXACT;
 	}
 
+	if (perf_ibs == &perf_ibs_op)
+		perf_ibs_parse_ld_st_data(event->attr.sample_type, &ibs_data, &data);
+
 	if ((event->attr.config2 & IBS_SW_FILTER_MASK) &&
-	    perf_exclude_event(event, &regs)) {
+	    (perf_exclude_event(event, &regs) ||
+	     ((data.sample_flags & PERF_SAMPLE_ADDR) &&
+	      event->attr.exclude_kernel && kernel_ip(data.addr)))) {
 		throttle = perf_event_account_interrupt(event);
 		goto out;
 	}

@@ -1144,9 +1149,6 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
 		perf_sample_save_raw_data(&data, event, &raw);
 	}
 
-	if (perf_ibs == &perf_ibs_op)
-		perf_ibs_parse_ld_st_data(event->attr.sample_type, &ibs_data, &data);
-
 	/*
 	 * rip recorded by IbsOpRip will not be consistent with rsp and rbp
 	 * recorded as part of interrupt regs. Thus we need to use rip from
arch/x86/events/rapl.c +6 -1
index 6941f4811bec..043f0a0b1e00 100644
@@ -730,6 +730,7 @@ static int __init init_rapl_pmus(struct rapl_pmus **rapl_pmus_ptr, int rapl_pmu_
 {
 	int nr_rapl_pmu = topology_max_packages();
 	struct rapl_pmus *rapl_pmus;
+	int ret;
 
 	/*
 	 * rapl_pmu_scope must be either PKG, DIE or CORE

@@ -761,7 +762,11 @@ static int __init init_rapl_pmus(struct rapl_pmus **rapl_pmus_ptr, int rapl_pmu_
 	rapl_pmus->pmu.module		= THIS_MODULE;
 	rapl_pmus->pmu.capabilities	= PERF_PMU_CAP_NO_EXCLUDE;
 
-	return init_rapl_pmu(rapl_pmus);
+	ret = init_rapl_pmu(rapl_pmus);
+	if (ret)
+		kfree(rapl_pmus);
+
+	return ret;
 }
 
 static struct rapl_model model_snb = {
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 21 Mar 2025 11:39:44 +0100:

The pull request you sent on Fri, 21 Mar 2025 11:39:44 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2025-03-21

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5c7474b5449ccda2f0139e87425845baa2dae15a

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html