Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf: Fixup SIGTRAP and sample_flags interaction

The perf_event_attr::sigtrap functionality relies on data->addr being
set. However commit 7b0846301531 ("perf: Use sample_flags for addr")
changed this to only initialize data->addr when not 0.

Fixes: 7b0846301531 ("perf: Use sample_flags for addr")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/Y3426b4OimE%2FI5po%40hirez.programming.kicks-ass.net

+4 -1
+4 -1
kernel/events/core.c
··· 9328 9328 */ 9329 9329 WARN_ON_ONCE(event->pending_sigtrap != pending_id); 9330 9330 } 9331 - event->pending_addr = data->addr; 9331 + 9332 + event->pending_addr = 0; 9333 + if (data->sample_flags & PERF_SAMPLE_ADDR) 9334 + event->pending_addr = data->addr; 9332 9335 irq_work_queue(&event->pending_irq); 9333 9336 } 9334 9337