perf/core: fix parent pid/tid in task exit events
Ian Rogers
reviewerPATCH 1/1 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)
--- kernel/events/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
kernel/events/core.c +10 -3
@@ -7491,10 +7491,17 @@ static void perf_event_task_output(struct perf_event *event, goto out; task_event->event_id.pid =perf_event_pid (event, task); - task_event->event_id.ppid =perf_event_pid (event, current); - task_event->event_id.tid =perf_event_tid (event, task); - task_event->event_id.ptid =perf_event_tid (event, current); + +if (task_event->event_id.header.type ==PERF_RECORD_EXIT ) { + task_event->event_id.ppid =perf_event_pid (event, + task->real_parent); + task_event->event_id.ptid =perf_event_pid (event, + task->real_parent); + }else {/* PERF_RECORD_FORK */ + task_event->event_id.ppid =perf_event_pid (event, current); + task_event->event_id.ptid =perf_event_tid (event, current); + } task_event->event_id.time =perf_event_clock (event);
Signature · 1 line
2.26.1.301.g55bc3eb7cb9-goog
Peter Zijlstra
maintainerQuoted 11 lines · Ian Rogers
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 -------------------/
Quoted 5 lines
After:
3832815140430x9d8[0x30]: PERF_RECORD_FORK(2268:2268):(2266:2266) 3834420039960x2180[0x30]: PERF_RECORD_EXIT(2268:2268):(2266:2266) 3834512977780xb70[0x30]: PERF_RECORD_EXIT(2266:2266):(2265:2265)
Quoted 2 lines
Reported-by KP Singh <[email protected]>Signed-off-by Ian Rogers <[email protected]>
Ian Rogers
reviewerQuoted 13 lines · Peter Zijlstra
Quoted 11 lines · Ian Rogers
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 -------------------/
Quoted 7 lines
Quoted 5 lines
After:
3832815140430x9d8[0x30]: PERF_RECORD_FORK(2268:2268):(2266:2266) 3834420039960x2180[0x30]: PERF_RECORD_EXIT(2268:2268):(2266:2266) 3834512977780xb70[0x30]: PERF_RECORD_EXIT(2266:2266):(2265:2265)Fixes .... ?
on perf_counter_fork()")
Sorry, re-sending as plain-text was disabled on the message and so it bounced on lkml. Took some digging to find the original commit :-)
Thanks,
Ian
Quoted 3 lines
Quoted 3 lines
Reported-by KP Singh <[email protected]>Signed-off-by Ian Rogers <[email protected]>
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: f3bed55e850926614b9898fe982f66d2541a36a5 Gitweb: https://git.kernel.org/tip/f3bed55e850926614b9898fe982f66d2541a36a5 Author: Ian Rogers <[email protected]> AuthorDate: Fri, 17 Apr 2020 11:28:42 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 22 Apr 2020 23:10:14 +02:00
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)
--- kernel/events/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
kernel/events/core.c +10 -3
@@ -7491,10 +7491,17 @@ static void perf_event_task_output(struct perf_event *event, goto out; task_event->event_id.pid =perf_event_pid (event, task); - task_event->event_id.ppid =perf_event_pid (event, current); - task_event->event_id.tid =perf_event_tid (event, task); - task_event->event_id.ptid =perf_event_tid (event, current); + +if (task_event->event_id.header.type ==PERF_RECORD_EXIT ) { + task_event->event_id.ppid =perf_event_pid (event, + task->real_parent); + task_event->event_id.ptid =perf_event_pid (event, + task->real_parent); + }else {/* PERF_RECORD_FORK */ + task_event->event_id.ppid =perf_event_pid (event, current); + task_event->event_id.ptid =perf_event_tid (event, current); + } task_event->event_id.time =perf_event_clock (event);