From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Apr 2018 17:50:24 +0000 (-0700)
Subject: 3.18-stable patches
X-Git-Tag: v4.16.7~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a04e3b02704a62ba3474332fca91f4cc676ebde;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

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

diff --git a/queue-3.18/revert-perf-tests-decompress-kernel-module-before-objdump.patch b/queue-3.18/revert-perf-tests-decompress-kernel-module-before-objdump.patch
new file mode 100644
index 00000000000..8a69b8fe71a
--- /dev/null
+++ b/queue-3.18/revert-perf-tests-decompress-kernel-module-before-objdump.patch
@@ -0,0 +1,70 @@
+From 9580b588c86174f292ea6648320cea9f4d9f4128 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 091b3b4ba55daf8b28f40794aefdaa0bdb5af7a1 which is
+commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 upstream.
+
+It breaks the build of perf on 3.18.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>
+Reported-by: Murilo 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+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
+@@ -141,8 +141,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);
+@@ -204,25 +202,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-3.18/series b/queue-3.18/series
index d3036e67a46..1701cc90f33 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -22,3 +22,4 @@ kobject-don-t-use-warn-for-registration-failures.patch
 scsi-sd-defer-spinning-up-drive-while-sanitize-is-in-progress.patch
 asoc-fsl_esai-fix-divisor-calculation-failure-at-lower-ratio.patch
 libceph-validate-con-state-at-the-top-of-try_write.patch
+revert-perf-tests-decompress-kernel-module-before-objdump.patch