From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbcGSGyi (ORCPT ); Tue, 19 Jul 2016 02:54:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44374 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269AbcGSGyd (ORCPT ); Tue, 19 Jul 2016 02:54:33 -0400 Date: Mon, 18 Jul 2016 23:54:03 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, acme@redhat.com Reply-To: tglx@linutronix.de, peterz@infradead.org, mhiramat@kernel.org, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <146885835596.16106.2293540792775552481.stgit@devbox> References: <146885835596.16106.2293540792775552481.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Warn unmatched function filter correctly Git-Commit-ID: e70493429bb1acaad829caae01c61dd7056fe671 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: e70493429bb1acaad829caae01c61dd7056fe671 Gitweb: http://git.kernel.org/tip/e70493429bb1acaad829caae01c61dd7056fe671 Author: Masami Hiramatsu AuthorDate: Tue, 19 Jul 2016 01:12:41 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 Jul 2016 19:46:34 -0300 perf probe: Warn unmatched function filter correctly Warn unmatched function filter correctly instead of warning "symbol-loading error", since that can be a filter issue. >>From the technical point of view, this adds a filter chech in map__load and if there is a filter, it returns -2 (filter-out), instead of -1 (error), and perf-probe checks it and change message. E.g. without this fix: # perf probe -F rt_sp* no symbols found in [kernel.kallsyms], maybe install a debug package? Failed to load symbols in kernel With this fix: # perf probe -F rt_sp* no symbols passed the given filter. Failed to find symbols matched to "rt_sp*" Error: Failed to show functions. Reported-and-Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/146885835596.16106.2293540792775552481.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 3 +++ tools/perf/util/probe-event.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index b39b12a..728129a 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -312,6 +312,9 @@ int map__load(struct map *map, symbol_filter_t filter) pr_warning("%.*s was updated (is prelink enabled?). " "Restart the long running apps that use it!\n", (int)real_len, name); + } else if (filter) { + pr_warning("no symbols passed the given filter.\n"); + return -2; /* Empty but maybe by the filter */ } else { pr_warning("no symbols found in %s, maybe install " "a debug package?\n", name); diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index d4f8835..953dc1a 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -3312,8 +3312,16 @@ int show_available_funcs(const char *target, struct strfilter *_filter, /* Load symbols with given filter */ available_func_filter = _filter; - if (map__load(map, filter_available_functions)) { - pr_err("Failed to load symbols in %s\n", (target) ? : "kernel"); + ret = map__load(map, filter_available_functions); + if (ret) { + if (ret == -2) { + char *str = strfilter__string(_filter); + pr_err("Failed to find symbols matched to \"%s\"\n", + str); + free(str); + } else + pr_err("Failed to load symbols in %s\n", + (target) ? : "kernel"); goto end; } if (!dso__sorted_by_name(map->dso, map->type))