diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2015-06-11 10:32:01 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-09-15 13:57:10 -0400 |
| commit | c08266ad1aa01aa974f1ac1c960b93f70a0c7915 (patch) | |
| tree | 5f5b7bafd37c68118e534247c1f953e0b3cc26fe /kernel | |
| parent | 92eea3808638b5cbce8b542135892cf15e4ae0ad (diff) | |
| download | lwn-c08266ad1aa01aa974f1ac1c960b93f70a0c7915.tar.gz lwn-c08266ad1aa01aa974f1ac1c960b93f70a0c7915.zip | |
perf: Fix fasync handling on inherited events
[ Upstream commit fed66e2cdd4f127a43fd11b8d92a99bdd429528c ]
Vince reported that the fasync signal stuff doesn't work proper for
inherited events. So fix that.
Installing fasync allocates memory and sets filp->f_flags |= FASYNC,
which upon the demise of the file descriptor ensures the allocation is
freed and state is updated.
Now for perf, we can have the events stick around for a while after the
original FD is dead because of references from child events. So we
cannot copy the fasync pointer around. We can however consistently use
the parent's fasync, as that will be updated.
Reported-and-Tested-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Cc: Arnaldo Carvalho deMelo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: eranian@google.com
Link: http://lkml.kernel.org/r/1434011521.1495.71.camel@twins
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index cb86038cad47..0a3887439757 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4398,12 +4398,20 @@ static const struct file_operations perf_fops = { * to user-space before waking everybody up. */ +static inline struct fasync_struct **perf_event_fasync(struct perf_event *event) +{ + /* only the parent has fasync state */ + if (event->parent) + event = event->parent; + return &event->fasync; +} + void perf_event_wakeup(struct perf_event *event) { ring_buffer_wakeup(event); if (event->pending_kill) { - kill_fasync(&event->fasync, SIGIO, event->pending_kill); + kill_fasync(perf_event_fasync(event), SIGIO, event->pending_kill); event->pending_kill = 0; } } @@ -5638,7 +5646,7 @@ static int __perf_event_overflow(struct perf_event *event, else perf_event_output(event, data, regs); - if (event->fasync && event->pending_kill) { + if (*perf_event_fasync(event) && event->pending_kill) { event->pending_wakeup = 1; irq_work_queue(&event->pending); } |