From 61af39ee28e201fcf092533dab3715f3a6532bea Mon Sep 17 00:00:00 2001 From: Kevin Becker Date: Wed, 27 Nov 2024 09:54:24 -0500 Subject: [PATCH] Revert "perf: Move irq_work_queue() where the event is prepared." BugLink: https://bugs.launchpad.net/bugs/2089700 This reverts commit 5d1af768018bd248dd2d4e981fff66cf02ae1ebb. A newer version of this commit will be applied to avoid a conflict by other patches pulled in from 6.10.y. Signed-off-by: Kevin Becker Acked-by: Magali Lemes Acked-by: John Cabaj --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 0fded5c79456..52b4dd109959 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9653,7 +9653,6 @@ static int __perf_event_overflow(struct perf_event *event, if (!event->pending_sigtrap) { event->pending_sigtrap = pending_id; local_inc(&event->ctx->nr_pending); - irq_work_queue(&event->pending_irq); } else if (event->attr.exclude_kernel && valid_sample) { /* * Should not be able to return to user space without @@ -9673,6 +9672,7 @@ static int __perf_event_overflow(struct perf_event *event, event->pending_addr = 0; if (valid_sample && (data->sample_flags & PERF_SAMPLE_ADDR)) event->pending_addr = data->addr; + irq_work_queue(&event->pending_irq); } READ_ONCE(event->overflow_handler)(event, data, regs);