4.19-stable patches

added patches:
	revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch

diff --git a/queue-4.19/revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch b/queue-4.19/revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
new file mode 100644 (file)
index 0000000..0edfbb0
--- /dev/null
+++ b/queue-4.19/revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
@@ -0,0 +1,81 @@
+From carnil@debian.org  Fri Nov 20 09:33:00 2020
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Fri, 20 Nov 2020 08:39:09 +0100
+Subject: Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
+To: stable@vger.kernel.org
+Cc: Salvatore Bonaccorso <carnil@debian.org>, Leo Yan <leo.yan@linaro.org>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Namhyung Kim <namhyung@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Suzuki Poulouse <suzuki.poulose@arm.com>, Tor Jeremiassen <tor@ti.com>, linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo <acme@redhat.com>, Guenter Roeck <linux@roeck-us.net>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Message-ID: <20201120073909.357536-1-carnil@debian.org>
+
+From: Salvatore Bonaccorso <carnil@debian.org>
+
+This reverts commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream.
+(but only from 4.19.y)
+
+The original commit introduces a build failure as seen on Debian buster
+when compiled with gcc (Debian 8.3.0-6) 8.3.0:
+
+  $ LC_ALL=C.UTF-8 ARCH=x86 make perf
+  [...]
+  Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'
+    CC       util/cs-etm-decoder/cs-etm-decoder.o
+    CC       util/intel-pt.o
+  util/cs-etm-decoder/cs-etm-decoder.c: In function 'cs_etm_decoder__buffer_packet':
+  util/cs-etm-decoder/cs-etm-decoder.c:287:24: error: 'traceid_list' undeclared (first use in this function); did you mean 'trace_event'?
+    inode = intlist__find(traceid_list, trace_chan_id);
+                          ^~~~~~~~~~~~
+                          trace_event
+  util/cs-etm-decoder/cs-etm-decoder.c:287:24: note: each undeclared identifier is reported only once for each function it appears in
+  make[6]: *** [/build/linux-stable/tools/build/Makefile.build:97: util/cs-etm-decoder/cs-etm-decoder.o] Error 1
+  make[5]: *** [/build/linux-stable/tools/build/Makefile.build:139: cs-etm-decoder] Error 2
+  make[5]: *** Waiting for unfinished jobs....
+  make[4]: *** [/build/linux-stable/tools/build/Makefile.build:139: util] Error 2
+  make[3]: *** [Makefile.perf:633: libperf-in.o] Error 2
+  make[2]: *** [Makefile.perf:206: sub-make] Error 2
+  make[1]: *** [Makefile:70: all] Error 2
+  make: *** [Makefile:77: perf] Error 2
+
+Link: https://lore.kernel.org/stable/20201114083501.GA468764@eldamar.lan/
+Cc: Leo Yan <leo.yan@linaro.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
+Cc: Tor Jeremiassen <tor@ti.com>
+Cc: linux-arm-kernel@lists.infradead.org
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: <stable@vger.kernel.org> # 4.19.y
+Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/util/cs-etm.c |    3 ---
+ tools/perf/util/cs-etm.h |    3 +++
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/tools/perf/util/cs-etm.c
++++ b/tools/perf/util/cs-etm.c
+@@ -87,9 +87,6 @@ struct cs_etm_queue {
+       struct cs_etm_packet *packet;
+ };
+ 
+-/* RB tree for quick conversion between traceID and metadata pointers */
+-static struct intlist *traceid_list;
+-
+ static int cs_etm__update_queues(struct cs_etm_auxtrace *etm);
+ static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm,
+                                          pid_t tid, u64 time_);
+--- a/tools/perf/util/cs-etm.h
++++ b/tools/perf/util/cs-etm.h
+@@ -53,6 +53,9 @@ enum {
+       CS_ETMV4_PRIV_MAX,
+ };
+ 
++/* RB tree for quick conversion between traceID and CPUs */
++struct intlist *traceid_list;
++
+ #define KiB(x) ((x) * 1024)
+ #define MiB(x) ((x) * 1024 * 1024)
+ 

diff --git a/queue-4.19/series b/queue-4.19/series
index d46578172c3068ac6cfd545d9404506a1aeca194..98f80a39cd5937f9e2a0e513f3131fe9d337687c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -5,3 +5,4 @@ powerpc-implement-user_access_begin-and-friends.patch
 powerpc-fix-__clear_user-with-kuap-enabled.patch
 powerpc-uaccess-evaluate-macro-arguments-once-before-user-access-is-allowed.patch
 powerpc-64s-flush-l1d-after-user-accesses.patch
+revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch