From: Greg Kroah-Hartman Date: Wed, 8 Jan 2020 11:16:59 +0000 (+0100) Subject: drop coresight-etb10-do-not-call-smp_processor_id-from-pr.patch from 4.14 and 4.19 X-Git-Tag: v4.14.163~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fb362ca0d40f682a99f7cdbc9834664ab5d74dc;p=thirdparty%2Fkernel%2Fstable-queue.git drop coresight-etb10-do-not-call-smp_processor_id-from-pr.patch from 4.14 and 4.19 --- diff --git a/queue-4.14/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch b/queue-4.14/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch deleted file mode 100644 index edeba19547b..00000000000 --- a/queue-4.14/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4f7479df039493522f0f808e9f56d3d2085fa851 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Jun 2019 16:12:36 -0600 -Subject: coresight: etb10: Do not call smp_processor_id from preemptible - -From: Suzuki K Poulose - -[ Upstream commit 730766bae3280a25d40ea76a53dc6342e84e6513 ] - -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 - -Use NUMA_NO_NODE hint instead of using the current node for events -not bound to CPUs. - -Fixes: 2997aa4063d97fdb39 ("coresight: etb10: implementing AUX API") -Cc: Mathieu Poirier -Signed-off-by: Suzuki K Poulose -Cc: stable # 4.6+ -Signed-off-by: Mathieu Poirier -Link: https://lore.kernel.org/r/20190620221237.3536-5-mathieu.poirier@linaro.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/hwtracing/coresight/coresight-etb10.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c -index d14a9cb7959a..7fcf70b2163d 100644 ---- a/drivers/hwtracing/coresight/coresight-etb10.c -+++ b/drivers/hwtracing/coresight/coresight-etb10.c -@@ -287,9 +287,7 @@ static void *etb_alloc_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); - - buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node); - if (!buf) --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 88ccd0def82..62c813b5fe3 100644 --- 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-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 ath9k_htc-discard-undersized-packets.patch diff --git a/queue-4.19/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch b/queue-4.19/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch deleted file mode 100644 index bacbe8cd6c7..00000000000 --- a/queue-4.19/coresight-etb10-do-not-call-smp_processor_id-from-pr.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7dd3619af053abf402857259709330d8ab1514d0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Jun 2019 16:12:36 -0600 -Subject: coresight: etb10: Do not call smp_processor_id from preemptible - -From: Suzuki K Poulose - -[ Upstream commit 730766bae3280a25d40ea76a53dc6342e84e6513 ] - -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 - -Use NUMA_NO_NODE hint instead of using the current node for events -not bound to CPUs. - -Fixes: 2997aa4063d97fdb39 ("coresight: etb10: implementing AUX API") -Cc: Mathieu Poirier -Signed-off-by: Suzuki K Poulose -Cc: stable # 4.6+ -Signed-off-by: Mathieu Poirier -Link: https://lore.kernel.org/r/20190620221237.3536-5-mathieu.poirier@linaro.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/hwtracing/coresight/coresight-etb10.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c -index 0dad8626bcfb..0a59bf3af40b 100644 ---- a/drivers/hwtracing/coresight/coresight-etb10.c -+++ b/drivers/hwtracing/coresight/coresight-etb10.c -@@ -275,9 +275,7 @@ static void *etb_alloc_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); - - buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node); - if (!buf) --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 39abc384309..5d6ca69b68a 100644 --- 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-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 tcp-annotate-tp-rcv_nxt-lockless-reads.patch