From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 30 May 2018 09:43:46 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.14.46~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8407083d09e7a493c52ec64ba23c61738b34dcd6;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	revert-perf-record-fix-crash-in-pipe-mode.patch
---

diff --git a/queue-4.14/revert-perf-record-fix-crash-in-pipe-mode.patch b/queue-4.14/revert-perf-record-fix-crash-in-pipe-mode.patch
new file mode 100644
index 00000000000..9613f1f622a
--- /dev/null
+++ b/queue-4.14/revert-perf-record-fix-crash-in-pipe-mode.patch
@@ -0,0 +1,87 @@
+From 7eff2b2d9f2419170fec116254466f73577a4425 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 30 May 2018 11:41:46 +0200
+Subject: Revert "perf record: Fix crash in pipe mode"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit f766148e47d7d3b8a7128cae511971c0f793e38e which is
+commit ad46e48c65fa1f204fa29eaff1b91174d314a94b upstream.
+
+It breaks the build.  Turns out we don't test perf on stable releases,
+we need to fix that :(
+
+Reported-by: Pavlos Parissis <pavlos.parissis@gmail.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: David Ahern <dsahern@gmail.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+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/builtin-record.c |    9 ---------
+ tools/perf/perf.h           |    1 -
+ tools/perf/util/record.c    |    8 ++------
+ 3 files changed, 2 insertions(+), 16 deletions(-)
+
+--- a/tools/perf/builtin-record.c
++++ b/tools/perf/builtin-record.c
+@@ -926,15 +926,6 @@ static int __cmd_record(struct record *r
+ 		}
+ 	}
+ 
+-	/*
+-	 * If we have just single event and are sending data
+-	 * through pipe, we need to force the ids allocation,
+-	 * because we synthesize event name through the pipe
+-	 * and need the id for that.
+-	 */
+-	if (data->is_pipe && rec->evlist->nr_entries == 1)
+-		rec->opts.sample_id = true;
+-
+ 	if (record__open(rec) != 0) {
+ 		err = -1;
+ 		goto out_child;
+--- a/tools/perf/perf.h
++++ b/tools/perf/perf.h
+@@ -61,7 +61,6 @@ struct record_opts {
+ 	bool	     tail_synthesize;
+ 	bool	     overwrite;
+ 	bool	     ignore_missing_thread;
+-	bool	     sample_id;
+ 	unsigned int freq;
+ 	unsigned int mmap_pages;
+ 	unsigned int auxtrace_mmap_pages;
+--- a/tools/perf/util/record.c
++++ b/tools/perf/util/record.c
+@@ -137,7 +137,6 @@ void perf_evlist__config(struct perf_evl
+ 	struct perf_evsel *evsel;
+ 	bool use_sample_identifier = false;
+ 	bool use_comm_exec;
+-	bool sample_id = opts->sample_id;
+ 
+ 	/*
+ 	 * Set the evsel leader links before we configure attributes,
+@@ -164,7 +163,8 @@ void perf_evlist__config(struct perf_evl
+ 		 * match the id.
+ 		 */
+ 		use_sample_identifier = perf_can_sample_identifier();
+-		sample_id = true;
++		evlist__for_each_entry(evlist, evsel)
++			perf_evsel__set_sample_id(evsel, use_sample_identifier);
+ 	} else if (evlist->nr_entries > 1) {
+ 		struct perf_evsel *first = perf_evlist__first(evlist);
+ 
+@@ -174,10 +174,6 @@ void perf_evlist__config(struct perf_evl
+ 			use_sample_identifier = perf_can_sample_identifier();
+ 			break;
+ 		}
+-		sample_id = true;
+-	}
+-
+-	if (sample_id) {
+ 		evlist__for_each_entry(evlist, evsel)
+ 			perf_evsel__set_sample_id(evsel, use_sample_identifier);
+ 	}
diff --git a/queue-4.14/series b/queue-4.14/series
index a8f185155dc..f025f0f3bc1 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1,3 +1,4 @@
+revert-perf-record-fix-crash-in-pipe-mode.patch
 objtool-support-gcc-8-s-cold-subfunctions.patch
 objtool-support-gcc-8-switch-tables.patch
 objtool-detect-rip-relative-switch-table-references.patch