From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbbJCHtz (ORCPT ); Sat, 3 Oct 2015 03:49:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59121 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbbJCHty (ORCPT ); Sat, 3 Oct 2015 03:49:54 -0400 Date: Sat, 3 Oct 2015 00:49:39 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: kan.liang@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, jolsa@redhat.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com Reply-To: mingo@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, jolsa@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, kan.liang@intel.com In-Reply-To: <1443587640-24242-1-git-send-email-namhyung@kernel.org> References: <1443587640-24242-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Fix a bug on "--call-graph none" option Git-Commit-ID: 208e7607459477432d3df52c32d4b961a96d4a94 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: 208e7607459477432d3df52c32d4b961a96d4a94 Gitweb: http://git.kernel.org/tip/208e7607459477432d3df52c32d4b961a96d4a94 Author: Namhyung Kim AuthorDate: Wed, 30 Sep 2015 13:34:00 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 1 Oct 2015 09:54:33 -0300 perf report: Fix a bug on "--call-graph none" option The patch f9db0d0f1b2c ("perf callchain: Allow disabling call graphs per event") added an ability to enable/disable callchain recording per event. But it had a problem when the enablement setting is changed at 'perf report' time using -g/--call-graph option. For example, the following scenario will get a segfault. $ perf record -ag sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.500 MB perf.data (2555 samples) ] $ perf report -g none perf: Segmentation fault -------- backtrace -------- perf[0x53a98a] /usr/lib/libc.so.6(+0x335af)[0x7f4e91df95af] This is because callchain_param.sort() callback was not set but it tried to call the function as it had the PERF_SAMPLE_CALLCHAIN bit. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Kan Liang Cc: Peter Zijlstra Fixes: f9db0d0f1b2c ("perf callchain: Allow disabling call graphs per event") Link: http://lkml.kernel.org/r/1443587640-24242-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 0cad9e0..c346b33 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1151,7 +1151,7 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog) struct perf_evsel *evsel = hists_to_evsel(hists); bool use_callchain; - if (evsel && !symbol_conf.show_ref_callgraph) + if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph) use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN; else use_callchain = symbol_conf.use_callchain;