From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895AbdFHWzE (ORCPT ); Thu, 8 Jun 2017 18:55:04 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42777 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926AbdFHWzD (ORCPT ); Thu, 8 Jun 2017 18:55:03 -0400 Date: Thu, 8 Jun 2017 15:52:49 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: dsahern@gmail.com, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com Reply-To: jolsa@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, dsahern@gmail.com, wangnan0@huawei.com In-Reply-To: <20170608073109.30699-8-namhyung@kernel.org> References: <20170608073109.30699-8-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tests: Decompress kernel module before objdump Git-Commit-ID: 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 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: 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 Gitweb: http://git.kernel.org/tip/94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:07 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:39:19 -0300 perf tests: Decompress kernel module before objdump If a kernel modules is compressed, it should be decompressed before running objdump to parse binary data correctly. This fixes a failure of object code reading test for me. Signed-off-by: Namhyung Kim Acked-by: Adrian Hunter Acked-by: Jiri Olsa Cc: David Ahern Cc: Peter Zijlstra Cc: Wang Nan Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20170608073109.30699-8-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/code-reading.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 1f14e76..94b7c7b 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -229,6 +229,8 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, unsigned char buf2[BUFSZ]; size_t ret_len; u64 objdump_addr; + const char *objdump_name; + char decomp_name[KMOD_DECOMP_LEN]; int ret; pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr); @@ -289,9 +291,25 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, state->done[state->done_cnt++] = al.map->start; } + objdump_name = al.map->dso->long_name; + if (dso__needs_decompress(al.map->dso)) { + if (dso__decompress_kmodule_path(al.map->dso, objdump_name, + decomp_name, + sizeof(decomp_name)) < 0) { + pr_debug("decompression failed\n"); + return -1; + } + + objdump_name = decomp_name; + } + /* Read the object code using objdump */ objdump_addr = map__rip_2objdump(al.map, al.addr); - ret = read_via_objdump(al.map->dso->long_name, objdump_addr, buf2, len); + ret = read_via_objdump(objdump_name, objdump_addr, buf2, len); + + if (dso__needs_decompress(al.map->dso)) + unlink(objdump_name); + if (ret > 0) { /* * The kernel maps are inaccurate - assume objdump is right in