Skip to content

Commit 1ed1d3a

Browse files
committed
Merge tag 'perf-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Thomas Gleixner: "A single fix for perf to prevent it from sending SIGTRAP to another task from a trace point event as it's not possible to deliver a synchronous signal to a different task from there" * tag 'perf-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Ignore sigtrap for tracepoints destined for other tasks
2 parents d039f38 + 73743c3 commit 1ed1d3a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

kernel/events/core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9759,6 +9759,9 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size,
97599759
continue;
97609760
if (event->attr.config != entry->type)
97619761
continue;
9762+
/* Cannot deliver synchronous signal to other task. */
9763+
if (event->attr.sigtrap)
9764+
continue;
97629765
if (perf_tp_event_match(event, &data, regs))
97639766
perf_swevent_event(event, count, &data, regs);
97649767
}

0 commit comments

Comments
 (0)