lkml.org 
[lkml]   [2016]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 078/218] perf/core: Fix perf_sched_count derailment
    Date
    4.2.8-ckt7 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Alexander Shishkin <alexander.shishkin@linux.intel.com>

    commit 927a5570855836e5d5859a80ce7e91e963545e8f upstream.

    The error path in perf_event_open() is such that asking for a sampling
    event on a PMU that doesn't generate interrupts will end up in dropping
    the perf_sched_count even though it hasn't been incremented for this
    event yet.

    Given a sufficient amount of these calls, we'll end up disabling
    scheduler's jump label even though we'd still have active events in the
    system, thereby facilitating the arrival of the infernal regions upon us.

    I'm fixing this by moving account_event() inside perf_event_alloc().

    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Vince Weaver <vincent.weaver@maine.edu>
    Cc: vince@deater.net
    Link: http://lkml.kernel.org/r/1456917854-29427-1-git-send-email-alexander.shishkin@linux.intel.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    kernel/events/core.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/kernel/events/core.c b/kernel/events/core.c
    index d86859f..ca03e01 100644
    --- a/kernel/events/core.c
    +++ b/kernel/events/core.c
    @@ -7672,6 +7672,9 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
    }
    }

    + /* symmetric to unaccount_event() in _free_event() */
    + account_event(event);
    +
    return event;

    err_per_task:
    @@ -8035,8 +8038,6 @@ SYSCALL_DEFINE5(perf_event_open,
    }
    }

    - account_event(event);
    -
    /*
    * Special case software events and allow them to be part of
    * any hardware group.
    @@ -8296,8 +8297,6 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
    /* Mark owner so we could distinguish it from user events. */
    event->owner = EVENT_OWNER_KERNEL;

    - account_event(event);
    -
    ctx = find_get_context(event->pmu, task, event);
    if (IS_ERR(ctx)) {
    err = PTR_ERR(ctx);
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-03-31 23:21    [W:4.107 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site