lkml.org 
[lkml]   [2016]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 60/66] perf python: Fix pyrf_evlist__read_on_cpu event consuming
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    We can't consume the event before parsing it. Under heavy load we could
    get caught by kernel writer overwriting the event we're trying to parse.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1468148882-10362-5-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/python.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
    index d0c1267741ee..c68ef0319114 100644
    --- a/tools/perf/util/python.c
    +++ b/tools/perf/util/python.c
    @@ -865,12 +865,14 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
    PyObject *pyevent = pyrf_event__new(event);
    struct pyrf_event *pevent = (struct pyrf_event *)pyevent;

    - perf_evlist__mmap_consume(evlist, cpu);
    -
    if (pyevent == NULL)
    return PyErr_NoMemory();

    err = perf_evlist__parse_sample(evlist, event, &pevent->sample);
    +
    + /* Consume the even only after we parsed it out. */
    + perf_evlist__mmap_consume(evlist, cpu);
    +
    if (err)
    return PyErr_Format(PyExc_OSError,
    "perf: can't parse sample, err=%d", err);
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-07-13 01:21    [W:2.804 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site