Skip to content

Commit 4f6fc78

Browse files
author
Peter Zijlstra
committed
perf: Fix sample vs do_exit()
Baisheng Gao reported an ARM64 crash, which Mark decoded as being a synchronous external abort -- most likely due to trying to access MMIO in bad ways. The crash further shows perf trying to do a user stack sample while in exit_mmap()'s tlb_finish_mmu() -- i.e. while tearing down the address space it is trying to access. It turns out that we stop perf after we tear down the userspace mm; a receipie for disaster, since perf likes to access userspace for various reasons. Flip this order by moving up where we stop perf in do_exit(). Additionally, harden PERF_SAMPLE_CALLCHAIN and PERF_SAMPLE_STACK_USER to abort when the current task does not have an mm (exit_mm() makes sure to set current->mm = NULL; before commencing with the actual teardown). Such that CPU wide events don't trip on this same problem. Fixes: c5ebced ("perf: Add ability to attach user stack dump to sample") Reported-by: Baisheng Gao <[email protected]> Suggested-by: Mark Rutland <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 86aa94c commit 4f6fc78

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

kernel/events/core.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7439,6 +7439,10 @@ perf_sample_ustack_size(u16 stack_size, u16 header_size,
74397439
if (!regs)
74407440
return 0;
74417441

7442+
/* No mm, no stack, no dump. */
7443+
if (!current->mm)
7444+
return 0;
7445+
74427446
/*
74437447
* Check if we fit in with the requested stack size into the:
74447448
* - TASK_SIZE
@@ -8150,6 +8154,9 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs)
81508154
const u32 max_stack = event->attr.sample_max_stack;
81518155
struct perf_callchain_entry *callchain;
81528156

8157+
if (!current->mm)
8158+
user = false;
8159+
81538160
if (!kernel && !user)
81548161
return &__empty_callchain;
81558162

kernel/exit.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,15 @@ void __noreturn do_exit(long code)
944944
taskstats_exit(tsk, group_dead);
945945
trace_sched_process_exit(tsk, group_dead);
946946

947+
/*
948+
* Since sampling can touch ->mm, make sure to stop everything before we
949+
* tear it down.
950+
*
951+
* Also flushes inherited counters to the parent - before the parent
952+
* gets woken up by child-exit notifications.
953+
*/
954+
perf_event_exit_task(tsk);
955+
947956
exit_mm();
948957

949958
if (group_dead)
@@ -959,14 +968,6 @@ void __noreturn do_exit(long code)
959968
exit_task_work(tsk);
960969
exit_thread(tsk);
961970

962-
/*
963-
* Flush inherited counters to the parent - before the parent
964-
* gets woken up by child-exit notifications.
965-
*
966-
* because of cgroup mode, must be called before cgroup_exit()
967-
*/
968-
perf_event_exit_task(tsk);
969-
970971
sched_autogroup_exit_task(tsk);
971972
cgroup_exit(tsk);
972973

0 commit comments

Comments
 (0)