From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbdFHWyQ (ORCPT ); Thu, 8 Jun 2017 18:54:16 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55341 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878AbdFHWyO (ORCPT ); Thu, 8 Jun 2017 18:54:14 -0400 Date: Thu, 8 Jun 2017 15:51:44 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, adrian.hunter@intel.com, hpa@zytor.com, wangnan0@huawei.com Reply-To: wangnan0@huawei.com, adrian.hunter@intel.com, acme@redhat.com, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org In-Reply-To: <20170608073109.30699-6-namhyung@kernel.org> References: <20170608073109.30699-6-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Decompress kernel module when reading DSO data Git-Commit-ID: 1d6b3c9ba756a5134fd7ad1959acac776d17404b 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: 1d6b3c9ba756a5134fd7ad1959acac776d17404b Gitweb: http://git.kernel.org/tip/1d6b3c9ba756a5134fd7ad1959acac776d17404b Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:05 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:39:07 -0300 perf tools: Decompress kernel module when reading DSO data Currently perf decompresses kernel modules when loading the symbol table but it missed to do it when reading raw data. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Peter Zijlstra Cc: Wang Nan Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20170608073109.30699-6-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index b346b8e..c63525d 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -475,7 +475,23 @@ static int __open_dso(struct dso *dso, struct machine *machine) return -EINVAL; } + if (dso__needs_decompress(dso)) { + char newpath[KMOD_DECOMP_LEN]; + size_t len = sizeof(newpath); + + if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) { + free(name); + return -dso->load_errno; + } + + strcpy(name, newpath); + } + fd = do_open(name); + + if (dso__needs_decompress(dso)) + unlink(name); + free(name); return fd; }