Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36af635c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "perf tests: Decompress kernel module before objdump" 



This reverts commit 091b3b4b which is
commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 upstream.

It breaks the build of perf on 3.18.y, so I'm dropping it.

Reported-by: default avatarPavlos Parissis <pavlos.parissis@gmail.com>
Reported-by: default avatarLei Chen <chenl.lei@gmail.com>
Reported-by: default avatarMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reported-by: default avatarMurilo Opsfelder Araujo <muriloo@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: kernel-team@lge.com
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdf3b718

tools/perf/tests/code-reading.c

+1 −19
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ 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);
@@ -204,25 +202,9 @@ 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(objdump_name, objdump_addr, buf2, len);



	if (dso__needs_decompress(al.map->dso))

		unlink(objdump_name);



	ret = read_via_objdump(al.map->dso->long_name, objdump_addr, buf2, len);

	if (ret > 0) {

		/*

		 * The kernel maps are inaccurate - assume objdump is right in