diff options
| author |   Jiri Olsa <jolsa@kernel.org> | 2016-07-10 13:07:56 +0200 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-07-12 16:16:44 -0300 |
| commit | e8968e654191390a1300f0847250353a1c9da30d (patch) | |
| tree | 1cf0c700b38d1e139f730f3059ad86743dd2266a /tools/perf | |
| parent | perf python: Init perf_event_attr::size in perf.evsel constructor (diff) | |
| download | linux-dev-e8968e654191390a1300f0847250353a1c9da30d.tar.xz linux-dev-e8968e654191390a1300f0847250353a1c9da30d.zip | |
perf python: Fix pyrf_evlist__read_on_cpu event consuming
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>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/python.c | 6 |
1 files 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); |