From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Apr 2018 13:00:29 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.16.3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df1ccedb8831745c493c12ddcafec9bf4d3f7351;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	revert-perf-tests-decompress-kernel-module-before-objdump.patch
---

diff --git a/queue-4.9/revert-perf-tests-decompress-kernel-module-before-objdump.patch b/queue-4.9/revert-perf-tests-decompress-kernel-module-before-objdump.patch
new file mode 100644
index 00000000000..15c607724fe
--- /dev/null
+++ b/queue-4.9/revert-perf-tests-decompress-kernel-module-before-objdump.patch
@@ -0,0 +1,67 @@
+From d19e5989718bb371cf20e61c3e1cbd8013e254fb Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 17 Apr 2018 14:56:21 +0200
+Subject: Revert "perf tests: Decompress kernel module before objdump"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 7525a238be8f46617cdda29d1be5b85ffe3b042d which is
+commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 upstream.
+
+It breaks the build of perf on 4.9.y, so I'm dropping it.
+
+Reported-by: Pavlos Parissis <pavlos.parissis@gmail.com>
+Reported-by: Lei Chen <chenl.lei@gmail.com>
+Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/tests/code-reading.c |   20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+--- a/tools/perf/tests/code-reading.c
++++ b/tools/perf/tests/code-reading.c
+@@ -224,8 +224,6 @@ static int read_object_code(u64 addr, si
+ 	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);
+@@ -286,25 +284,9 @@ static int read_object_code(u64 addr, si
+ 		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
diff --git a/queue-4.9/series b/queue-4.9/series
index 2b0acb57570..1d2e17f4bad 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -49,3 +49,4 @@ arm-arm64-smccc-implement-smccc-v1.1-inline-primitive.patch
 arm64-add-arm_smccc_arch_workaround_1-bp-hardening-support.patch
 arm64-kill-psci_get_version-as-a-variant-2-workaround.patch
 sunrpc-remove-incorrect-hmac-request-initialization.patch
+revert-perf-tests-decompress-kernel-module-before-objdump.patch