Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1660851

[PATCH v4 7/9] perf test: Decompress kernel module before objdump

Show all headers | View raw

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 <namhyung@kernel.org>
---
 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 1f14e7612cbb..94b7c7b02bde 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
-- 
2.13.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
  [PATCH v4 3/9] perf tools: Introduce dso__decompress_kmodule_{fd,path} Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    [tip:perf/urgent] perf tools: Introduce  dso__decompress_kmodule_{fd,path} tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  [PATCH v4 7/9] perf test: Decompress kernel module before objdump Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    Re: [PATCH v4 7/9] perf test: Decompress kernel module before objdump Adrian Hunter <adrian.hunter@intel.com> - 2017-06-08 09:50 +0200
    [tip:perf/urgent] perf tests: Decompress kernel module before  objdump tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  [PATCH v4 9/9] perf symbols: Kill dso__build_id_is_kmod() Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    [tip:perf/urgent] perf symbols: Kill dso__build_id_is_kmod() tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  [PATCH v4 4/9] perf annotate: Use dso__decompress_kmodule_path() Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    [tip:perf/urgent] perf annotate: Use dso__decompress_kmodule_path() tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  [PATCH v4 6/9] perf tools: Consolidate error path in __open_dso() Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    [tip:perf/urgent] perf tools: Consolidate error path in  __open_dso() tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  [PATCH v4 8/9] perf symbols: Keep DSO->symtab_type after decompress Namhyung Kim <namhyung@kernel.org> - 2017-06-08 09:40 +0200
    [tip:perf/urgent] perf symbols: Keep DSO->symtab_type after  decompress tip-bot for Namhyung Kim <tipbot@zytor.com> - 2017-06-09 01:00 +0200
  Re: [PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Jiri Olsa <jolsa@redhat.com> - 2017-06-08 14:20 +0200

csiph-web