Commit db0ba84c authored by Janne Huttunen's avatar Janne Huttunen Committed by Arnaldo Carvalho de Melo

perf script python: Fix dict reference counting

The dictionaries are attached to the parameter tuple that steals the
references and takes care of releasing them when appropriate.  The code
should not decrement the reference counts explicitly.  E.g. if libpython
has been built with reference debugging enabled, the superfluous DECREFs
will trigger this error when running perf script:

  Fatal Python error: Objects/tupleobject.c:238 object at
  0x7f10f2041b40 has negative ref count -1
  Aborted (core dumped)

If the reference debugging is not enabled, the superfluous DECREFs might
cause the dict objects to be silently released while they are still in
use. This may trigger various other assertions or just cause perf
crashes and/or weird and unexpected data changes in the stored Python
objects.
Signed-off-by: default avatarJanne Huttunen <janne.huttunen@nokia.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jaroslav Skarvada <jskarvad@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1531133990-17485-1-git-send-email-janne.huttunen@nokia.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c818cc06
...@@ -908,14 +908,11 @@ static void python_process_tracepoint(struct perf_sample *sample, ...@@ -908,14 +908,11 @@ static void python_process_tracepoint(struct perf_sample *sample,
if (_PyTuple_Resize(&t, n) == -1) if (_PyTuple_Resize(&t, n) == -1)
Py_FatalError("error resizing Python tuple"); Py_FatalError("error resizing Python tuple");
if (!dict) { if (!dict)
call_object(handler, t, handler_name); call_object(handler, t, handler_name);
} else { else
call_object(handler, t, default_handler_name); call_object(handler, t, default_handler_name);
Py_DECREF(dict);
}
Py_XDECREF(all_entries_dict);
Py_DECREF(t); Py_DECREF(t);
} }
...@@ -1235,7 +1232,6 @@ static void python_process_general_event(struct perf_sample *sample, ...@@ -1235,7 +1232,6 @@ static void python_process_general_event(struct perf_sample *sample,
call_object(handler, t, handler_name); call_object(handler, t, handler_name);
Py_DECREF(dict);
Py_DECREF(t); Py_DECREF(t);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment