Merge tag 'perf-urgent-for-mingo-5.0-20190121' of git:// into perf/urgent

This change “Merge tag ‘perf-urgent-for-mingo-5.0-20190121’ of git:// into perf/urgent” in Linux kernel is authored by Ingo Molnar <mingo [at]> on Tue Jan 22 11:08:47 2019 +0100.

Merge tag 'perf-urgent-for-mingo-5.0-20190121' of git:// into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:


  Stephane Eranian:

  - Fix perf_proc_update_handler() bug.

perf script:

  Andi Kleen:

  - Fix crash with printing mixed trace point and other events.

  Tony Jones:

  - Fix crash when processing recorded stat data.

perf top:

  He Kuang:

  - Fix wrong hottest instruction highlighted.

perf python:

  Arnaldo Carvalho de Melo:

  - Remove -fstack-clash-protection when building with some clang versions.

perf ordered_events:

  Jiri Olsa:

  - Fix out of buffers crash in ordered_events__free().

perf cpu_map:

  Stephane Eranian:

  - Handle TOPOLOGY headers with no CPU.

Signed-off-by: Arnaldo Carvalho de Melo <>
Signed-off-by: Ingo Molnar <>

This Linux change may have been applied to various maintained Linux releases and you can find Linux releases including commit d3c8c0a.

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 tools/perf/builtin-script.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 357906e..ac221f1 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1681,13 +1681,8 @@ static void perf_sample__fprint_metric(struct perf_script *script,
 		.force_header = false,
 	struct perf_evsel *ev2;
-	static bool init;
 	u64 val;
-	if (!init) {
-		perf_stat__init_shadow_stats();
-		init = true;
-	}
 	if (!evsel->stats)
 		perf_evlist__alloc_stats(script->session->evlist, false);
 	if (evsel_script(evsel->leader)->gnum++ == 0)
@@ -2359,6 +2354,8 @@ static int __cmd_script(struct perf_script *script)
 	signal(SIGINT, sig_handler);
+	perf_stat__init_shadow_stats();
 	/* override event processing functions */
 	if (script->show_task_events) {
 		script->tool.comm = process_comm_event;

The commit for this change in Linux stable tree is d3c8c0a (patch).

Leave a Reply

Your email address will not be published. Required fields are marked *