ye olde task_ctx_sched_out trace.
Subsystems (4)
I thought we had this nailed down a while ago, but it still keeps popping up...
WARNING: CPU: 3 PID: 32310 at kernel/events/core.c:2384 task_ctx_sched_out+0x6b/0x80() CPU: 3 PID: 32310 Comm: trinity-c185 Not tainted 3.15.0-rc5+ #214 0000000000000009 000000003d7dfb5c ffff880019671df8 ffffffff9371a1fd 0000000000000000 ffff880019671e30 ffffffff9306d5dd ffff88024d0d6d48 ffff88010c4944e8 0000000000000286 ffff880243b82d00 ffff88010c4944e8 Call Trace: [<ffffffff9371a1fd>] dump_stack+0x4e/0x7a [<ffffffff9306d5dd>] warn_slowpath_common+0x7d/0xa0 [<ffffffff9306d70a>] warn_slowpath_null+0x1a/0x20 [<ffffffff931430bb>] task_ctx_sched_out+0x6b/0x80 [<ffffffff93146138>] perf_event_comm+0xc8/0x220 [<ffffffff930a19cd>] ? get_parent_ip+0xd/0x50 [<ffffffff931c025f>] set_task_comm+0x4f/0xc0 [<ffffffff93085b23>] SyS_prctl+0x1d3/0x480 [<ffffffff9372cf9f>] tracesys+0xdd/0xe2
There was on perf activity at all going on at the time.
I had told trinity to do -g vm which excludes all non-VM related syscalls.
What is perf_event_comm doing ? Is that storing some state in case I later decide to run perf ?
Dave
Peter Zijlstra
maintainerQuoted 19 lines · Dave Jones
I thought we had this nailed down a while ago, but it still keeps popping up...
WARNING: CPU: 3 PID: 32310 at kernel/events/core.c:2384 task_ctx_sched_out+0x6b/0x80() CPU: 3 PID: 32310 Comm: trinity-c185 Not tainted 3.15.0-rc5+ #214 0000000000000009 000000003d7dfb5c ffff880019671df8 ffffffff9371a1fd 0000000000000000 ffff880019671e30 ffffffff9306d5dd ffff88024d0d6d48 ffff88010c4944e8 0000000000000286 ffff880243b82d00 ffff88010c4944e8 Call Trace: [<ffffffff9371a1fd>] dump_stack+0x4e/0x7a [<ffffffff9306d5dd>] warn_slowpath_common+0x7d/0xa0 [<ffffffff9306d70a>] warn_slowpath_null+0x1a/0x20 [<ffffffff931430bb>] task_ctx_sched_out+0x6b/0x80 [<ffffffff93146138>] perf_event_comm+0xc8/0x220 [<ffffffff930a19cd>] ? get_parent_ip+0xd/0x50 [<ffffffff931c025f>] set_task_comm+0x4f/0xc0 [<ffffffff93085b23>] SyS_prctl+0x1d3/0x480 [<ffffffff9372cf9f>] tracesys+0xdd/0xe2
Quoted 5 lines
There was on perf activity at all going on at the time.
I had told trinity to do -g vm which excludes all non-VM related syscalls.What is
perf_event_commdoing ? Is that storing some state in case I later decide to run perf ?
So we use perf_event_comm() to trigger start_on_exec, which in turn pretty much assumes .tsk=current.
Now some people have advanced set_task_comm() usage far beyond this point and we can now pretty much call it on random tasks at random times in order to make 'top' look pretty or similar useless things.
So I think I should separate this and add perf_event_exec() and leave perf_event_comm() for just reporting task->comm changes.
Peter Zijlstra
maintainerQuoted 29 lines · Peter Zijlstra
Quoted 19 lines · Dave Jones
I thought we had this nailed down a while ago, but it still keeps popping up...
WARNING: CPU: 3 PID: 32310 at kernel/events/core.c:2384 task_ctx_sched_out+0x6b/0x80() CPU: 3 PID: 32310 Comm: trinity-c185 Not tainted 3.15.0-rc5+ #214 0000000000000009 000000003d7dfb5c ffff880019671df8 ffffffff9371a1fd 0000000000000000 ffff880019671e30 ffffffff9306d5dd ffff88024d0d6d48 ffff88010c4944e8 0000000000000286 ffff880243b82d00 ffff88010c4944e8 Call Trace: [<ffffffff9371a1fd>] dump_stack+0x4e/0x7a [<ffffffff9306d5dd>] warn_slowpath_common+0x7d/0xa0 [<ffffffff9306d70a>] warn_slowpath_null+0x1a/0x20 [<ffffffff931430bb>] task_ctx_sched_out+0x6b/0x80 [<ffffffff93146138>] perf_event_comm+0xc8/0x220 [<ffffffff930a19cd>] ? get_parent_ip+0xd/0x50 [<ffffffff931c025f>] set_task_comm+0x4f/0xc0 [<ffffffff93085b23>] SyS_prctl+0x1d3/0x480 [<ffffffff9372cf9f>] tracesys+0xdd/0xe2Quoted 5 lines
There was on perf activity at all going on at the time.
I had told trinity to do -g vm which excludes all non-VM related syscalls.What is
perf_event_commdoing ? Is that storing some state in case I later decide to run perf ?So we use
perf_event_comm()to triggerstart_on_exec, which in turn pretty much assumes .tsk=current.
Quoted 6 lines
Now some people have advanced
set_task_comm()usage far beyond this point and we can now pretty much call it on random tasks at random times in order to make 'top' look pretty or similar useless things.So I think I should separate this and add
perf_event_exec()and leaveperf_event_comm()for just reportingtask->commchanges.
A little something like so I suppose.
--- fs/exec.c | 1 + include/linux/perf_event.h | 1 + kernel/events/core.c | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 12 deletions(-)
fs/exec.c +1 -0
@@ -1111,6 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);set_task_comm (current,kbasename (bprm->filename)); +perf_event_exec ();/* Set the new mm task size. We have to do that late because it may * depend on TIF_32BIT which is only updated in flush_thread() on
include/linux/perf_event.h +1 -0
@@ -694,6 +694,7 @@ extern struct perf_guest_info_callbacks *perf_guest_cbs;extern int perf_register_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks);extern int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks); +extern void perf_event_exec (void );extern void perf_event_comm (struct task_struct *tsk);extern void perf_event_fork (struct task_struct *tsk);
kernel/events/core.c +16 -12
@@ -2973,6 +2973,22 @@ static void perf_event_enable_on_exec(struct perf_event_context *ctx)local_irq_restore (flags); } +void perf_event_exec (void ) +{ +struct perf_event_context *ctx; +int ctxn; + +rcu_read_lock (); +for_each_task_context_nr (ctxn) { + ctx = task->perf_event_ctxp[ctxn]; +if (!ctx) +continue ; + +perf_event_enable_on_exec (ctx); + } +rcu_read_unlock (); +} +/* * Cross CPU call to read the hardware event */
@@ -5070,18 +5086,6 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)void perf_event_comm (struct task_struct *task) {struct perf_comm_event comm_event; -struct perf_event_context *ctx; -int ctxn; - -rcu_read_lock (); -for_each_task_context_nr (ctxn) { - ctx = task->perf_event_ctxp[ctxn]; -if (!ctx) -continue ; - -perf_event_enable_on_exec (ctx); - } -rcu_read_unlock ();if (!atomic_read (&nr_comm_events))return ;
Peter Zijlstra
maintainerReview
Quoted 12 lines · Peter Zijlstra
A little something like so I suppose.
---
(quoted diff) +8
-0+void perf_event_exec(void) +{ + struct perf_event_context *ctx; + int ctxn; + + rcu_read_lock(); + for_each_task_context_nr(ctxn) { + ctx = task->perf_event_ctxp[ctxn];
s/task/current/
Review
Quoted 7 lines
(quoted diff) +7
-0+ if (!ctx) + continue; + + perf_event_enable_on_exec(ctx); + } + rcu_read_unlock(); +}
It would help if I pasted the one that actually compiles I suppose..
--- fs/exec.c | 1 + include/linux/perf_event.h | 1 + kernel/events/core.c | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 12 deletions(-)
fs/exec.c +1 -0
@@ -1111,6 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);set_task_comm (current,kbasename (bprm->filename)); +perf_event_exec ();/* Set the new mm task size. We have to do that late because it may * depend on TIF_32BIT which is only updated in flush_thread() on
include/linux/perf_event.h +1 -0
@@ -694,6 +694,7 @@ extern struct perf_guest_info_callbacks *perf_guest_cbs;extern int perf_register_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks);extern int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks); +extern void perf_event_exec (void );extern void perf_event_comm (struct task_struct *tsk);extern void perf_event_fork (struct task_struct *tsk);
kernel/events/core.c +16 -12
@@ -2973,6 +2973,22 @@ static void perf_event_enable_on_exec(struct perf_event_context *ctx)local_irq_restore (flags); } +void perf_event_exec (void ) +{ +struct perf_event_context *ctx; +int ctxn; + +rcu_read_lock (); +for_each_task_context_nr (ctxn) { + ctx = current->perf_event_ctxp[ctxn]; +if (!ctx) +continue ; + +perf_event_enable_on_exec (ctx); + } +rcu_read_unlock (); +} +/* * Cross CPU call to read the hardware event */
@@ -5070,18 +5086,6 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)void perf_event_comm (struct task_struct *task) {struct perf_comm_event comm_event; -struct perf_event_context *ctx; -int ctxn; - -rcu_read_lock (); -for_each_task_context_nr (ctxn) { - ctx = task->perf_event_ctxp[ctxn]; -if (!ctx) -continue ; - -perf_event_enable_on_exec (ctx); - } -rcu_read_unlock ();if (!atomic_read (&nr_comm_events))return ;
Adrian Hunter
reviewerQuoted 38 lines · Peter Zijlstra
Review
Quoted 12 lines · Peter Zijlstra
A little something like so I suppose.
---
(quoted diff) +8
-0+void perf_event_exec(void) +{ + struct perf_event_context *ctx; + int ctxn; + + rcu_read_lock(); + for_each_task_context_nr(ctxn) { + ctx = task->perf_event_ctxp[ctxn];s/task/current/
Review
Quoted 7 lines
(quoted diff) +7
-0+ if (!ctx) + continue; + + perf_event_enable_on_exec(ctx); + } + rcu_read_unlock(); +}It would help if I pasted the one that actually compiles I suppose..
--- fs/exec.c | 1 + include/linux/perf_event.h | 1 + kernel/events/core.c | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 12 deletions(-)fs/exec.c +0
-0
fs/exec.c void setup_new_exec(struct linux_binprm * bprm) · line 1114
Quoted 4 lines
fs/exec.c +1
-0@@ -1111,6 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);set_task_comm (current,kbasename (bprm->filename)); +perf_event_exec ();
Shouldn't that be the other way around i.e.
+ perf_event_exec(); set_task_comm(current, kbasename(bprm->filename));
Also what about flagging the comm event that corresponds to an exec e.g.
fs/exec.c +3 -3
@@ -1046,13 +1046,13 @@ EXPORT_SYMBOL_GPL(get_task_comm);* so that a new one can be started */ -void set_task_comm (struct task_struct *tsk,const char *buf) +void __set_task_comm (struct task_struct *tsk,const char *buf,bool exec) {task_lock (tsk);trace_task_rename (tsk, buf);strlcpy (tsk->comm, buf,sizeof (tsk->comm));task_unlock (tsk); -perf_event_comm (tsk); +perf_event_comm (tsk, exec); }int flush_old_exec (struct linux_binprm * bprm)
@@ -1110,7 +1110,7 @@ void setup_new_exec(struct linux_binprm * bprm)else set_dumpable (current->mm, suid_dumpable); -set_task_comm (current,kbasename (bprm->filename)); +__set_task_comm (current,kbasename (bprm->filename), true);/* Set the new mm task size. We have to do that late because it may * depend on TIF_32BIT which is only updated in flush_thread() on
include/linux/perf_event.h +2 -2
@@ -694,7 +694,7 @@ extern struct perf_guest_info_callbacks *perf_guest_cbs;extern int perf_register_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks);extern int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks); -extern void perf_event_comm (struct task_struct *tsk); +extern void perf_event_comm (struct task_struct *tsk,bool exec);extern void perf_event_fork (struct task_struct *tsk);/* Callchains */
@@ -801,7 +801,7 @@ static inline int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks) { return 0; }static inline void perf_event_mmap (struct vm_area_struct *vma) { } -static inline void perf_event_comm (struct task_struct *tsk) { } +static inline void perf_event_comm (struct task_struct *tsk,bool exec) { }static inline void perf_event_fork (struct task_struct *tsk) { }static inline void perf_event_init (void ) { }static inline int perf_swevent_get_recursion_context (void ) {return -1 ; }
include/linux/sched.h +5 -1
@@ -2376,7 +2376,11 @@ extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, istruct task_struct *fork_idle (int );extern pid_t kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -extern void set_task_comm (struct task_struct *tsk,const char *from); +extern void __set_task_comm (struct task_struct *tsk,const char *from,bool exec); +static inline void set_task_comm (struct task_struct *tsk,const char *from) +{ +__set_task_comm (tsk, from, false); +}extern char *get_task_comm (char *to,struct task_struct *tsk);#ifdef CONFIG_SMP
include/uapi/linux/perf_event.h +5 -0
@@ -501,7 +501,12 @@ struct perf_event_mmap_page {#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)#define PERF_RECORD_MISC_GUEST_USER (5 << 0) +/* +* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on +* different events so can reuse the same bit position. +*/ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13) +#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)/* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See also
kernel/events/core.c +2 -2
@@ -5067,7 +5067,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event) NULL); } -void perf_event_comm (struct task_struct *task) +void perf_event_comm (struct task_struct *task,bool exec) {struct perf_comm_event comm_event;struct perf_event_context *ctx;
@@ -5093,7 +5093,7 @@ void perf_event_comm(struct task_struct *task) .event_id = { .header = { .type = PERF_RECORD_COMM, - .misc = 0, + .misc = exec ? PERF_RECORD_MISC_COMM_EXEC : 0, /* .size */ },/* .pid */
Peter Zijlstra
maintainerQuoted 13 lines · Adrian Hunter
fs/exec.c void setup_new_exec(struct linux_binprm * bprm) · line 1114
Quoted 9 lines
fs/exec.c +1
-0@@ -1111,6 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);set_task_comm (current,kbasename (bprm->filename)); +perf_event_exec ();Shouldn't that be the other way around i.e.
(quoted diff) +1
-0+ perf_event_exec();
Quoted 1 line
set_task_comm(current, kbasename(bprm->filename));
I suppose so indeed.
Quoted 1 line
Also what about flagging the comm event that corresponds to an exec e.g.
I think it was a mistake to conflate the two concepts, and separating them into different functions makes things clearer.
Adrian Hunter
reviewerQuoted 18 lines · Peter Zijlstra
Quoted 13 lines · Adrian Hunter
fs/exec.c void setup_new_exec(struct linux_binprm * bprm) · line 1114
Quoted 9 lines
fs/exec.c +1
-0@@ -1111,6 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);set_task_comm (current,kbasename (bprm->filename)); +perf_event_exec ();Shouldn't that be the other way around i.e.
(quoted diff) +1
-0+ perf_event_exec();Quoted 1 line
set_task_comm(current, kbasename(bprm->filename));I suppose so indeed.
Quoted 4 lines
Quoted 1 line
Also what about flagging the comm event that corresponds to an exec e.g.
I think it was a mistake to conflate the two concepts, and separating them into different functions makes things clearer.
My patch was not related to that. It was to get effectively an "exec" event, by piggybacking the comm event.
Peter Zijlstra
maintainerQuoted 3 lines · Adrian Hunter
My patch was not related to that. It was to get effectively an "exec" event, by piggybacking the comm event.
Lemme wake up and try again :-)
Peter Zijlstra
maintainerQuoted 23 lines · Adrian Hunter
include/uapi/linux/perf_event.h +5
-0+/* +* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on +* different events so can reuse the same bit position. +*/ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13) +#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)/* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See also kernel/events/core.c +1
-1@@ -5067,7 +5067,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event) NULL); } -void perf_event_comm (struct task_struct *task) +void perf_event_comm (struct task_struct *task,bool exec) {struct perf_comm_event comm_event;struct perf_event_context *ctx;
kernel/events/core.c void perf_event_comm(struct task_struct *task) · line 5099
Quoted 8 lines
kernel/events/core.c +1
-1@@ -5093,7 +5093,7 @@ void perf_event_comm(struct task_struct *task) .event_id = { .header = { .type = PERF_RECORD_COMM, - .misc = 0, + .misc = exec ? PERF_RECORD_MISC_COMM_EXEC : 0, /* .size */ },/* .pid */
OK, now that you pointed out the obvious, yeah, I suppose we can do that :-)
Adrian Hunter
reviewerQuoted 18 lines · Peter Zijlstra
Quoted 17 lines · Adrian Hunter
(quoted diff) +5
-0+/* + * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on + * different events so can reuse the same bit position. + */ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13) +#define PERF_RECORD_MISC_COMM_EXEC (1 << 13) /* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See alsokernel/events/core.c +0
-0@@ -5067,7 +5067,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event) NULL); }
Quoted 17 lines
Quoted 6 lines
kernel/events/core.c +1
-1-void perf_event_comm (struct task_struct *task) +void perf_event_comm (struct task_struct *task,bool exec) {struct perf_comm_event comm_event;struct perf_event_context *ctx;kernel/events/core.c void perf_event_comm(struct task_struct *task) · line 5099
Quoted 8 lines
kernel/events/core.c +1
-1@@ -5093,7 +5093,7 @@ void perf_event_comm(struct task_struct *task) .event_id = { .header = { .type = PERF_RECORD_COMM, - .misc = 0, + .misc = exec ? PERF_RECORD_MISC_COMM_EXEC : 0, /* .size */ },/* .pid */ OK, now that you pointed out the obvious, yeah, I suppose we can do that :-)
One problem is how user space can figure out if the kernel supports it. For my purposes, I don't need to know in advance, but I can imagine some users might want to. So I suggest adding:
include/uapi/linux/perf_event.h +2 -1
@@ -301,8 +301,9 @@ struct perf_event_attr { exclude_callchain_kernel : 1, /* exclude kernel callchains */ exclude_callchain_user : 1, /* exclude user callchains */ mmap2 : 1, /* include mmap with inode data */ + exec : 1, /* flag comm events that are due to an exec */ - __reserved_1 : 40; + __reserved_1 : 39;union {__u32 wakeup_events;/* wakeup every n events */
Commit message:
perf tools like 'perf report' can aggregate samples by comm strings, which generally works. However, there are other potential use-cases. For example, to pair up 'calls' with 'returns' accurately (from branch events like Intel BTS) it is necessary to identify whether the process has exec'd. Although a comm event is generated when an 'exec' happens it is also generated whenever the comm string is changed on a whim (e.g. by prctl PR_SET_NAME). This patch adds a flag to the comm event to differentiate one case from the other.
In order to determine whether the kernel supports the new flag, a selection bit named 'exec' is added to struct perf_event_attr. The bit does nothing but will cause perf_event_open() to fail if the bit is set on kernels that do not have it defined.
tip-bot for Peter Zijlstra
merge bot[tip:perf/core] perf: Fix perf_event_comm() vs. exec() assumption
In reply to Peter Zijlstraperf: Fix perf_event_comm() vs. exec() assumption
Commit-ID: e041e328c4b41e1db79bfe5ba9992c2ed771ad19 Gitweb: http://git.kernel.org/tip/e041e328c4b41e1db79bfe5ba9992c2ed771ad19 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 21 May 2014 17:32:19 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 6 Jun 2014 07:54:02 +0200
perf: Fix perf_event_comm() vs. exec() assumption
perf_event_comm() assumes that set_task_comm() is only called on exec(), and in particular that its only called on current.
Neither are true, as Dave reported a WARN triggered by set_task_comm() being called on !current.
Separate the exec() hook from the comm hook.
--- fs/exec.c | 1 + include/linux/perf_event.h | 4 +++- kernel/events/core.c | 28 ++++++++++++++++------------ 3 files changed, 20 insertions(+), 13 deletions(-)
fs/exec.c +1 -0
@@ -1110,6 +1110,7 @@ void setup_new_exec(struct linux_binprm * bprm)else set_dumpable (current->mm, suid_dumpable); +perf_event_exec ();set_task_comm (current,kbasename (bprm->filename));/* Set the new mm task size. We have to do that late because it may
include/linux/perf_event.h +3 -1
@@ -695,6 +695,7 @@ extern struct perf_guest_info_callbacks *perf_guest_cbs;extern int perf_register_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks);extern int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks); +extern void perf_event_exec (void );extern void perf_event_comm (struct task_struct *tsk);extern void perf_event_fork (struct task_struct *tsk);
@@ -772,7 +773,7 @@ extern void perf_event_enable(struct perf_event *event);extern void perf_event_disable (struct perf_event *event);extern int __perf_event_disable (void *info);extern void perf_event_task_tick (void ); -#else +#else /* !CONFIG_PERF_EVENTS: */ static inline void perf_event_task_sched_in (struct task_struct *prev,struct task_struct *task) { }
@@ -802,6 +803,7 @@ static inline int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks) { return 0; }static inline void perf_event_mmap (struct vm_area_struct *vma) { } +static inline void perf_event_exec (void ) { }static inline void perf_event_comm (struct task_struct *tsk) { }static inline void perf_event_fork (struct task_struct *tsk) { }static inline void perf_event_init (void ) { }
kernel/events/core.c +16 -12
@@ -2970,6 +2970,22 @@ out:local_irq_restore (flags); } +void perf_event_exec (void ) +{ +struct perf_event_context *ctx; +int ctxn; + +rcu_read_lock (); +for_each_task_context_nr (ctxn) { + ctx = current->perf_event_ctxp[ctxn]; +if (!ctx) +continue ; + +perf_event_enable_on_exec (ctx); + } +rcu_read_unlock (); +} +/* * Cross CPU call to read the hardware event */
@@ -5057,18 +5073,6 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)void perf_event_comm (struct task_struct *task) {struct perf_comm_event comm_event; -struct perf_event_context *ctx; -int ctxn; - -rcu_read_lock (); -for_each_task_context_nr (ctxn) { - ctx = task->perf_event_ctxp[ctxn]; -if (!ctx) -continue ; - -perf_event_enable_on_exec (ctx); - } -rcu_read_unlock ();if (!atomic_read (&nr_comm_events))return ;
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf: Differentiate exec() and non-exec() comm events
In reply to Adrian Hunterperf: Differentiate exec() and non-exec() comm events
Commit-ID: 82b897782d10fcc4930c9d4a15b175348fdd2871 Gitweb: http://git.kernel.org/tip/82b897782d10fcc4930c9d4a15b175348fdd2871 Author: Adrian Hunter <[email protected]> AuthorDate: Wed, 28 May 2014 11:45:04 +0300 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 6 Jun 2014 07:56:22 +0200
perf: Differentiate exec() and non-exec() comm events
perf tools like 'perf report' can aggregate samples by comm strings, which generally works. However, there are other potential use-cases. For example, to pair up 'calls' with 'returns' accurately (from branch events like Intel BTS) it is necessary to identify whether the process has exec'd. Although a comm event is generated when an 'exec' happens it is also generated whenever the comm string is changed on a whim (e.g. by prctl PR_SET_NAME). This patch adds a flag to the comm event to differentiate one case from the other.
In order to determine whether the kernel supports the new flag, a selection bit named 'exec' is added to struct perf_event_attr. The bit does nothing but will cause perf_event_open() to fail if the bit is set on kernels that do not have it defined.
--- fs/exec.c | 6 +++--- include/linux/perf_event.h | 4 ++-- include/linux/sched.h | 6 +++++- include/uapi/linux/perf_event.h | 9 +++++++-- kernel/events/core.c | 4 ++-- 5 files changed, 19 insertions(+), 10 deletions(-)
fs/exec.c +3 -3
@@ -1046,13 +1046,13 @@ EXPORT_SYMBOL_GPL(get_task_comm);* so that a new one can be started */ -void set_task_comm (struct task_struct *tsk,const char *buf) +void __set_task_comm (struct task_struct *tsk,const char *buf,bool exec) {task_lock (tsk);trace_task_rename (tsk, buf);strlcpy (tsk->comm, buf,sizeof (tsk->comm));task_unlock (tsk); -perf_event_comm (tsk); +perf_event_comm (tsk, exec); }int flush_old_exec (struct linux_binprm * bprm)
@@ -1111,7 +1111,7 @@ void setup_new_exec(struct linux_binprm * bprm)set_dumpable (current->mm, suid_dumpable);perf_event_exec (); -set_task_comm (current,kbasename (bprm->filename)); +__set_task_comm (current,kbasename (bprm->filename), true);/* Set the new mm task size. We have to do that late because it may * depend on TIF_32BIT which is only updated in flush_thread() on
include/linux/perf_event.h +2 -2
@@ -707,7 +707,7 @@ extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *extern int perf_unregister_guest_info_callbacks (struct perf_guest_info_callbacks *callbacks);extern void perf_event_exec (void ); -extern void perf_event_comm (struct task_struct *tsk); +extern void perf_event_comm (struct task_struct *tsk,bool exec);extern void perf_event_fork (struct task_struct *tsk);/* Callchains */
@@ -815,7 +815,7 @@ static inline int perf_unregister_guest_info_callbacksstatic inline void perf_event_mmap (struct vm_area_struct *vma) { }static inline void perf_event_exec (void ) { } -static inline void perf_event_comm (struct task_struct *tsk) { } +static inline void perf_event_comm (struct task_struct *tsk,bool exec) { }static inline void perf_event_fork (struct task_struct *tsk) { }static inline void perf_event_init (void ) { }static inline int perf_swevent_get_recursion_context (void ) {return -1 ; }
include/linux/sched.h +5 -1
@@ -2379,7 +2379,11 @@ extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, istruct task_struct *fork_idle (int );extern pid_t kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -extern void set_task_comm (struct task_struct *tsk,const char *from); +extern void __set_task_comm (struct task_struct *tsk,const char *from,bool exec); +static inline void set_task_comm (struct task_struct *tsk,const char *from) +{ +__set_task_comm (tsk, from, false); +}extern char *get_task_comm (char *to,struct task_struct *tsk);#ifdef CONFIG_SMP
include/uapi/linux/perf_event.h +7 -2
@@ -302,8 +302,8 @@ struct perf_event_attr { exclude_callchain_kernel : 1, /* exclude kernel callchains */ exclude_callchain_user : 1, /* exclude user callchains */ mmap2 : 1, /* include mmap with inode data */ - - __reserved_1 : 40; + comm_exec : 1, /* flag comm events that are due to an exec */ + __reserved_1 : 39;union {__u32 wakeup_events;/* wakeup every n events */
@@ -502,7 +502,12 @@ struct perf_event_mmap_page {#define PERF_RECORD_MISC_GUEST_KERNEL (4 << 0)#define PERF_RECORD_MISC_GUEST_USER (5 << 0) +/* +* PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on +* different events so can reuse the same bit position. +*/ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13) +#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)/* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See also
kernel/events/core.c +2 -2
@@ -5090,7 +5090,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event) NULL); } -void perf_event_comm (struct task_struct *task) +void perf_event_comm (struct task_struct *task,bool exec) {struct perf_comm_event comm_event;
@@ -5104,7 +5104,7 @@ void perf_event_comm(struct task_struct *task) .event_id = { .header = { .type = PERF_RECORD_COMM, - .misc = 0, + .misc = exec ? PERF_RECORD_MISC_COMM_EXEC : 0, /* .size */ },/* .pid */