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 <kevin.becker@canonical.com> Acked-by: Magali Lemes <magali.lemes@canonical.com> Acked-by: John Cabaj <john.cabaj@canonical.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user