From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753442AbcD0PbR (ORCPT ); Wed, 27 Apr 2016 11:31:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50770 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753250AbcD0PbN (ORCPT ); Wed, 27 Apr 2016 11:31:13 -0400 Date: Wed, 27 Apr 2016 08:30:52 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, acme@redhat.com, milian.wolff@kdab.com, jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com Reply-To: jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, wangnan0@huawei.com, acme@redhat.com, milian.wolff@kdab.com, dsahern@gmail.com, hpa@zytor.com, adrian.hunter@intel.com, namhyung@kernel.org, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Make --pf honour --min-stack too Git-Commit-ID: 1df54290463e84b7b5eb26e5e6472167c3749901 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: 1df54290463e84b7b5eb26e5e6472167c3749901 Gitweb: http://git.kernel.org/tip/1df54290463e84b7b5eb26e5e6472167c3749901 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 20 Apr 2016 20:06:02 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 25 Apr 2016 12:49:17 -0300 perf trace: Make --pf honour --min-stack too To check deeply nested page fault callchains. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-wuji34xx003kr88nmqt6jkgf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index fc276d7..a4b133f 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2190,8 +2190,19 @@ static int trace__pgfault(struct trace *trace, char map_type = 'd'; struct thread_trace *ttrace; int err = -1; + int callchain_ret = 0; thread = machine__findnew_thread(trace->host, sample->pid, sample->tid); + + if (sample->callchain) { + callchain_ret = trace__resolve_callchain(trace, evsel, sample, &callchain_cursor); + if (callchain_ret == 0) { + if (callchain_cursor.nr < trace->min_stack) + goto out_put; + callchain_ret = 1; + } + } + ttrace = thread__trace(thread, trace->output); if (ttrace == NULL) goto out_put; @@ -2234,10 +2245,10 @@ static int trace__pgfault(struct trace *trace, fprintf(trace->output, " (%c%c)\n", map_type, al.level); - if (sample->callchain) { - if (trace__resolve_callchain(trace, evsel, sample, &callchain_cursor) == 0) - trace__fprintf_callchain(trace, sample); - } + if (callchain_ret > 0) + trace__fprintf_callchain(trace, sample); + else if (callchain_ret < 0) + pr_err("Problem processing %s callchain, skipping...\n", perf_evsel__name(evsel)); out: err = 0; out_put: