drop coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch from 4.14 and 4.19

diff --git a/queue-4.14/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch b/queue-4.14/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
deleted file mode 100644 (file)
index cfd02ae..0000000
--- a/queue-4.14/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a389808695944a7ed4615bb4fcf553ed9d618e2f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 20 Jun 2019 16:12:35 -0600
-Subject: coresight: tmc-etf: Do not call smp_processor_id from preemptible
-
-From: Suzuki K Poulose <suzuki.poulose@arm.com>
-
-[ Upstream commit 024c1fd9dbcc1d8a847f1311f999d35783921b7f ]
-
-During a perf session we try to allocate buffers on the "node" associated
-with the CPU the event is bound to. If it is not bound to a CPU, we
-use the current CPU node, using smp_processor_id(). However this is unsafe
-in a pre-emptible context and could generate the splats as below :
-
- BUG: using smp_processor_id() in preemptible [00000000] code: perf/2544
- caller is tmc_alloc_etf_buffer+0x5c/0x60
- CPU: 2 PID: 2544 Comm: perf Not tainted 5.1.0-rc6-147786-g116841e #344
- Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Feb  1 2019
- Call trace:
-  dump_backtrace+0x0/0x150
-  show_stack+0x14/0x20
-  dump_stack+0x9c/0xc4
-  debug_smp_processor_id+0x10c/0x110
-  tmc_alloc_etf_buffer+0x5c/0x60
-  etm_setup_aux+0x1c4/0x230
-  rb_alloc_aux+0x1b8/0x2b8
-  perf_mmap+0x35c/0x478
-  mmap_region+0x34c/0x4f0
-  do_mmap+0x2d8/0x418
-  vm_mmap_pgoff+0xd0/0xf8
-  ksys_mmap_pgoff+0x88/0xf8
-  __arm64_sys_mmap+0x28/0x38
-  el0_svc_handler+0xd8/0x138
-  el0_svc+0x8/0xc
-
-Use NUMA_NO_NODE hint instead of using the current node for events
-not bound to CPUs.
-
-Fixes: 2e499bbc1a929ac ("coresight: tmc: implementing TMC-ETF AUX space API")
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
-Cc: stable <stable@vger.kernel.org> # 4.7+
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Link: https://lore.kernel.org/r/20190620221237.3536-4-mathieu.poirier@linaro.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
-index 336194d059fe..329a201c0c19 100644
---- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
-+++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
-@@ -308,9 +308,7 @@ static void *tmc_alloc_etf_buffer(struct coresight_device *csdev, int cpu,
-       int node;
-       struct cs_buffers *buf;
- 
--      if (cpu == -1)
--              cpu = smp_processor_id();
--      node = cpu_to_node(cpu);
-+      node = (event->cpu == -1) ? NUMA_NO_NODE : cpu_to_node(event->cpu);
- 
-       /* Allocate memory structure for interaction with Perf */
-       buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node);
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index c053c85b30da5c409ed5b4c58bca637c3678f204..88ccd0def82606f3898b1514f22f498a68d0c012 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -62,7 +62,6 @@ scsi-qedf-do-not-retry-els-request-if-qedf_alloc_cmd.patch
 drm-mst-fix-mst-sideband-up-reply-failure-handling.patch
 powerpc-pseries-hvconsole-fix-stack-overread-via-udb.patch
 selftests-rtnetlink-add-addresses-with-fixed-life-ti.patch
-coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
 coresight-etb10-do-not-call-smp_processor_id-from-pr.patch
 rxrpc-fix-possible-null-pointer-access-in-icmp-handl.patch
 ath9k_htc-modify-byte-order-for-an-error-message.patch

diff --git a/queue-4.19/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch b/queue-4.19/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
deleted file mode 100644 (file)
index 66a2fde..0000000
--- a/queue-4.19/coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 41d6b7b0ed03946188d6f6eea3e432bce64d3c0b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 20 Jun 2019 16:12:35 -0600
-Subject: coresight: tmc-etf: Do not call smp_processor_id from preemptible
-
-From: Suzuki K Poulose <suzuki.poulose@arm.com>
-
-[ Upstream commit 024c1fd9dbcc1d8a847f1311f999d35783921b7f ]
-
-During a perf session we try to allocate buffers on the "node" associated
-with the CPU the event is bound to. If it is not bound to a CPU, we
-use the current CPU node, using smp_processor_id(). However this is unsafe
-in a pre-emptible context and could generate the splats as below :
-
- BUG: using smp_processor_id() in preemptible [00000000] code: perf/2544
- caller is tmc_alloc_etf_buffer+0x5c/0x60
- CPU: 2 PID: 2544 Comm: perf Not tainted 5.1.0-rc6-147786-g116841e #344
- Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Feb  1 2019
- Call trace:
-  dump_backtrace+0x0/0x150
-  show_stack+0x14/0x20
-  dump_stack+0x9c/0xc4
-  debug_smp_processor_id+0x10c/0x110
-  tmc_alloc_etf_buffer+0x5c/0x60
-  etm_setup_aux+0x1c4/0x230
-  rb_alloc_aux+0x1b8/0x2b8
-  perf_mmap+0x35c/0x478
-  mmap_region+0x34c/0x4f0
-  do_mmap+0x2d8/0x418
-  vm_mmap_pgoff+0xd0/0xf8
-  ksys_mmap_pgoff+0x88/0xf8
-  __arm64_sys_mmap+0x28/0x38
-  el0_svc_handler+0xd8/0x138
-  el0_svc+0x8/0xc
-
-Use NUMA_NO_NODE hint instead of using the current node for events
-not bound to CPUs.
-
-Fixes: 2e499bbc1a929ac ("coresight: tmc: implementing TMC-ETF AUX space API")
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
-Cc: stable <stable@vger.kernel.org> # 4.7+
-Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Link: https://lore.kernel.org/r/20190620221237.3536-4-mathieu.poirier@linaro.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
-index e31061308e19..4644ac5582cf 100644
---- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
-+++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
-@@ -304,9 +304,7 @@ static void *tmc_alloc_etf_buffer(struct coresight_device *csdev, int cpu,
-       int node;
-       struct cs_buffers *buf;
- 
--      if (cpu == -1)
--              cpu = smp_processor_id();
--      node = cpu_to_node(cpu);
-+      node = (event->cpu == -1) ? NUMA_NO_NODE : cpu_to_node(event->cpu);
- 
-       /* Allocate memory structure for interaction with Perf */
-       buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node);
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index ced22a6d75fb9371cf9b15645ae6ce015518c33d..39abc3843096817daa30ab0e3454621f832fb705 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -99,7 +99,6 @@ scsi-qedf-do-not-retry-els-request-if-qedf_alloc_cmd.patch
 drm-mst-fix-mst-sideband-up-reply-failure-handling.patch
 powerpc-pseries-hvconsole-fix-stack-overread-via-udb.patch
 selftests-rtnetlink-add-addresses-with-fixed-life-ti.patch
-coresight-tmc-etf-do-not-call-smp_processor_id-from-.patch
 coresight-etb10-do-not-call-smp_processor_id-from-pr.patch
 kvm-ppc-book3s-hv-use-smp_mb-when-setting-clearing-h.patch
 rxrpc-fix-possible-null-pointer-access-in-icmp-handl.patch