Skip to content

Commit f3bed55

Browse files
captain5050Peter Zijlstra
authored andcommitted
perf/core: fix parent pid/tid in task exit events
Current logic yields the child task as the parent. Before: $ perf record bash -c "perf list > /dev/null" $ perf script -D |grep 'FORK\|EXIT' 4387036190981094 0x5a70 [0x30]: PERF_RECORD_FORK(10472:10472):(10470:10470) 4387036606207580 0xf050 [0x30]: PERF_RECORD_EXIT(10472:10472):(10472:10472) 4387036607103839 0x17150 [0x30]: PERF_RECORD_EXIT(10470:10470):(10470:10470) ^ Note the repeated values here -------------------/ After: 383281514043 0x9d8 [0x30]: PERF_RECORD_FORK(2268:2268):(2266:2266) 383442003996 0x2180 [0x30]: PERF_RECORD_EXIT(2268:2268):(2266:2266) 383451297778 0xb70 [0x30]: PERF_RECORD_EXIT(2266:2266):(2265:2265) Fixes: 94d5d1b ("perf_counter: Report the cloning task as parent on perf_counter_fork()") Reported-by: KP Singh <[email protected]> Signed-off-by: Ian Rogers <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 5b16ef2 commit f3bed55

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

kernel/events/core.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7491,10 +7491,17 @@ static void perf_event_task_output(struct perf_event *event,
74917491
goto out;
74927492

74937493
task_event->event_id.pid = perf_event_pid(event, task);
7494-
task_event->event_id.ppid = perf_event_pid(event, current);
7495-
74967494
task_event->event_id.tid = perf_event_tid(event, task);
7497-
task_event->event_id.ptid = perf_event_tid(event, current);
7495+
7496+
if (task_event->event_id.header.type == PERF_RECORD_EXIT) {
7497+
task_event->event_id.ppid = perf_event_pid(event,
7498+
task->real_parent);
7499+
task_event->event_id.ptid = perf_event_pid(event,
7500+
task->real_parent);
7501+
} else { /* PERF_RECORD_FORK */
7502+
task_event->event_id.ppid = perf_event_pid(event, current);
7503+
task_event->event_id.ptid = perf_event_tid(event, current);
7504+
}
74987505

74997506
task_event->event_id.time = perf_event_clock(event);
75007507

0 commit comments

Comments
 (0)