Skip to content

Commit 456019a

Browse files
Peter Zijlstragregkh
authored andcommitted
perf: Fix sample vs do_exit()
[ Upstream commit 4f6fc78 ] 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] Signed-off-by: Sasha Levin <[email protected]>
1 parent 989c77a commit 456019a

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
@@ -7097,6 +7097,10 @@ perf_sample_ustack_size(u16 stack_size, u16 header_size,
70977097
if (!regs)
70987098
return 0;
70997099

7100+
/* No mm, no stack, no dump. */
7101+
if (!current->mm)
7102+
return 0;
7103+
71007104
/*
71017105
* Check if we fit in with the requested stack size into the:
71027106
* - TASK_SIZE
@@ -7808,6 +7812,9 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs)
78087812
const u32 max_stack = event->attr.sample_max_stack;
78097813
struct perf_callchain_entry *callchain;
78107814

7815+
if (!current->mm)
7816+
user = false;
7817+
78117818
if (!kernel && !user)
78127819
return &__empty_callchain;
78137820

kernel/exit.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,15 @@ void __noreturn do_exit(long code)
923923
tsk->exit_code = code;
924924
taskstats_exit(tsk, group_dead);
925925

926+
/*
927+
* Since sampling can touch ->mm, make sure to stop everything before we
928+
* tear it down.
929+
*
930+
* Also flushes inherited counters to the parent - before the parent
931+
* gets woken up by child-exit notifications.
932+
*/
933+
perf_event_exit_task(tsk);
934+
926935
exit_mm();
927936

928937
if (group_dead)
@@ -939,14 +948,6 @@ void __noreturn do_exit(long code)
939948
exit_task_work(tsk);
940949
exit_thread(tsk);
941950

942-
/*
943-
* Flush inherited counters to the parent - before the parent
944-
* gets woken up by child-exit notifications.
945-
*
946-
* because of cgroup mode, must be called before cgroup_exit()
947-
*/
948-
perf_event_exit_task(tsk);
949-
950951
sched_autogroup_exit_task(tsk);
951952
cgroup_exit(tsk);
952953

0 commit comments

Comments
 (0)