From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755884AbcHXJWq (ORCPT ); Wed, 24 Aug 2016 05:22:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43972 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753643AbcHXJWj (ORCPT ); Wed, 24 Aug 2016 05:22:39 -0400 Date: Wed, 24 Aug 2016 02:21:42 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, mingo@kernel.org, adrian.hunter@intel.com, acme@redhat.com, wangnan0@huawei.com, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf disassemble: Move check for kallsyms + !kcore Git-Commit-ID: c12944f7faa7f76441d83c1413f13e8bc70162b2 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: c12944f7faa7f76441d83c1413f13e8bc70162b2 Gitweb: http://git.kernel.org/tip/c12944f7faa7f76441d83c1413f13e8bc70162b2 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 9 Aug 2016 14:56:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Aug 2016 15:37:33 -0300 perf disassemble: Move check for kallsyms + !kcore We don't need to do all that filename logic to then just have to test something unrelated and bail out, move it to the start of the function. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-lk1v4srtsktonnyp6t1o0uhx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 4024d30..9882bc6 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1165,11 +1165,10 @@ int symbol__strerror_disassemble(struct symbol *sym __maybe_unused, struct map * int symbol__disassemble(struct symbol *sym, struct map *map, size_t privsize) { struct dso *dso = map->dso; - char *filename = dso__build_id_filename(dso, NULL, 0); + char *filename; bool free_filename = true; char command[PATH_MAX * 2]; FILE *file; - int err = 0; char symfs_filename[PATH_MAX]; struct kcore_extract kce; bool delete_extract = false; @@ -1177,7 +1176,13 @@ int symbol__disassemble(struct symbol *sym, struct map *map, size_t privsize) int lineno = 0; int nline; pid_t pid; + int err = SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; + + if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && + !dso__is_kcore(dso)) + goto out; + filename = dso__build_id_filename(dso, NULL, 0); if (filename) symbol__join_symfs(symfs_filename, filename); @@ -1201,12 +1206,6 @@ fallback: free_filename = false; } - if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && - !dso__is_kcore(dso)) { - err = SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; - goto out_free_filename; - } - pr_debug("%s: filename=%s, sym=%s, start=%#" PRIx64 ", end=%#" PRIx64 "\n", __func__, filename, sym->name, map->unmap_ip(map, sym->start), map->unmap_ip(map, sym->end)); @@ -1338,6 +1337,7 @@ out_free_filename: kcore_extract__delete(&kce); if (free_filename) free(filename); +out: return err; out_close_stdout: