From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754567AbbHFHBQ (ORCPT ); Thu, 6 Aug 2015 03:01:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55874 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422AbbHFHBP (ORCPT ); Thu, 6 Aug 2015 03:01:15 -0400 Date: Thu, 6 Aug 2015 00:00:41 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, eranian@google.com, tglx@linutronix.de, fweisbec@gmail.com, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, bp@suse.de, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org, hpa@zytor.com Reply-To: bp@suse.de, acme@redhat.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, eranian@google.com, tglx@linutronix.de, fweisbec@gmail.com, adrian.hunter@intel.com, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf script: No tracepoints? Don' t call libtraceevent. Git-Commit-ID: 9ee67421fe3b67a0796d6ea620fd5fcb037d3f89 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9ee67421fe3b67a0796d6ea620fd5fcb037d3f89 Gitweb: http://git.kernel.org/tip/9ee67421fe3b67a0796d6ea620fd5fcb037d3f89 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 3 Aug 2015 16:27:40 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 4 Aug 2015 12:28:10 -0300 perf script: No tracepoints? Don't call libtraceevent. The libtraceevent handler (session->tevent) is only initialized when there are tracepoints in a perf.data event list, so do not call pevent_set_function_resolve() in those cases, fixing a segfault. Reported-by: Jiri Olsa Tested-by: Jiri Olsa Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-xyynkucl5p4bcs13zi4i4b1f@git.kernel.org Report-link: http://lkml.kernel.org/r/20150803174113.GA20282@krava.redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index bd31380..7912feb 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1861,7 +1861,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) else symbol_conf.use_callchain = false; - if (pevent_set_function_resolver(session->tevent.pevent, + if (session->tevent.pevent && + pevent_set_function_resolver(session->tevent.pevent, machine__resolve_kernel_addr, &session->machines.host) < 0) { pr_err("%s: failed to set libtraceevent function resolver\n", __func__);