lkml.org 
[lkml]   [2015]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 21/57] perf: Fix fasync handling on inherited events
    Date
    3.13.11-ckt27 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Peter Zijlstra <peterz@infradead.org>

    commit fed66e2cdd4f127a43fd11b8d92a99bdd429528c upstream.

    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: 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: Kamal Mostafa <kamal@canonical.com>
    ---
    kernel/events/core.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/kernel/events/core.c b/kernel/events/core.c
    index c0c8911..f1aec1c 100644
    --- a/kernel/events/core.c
    +++ b/kernel/events/core.c
    @@ -4171,12 +4171,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;
    }
    }
    @@ -5385,7 +5393,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);
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-22 20:21    [W:4.177 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site