From: Sasha Levin Date: Sun, 29 Dec 2019 02:46:00 +0000 (-0500) Subject: Drop perf-intel-bts-does-not-support-aux-area-sampling.patch X-Git-Tag: v4.14.161~17^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05b70c8a93771f40be8e80e691ed0463ae7a72d4;p=thirdparty%2Fkernel%2Fstable-queue.git Drop perf-intel-bts-does-not-support-aux-area-sampling.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/perf-intel-bts-does-not-support-aux-area-sampling.patch b/queue-4.14/perf-intel-bts-does-not-support-aux-area-sampling.patch deleted file mode 100644 index e3e807e471f..00000000000 --- a/queue-4.14/perf-intel-bts-does-not-support-aux-area-sampling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ba31959805882904861c4fb23ea621b52d0ae907 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Nov 2019 14:42:25 +0200 -Subject: perf intel-bts: Does not support AUX area sampling - -From: Adrian Hunter - -[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] - -Add an error message because Intel BTS does not support AUX area -sampling. - -Signed-off-by: Adrian Hunter -Cc: Jiri Olsa -Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/arch/x86/util/auxtrace.c | 2 ++ - tools/perf/arch/x86/util/intel-bts.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c -index 6aa3f2a38321..98db6f5ca08b 100644 ---- a/tools/perf/arch/x86/util/auxtrace.c -+++ b/tools/perf/arch/x86/util/auxtrace.c -@@ -36,6 +36,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, - - intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); - intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); -+ if (intel_bts_pmu) -+ intel_bts_pmu->auxtrace = true; - - if (evlist) { - evlist__for_each_entry(evlist, evsel) { -diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c -index 781df40b2966..b6120ef8b4a4 100644 ---- a/tools/perf/arch/x86/util/intel-bts.c -+++ b/tools/perf/arch/x86/util/intel-bts.c -@@ -118,6 +118,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, - const struct cpu_map *cpus = evlist->cpus; - bool privileged = geteuid() == 0 || perf_event_paranoid() < 0; - -+ if (opts->auxtrace_sample_mode) { -+ pr_err("Intel BTS does not support AUX area sampling\n"); -+ return -EINVAL; -+ } -+ - btsr->evlist = evlist; - btsr->snapshot_mode = opts->auxtrace_snapshot_mode; - --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index ff45ccb5d44..384131fd83b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -132,7 +132,6 @@ mac80211-consider-qos-null-frames-for-sta_nullfunc_a.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch mips-fix-build-when-48-bits-virtual-memory-is-enable.patch -perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch btrfs-don-t-prematurely-free-work-in-reada_start_mac.patch btrfs-don-t-prematurely-free-work-in-scrub_missing_r.patch diff --git a/queue-4.19/perf-intel-bts-does-not-support-aux-area-sampling.patch b/queue-4.19/perf-intel-bts-does-not-support-aux-area-sampling.patch deleted file mode 100644 index 4a53be9505d..00000000000 --- a/queue-4.19/perf-intel-bts-does-not-support-aux-area-sampling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c29fa3cfd24f4aef6bb14cfa04a48bea9b4d89f0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Nov 2019 14:42:25 +0200 -Subject: perf intel-bts: Does not support AUX area sampling - -From: Adrian Hunter - -[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] - -Add an error message because Intel BTS does not support AUX area -sampling. - -Signed-off-by: Adrian Hunter -Cc: Jiri Olsa -Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/arch/x86/util/auxtrace.c | 2 ++ - tools/perf/arch/x86/util/intel-bts.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c -index b135af62011c..c28b6516d41d 100644 ---- a/tools/perf/arch/x86/util/auxtrace.c -+++ b/tools/perf/arch/x86/util/auxtrace.c -@@ -36,6 +36,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, - - intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); - intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); -+ if (intel_bts_pmu) -+ intel_bts_pmu->auxtrace = true; - - evlist__for_each_entry(evlist, evsel) { - if (intel_pt_pmu && evsel->attr.type == intel_pt_pmu->type) -diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c -index 781df40b2966..b6120ef8b4a4 100644 ---- a/tools/perf/arch/x86/util/intel-bts.c -+++ b/tools/perf/arch/x86/util/intel-bts.c -@@ -118,6 +118,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, - const struct cpu_map *cpus = evlist->cpus; - bool privileged = geteuid() == 0 || perf_event_paranoid() < 0; - -+ if (opts->auxtrace_sample_mode) { -+ pr_err("Intel BTS does not support AUX area sampling\n"); -+ return -EINVAL; -+ } -+ - btsr->evlist = evlist; - btsr->snapshot_mode = opts->auxtrace_snapshot_mode; - --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index cf1327f304a..110a7153c17 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -184,7 +184,6 @@ crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch mips-fix-build-when-48-bits-virtual-memory-is-enable.patch drm-amdgpu-fix-bad-dma-from-interrupt_cntl2.patch -perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch btrfs-don-t-prematurely-free-work-in-reada_start_mac.patch btrfs-don-t-prematurely-free-work-in-scrub_missing_r.patch diff --git a/queue-4.4/perf-intel-bts-does-not-support-aux-area-sampling.patch b/queue-4.4/perf-intel-bts-does-not-support-aux-area-sampling.patch deleted file mode 100644 index 284b6d07bf4..00000000000 --- a/queue-4.4/perf-intel-bts-does-not-support-aux-area-sampling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f85f768e43c28aa9a7e4a40216f6118f20c4fbbf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Nov 2019 14:42:25 +0200 -Subject: perf intel-bts: Does not support AUX area sampling - -From: Adrian Hunter - -[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] - -Add an error message because Intel BTS does not support AUX area -sampling. - -Signed-off-by: Adrian Hunter -Cc: Jiri Olsa -Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/arch/x86/util/auxtrace.c | 2 ++ - tools/perf/arch/x86/util/intel-bts.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c -index 7a7805583e3f..ab641cfc8c2b 100644 ---- a/tools/perf/arch/x86/util/auxtrace.c -+++ b/tools/perf/arch/x86/util/auxtrace.c -@@ -35,6 +35,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, - - intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); - intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); -+ if (intel_bts_pmu) -+ intel_bts_pmu->auxtrace = true; - - if (evlist) { - evlist__for_each(evlist, evsel) { -diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c -index 9b94ce520917..9d83a7f3496c 100644 ---- a/tools/perf/arch/x86/util/intel-bts.c -+++ b/tools/perf/arch/x86/util/intel-bts.c -@@ -119,6 +119,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, - const struct cpu_map *cpus = evlist->cpus; - bool privileged = geteuid() == 0 || perf_event_paranoid() < 0; - -+ if (opts->auxtrace_sample_mode) { -+ pr_err("Intel BTS does not support AUX area sampling\n"); -+ return -EINVAL; -+ } -+ - btsr->evlist = evlist; - btsr->snapshot_mode = opts->auxtrace_snapshot_mode; - --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index af96557113f..07cc79dae9b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -62,7 +62,6 @@ fbtft-make-sure-string-is-null-terminated.patch crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch usb-xhci-fix-build-warning-seen-with-config_pm-n.patch diff --git a/queue-4.9/perf-intel-bts-does-not-support-aux-area-sampling.patch b/queue-4.9/perf-intel-bts-does-not-support-aux-area-sampling.patch deleted file mode 100644 index 521e48d12d1..00000000000 --- a/queue-4.9/perf-intel-bts-does-not-support-aux-area-sampling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e0e5dc019e71919e17968f5d4946f7a39a38c2a9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Nov 2019 14:42:25 +0200 -Subject: perf intel-bts: Does not support AUX area sampling - -From: Adrian Hunter - -[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] - -Add an error message because Intel BTS does not support AUX area -sampling. - -Signed-off-by: Adrian Hunter -Cc: Jiri Olsa -Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/arch/x86/util/auxtrace.c | 2 ++ - tools/perf/arch/x86/util/intel-bts.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c -index cc1d865e31f1..429a0b04d737 100644 ---- a/tools/perf/arch/x86/util/auxtrace.c -+++ b/tools/perf/arch/x86/util/auxtrace.c -@@ -35,6 +35,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, - - intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); - intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); -+ if (intel_bts_pmu) -+ intel_bts_pmu->auxtrace = true; - - if (evlist) { - evlist__for_each_entry(evlist, evsel) { -diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c -index 5132775a044f..400bb1a52d04 100644 ---- a/tools/perf/arch/x86/util/intel-bts.c -+++ b/tools/perf/arch/x86/util/intel-bts.c -@@ -121,6 +121,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, - const struct cpu_map *cpus = evlist->cpus; - bool privileged = geteuid() == 0 || perf_event_paranoid() < 0; - -+ if (opts->auxtrace_sample_mode) { -+ pr_err("Intel BTS does not support AUX area sampling\n"); -+ return -EINVAL; -+ } -+ - btsr->evlist = evlist; - btsr->snapshot_mode = opts->auxtrace_snapshot_mode; - --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 0e4c5946f4e..35b923ca938 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -81,7 +81,6 @@ fbtft-make-sure-string-is-null-terminated.patch crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch btrfs-don-t-prematurely-free-work-in-reada_start_mac.patch revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch diff --git a/queue-5.4/perf-intel-bts-does-not-support-aux-area-sampling.patch b/queue-5.4/perf-intel-bts-does-not-support-aux-area-sampling.patch deleted file mode 100644 index 1d0a7b71a36..00000000000 --- a/queue-5.4/perf-intel-bts-does-not-support-aux-area-sampling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dd0001c28ec58b829183c178c93c49d910a54065 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Nov 2019 14:42:25 +0200 -Subject: perf intel-bts: Does not support AUX area sampling - -From: Adrian Hunter - -[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] - -Add an error message because Intel BTS does not support AUX area -sampling. - -Signed-off-by: Adrian Hunter -Cc: Jiri Olsa -Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/arch/x86/util/auxtrace.c | 2 ++ - tools/perf/arch/x86/util/intel-bts.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c -index 96f4a2c11893..61042114a5cc 100644 ---- a/tools/perf/arch/x86/util/auxtrace.c -+++ b/tools/perf/arch/x86/util/auxtrace.c -@@ -27,6 +27,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, - - intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); - intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); -+ if (intel_bts_pmu) -+ intel_bts_pmu->auxtrace = true; - - evlist__for_each_entry(evlist, evsel) { - if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type) -diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c -index f7f68a50a5cd..27d9e214d068 100644 ---- a/tools/perf/arch/x86/util/intel-bts.c -+++ b/tools/perf/arch/x86/util/intel-bts.c -@@ -113,6 +113,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, - const struct perf_cpu_map *cpus = evlist->core.cpus; - bool privileged = perf_event_paranoid_check(-1); - -+ if (opts->auxtrace_sample_mode) { -+ pr_err("Intel BTS does not support AUX area sampling\n"); -+ return -EINVAL; -+ } -+ - btsr->evlist = evlist; - btsr->snapshot_mode = opts->auxtrace_snapshot_mode; - --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 18dc4c8cec0..aaf2f601eff 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -350,7 +350,6 @@ mips-fix-build-when-48-bits-virtual-memory-is-enable.patch drm-amdgpu-fix-bad-dma-from-interrupt_cntl2.patch ice-only-disable-vf-state-when-freeing-each-vf-resou.patch ice-fix-setting-coalesce-to-handle-dcb-configuration.patch -perf-intel-bts-does-not-support-aux-area-sampling.patch perf-record-add-a-function-to-test-for-kernel-suppor.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch tools-bpf-fix-build-for-make-s-tools-bpf-o-dir.patch