From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751619AbdFGQBs (ORCPT ); Wed, 7 Jun 2017 12:01:48 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37391 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbdFGQBq (ORCPT ); Wed, 7 Jun 2017 12:01:46 -0400 Date: Wed, 7 Jun 2017 08:59:21 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: dsahern@gmail.com, acme@redhat.com, mingo@kernel.org, a.p.zijlstra@chello.nl, andi@firstfloor.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, jolsa@kernel.org, dsahern@gmail.com, a.p.zijlstra@chello.nl, mingo@kernel.org, andi@firstfloor.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org In-Reply-To: <20170531120105.21731-3-namhyung@kernel.org> References: <20170531120105.21731-3-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf symbols: Use correct filename for compressed modules in build-id cache Git-Commit-ID: a09935b878dc8efd4b030ed1ffa0553fc9011fb8 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: a09935b878dc8efd4b030ed1ffa0553fc9011fb8 Gitweb: http://git.kernel.org/tip/a09935b878dc8efd4b030ed1ffa0553fc9011fb8 Author: Namhyung Kim AuthorDate: Wed, 31 May 2017 21:01:05 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 5 Jun 2017 14:17:59 -0300 perf symbols: Use correct filename for compressed modules in build-id cache The decompress_kmodule() decompresses kernel modules in order to load symbols from it. In the DSO_BINARY_TYPE__BUILD_ID_CACHE case, it needs the full file path to extract the file extension to determine the decompression method. But overwriting 'name' will fail the decompression since it might point to a non-existing old file. Instead, use dso->long_name for having the correct extension and use the real filename to decompress. In the DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE_COMP case, both names should be the same. This allows resolving symbols in the old modules. Before: $ perf report -i perf.data.old | grep scsi_mod 0.00% cc1 [scsi_mod] [k] 0x0000000000004aa6 0.00% as [scsi_mod] [k] 0x00000000000099e1 0.00% cc1 [scsi_mod] [k] 0x0000000000009830 0.00% cc1 [scsi_mod] [k] 0x0000000000001b8f After: 0.00% cc1 [scsi_mod] [k] scsi_handle_queue_ramp_up 0.00% as [scsi_mod] [k] scsi_sg_alloc 0.00% cc1 [scsi_mod] [k] scsi_setup_cmnd 0.00% cc1 [scsi_mod] [k] scsi_get_command Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Peter Zijlstra Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20170531120105.21731-3-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index e7ee47f..1fb2efa 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -649,10 +649,7 @@ static int decompress_kmodule(struct dso *dso, const char *name, type != DSO_BINARY_TYPE__BUILD_ID_CACHE) return -1; - if (type == DSO_BINARY_TYPE__BUILD_ID_CACHE) - name = dso->long_name; - - if (kmod_path__parse_ext(&m, name) || !m.comp) + if (kmod_path__parse_ext(&m, dso->long_name) || !m.comp) return -1; fd = mkstemp(tmpbuf);