* [PATCH 1/5] coresight: tmc-etr: Do not call smp_processor_id() from preemptible
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
@ 2019-06-20 22:12 ` Mathieu Poirier
2019-07-03 19:14 ` Greg KH
2019-06-20 22:12 ` [PATCH 2/5] coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id " Mathieu Poirier
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Mathieu Poirier @ 2019-06-20 22:12 UTC (permalink / raw)
To: gregkh; +Cc: linux-arm-kernel
From: Suzuki K Poulose <suzuki.poulose@arm.com>
During a perf session we try to allocate buffers on the "node" associated
with the CPU the event is bound to. If it's 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/1743
caller is alloc_etr_buf.isra.6+0x80/0xa0
CPU: 1 PID: 1743 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
alloc_etr_buf.isra.6+0x80/0xa0
tmc_alloc_etr_buffer+0x12c/0x1f0
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: 855ab61c16bf70b646 ("coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()")
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-tmc-etr.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index df6e4b0b84e9..c6a36897924f 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -1317,13 +1317,11 @@ static struct etr_perf_buffer *
tmc_etr_setup_perf_buf(struct tmc_drvdata *drvdata, struct perf_event *event,
int nr_pages, void **pages, bool snapshot)
{
- int node, cpu = event->cpu;
+ int node;
struct etr_buf *etr_buf;
struct etr_perf_buffer *etr_perf;
- if (cpu == -1)
- cpu = smp_processor_id();
- node = cpu_to_node(cpu);
+ node = (event->cpu == -1) ? NUMA_NO_NODE : cpu_to_node(event->cpu);
etr_perf = kzalloc_node(sizeof(*etr_perf), GFP_KERNEL, node);
if (!etr_perf)
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] coresight: tmc-etr: Do not call smp_processor_id() from preemptible
2019-06-20 22:12 ` [PATCH 1/5] coresight: tmc-etr: Do not call smp_processor_id() from preemptible Mathieu Poirier
@ 2019-07-03 19:14 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2019-07-03 19:14 UTC (permalink / raw)
To: Mathieu Poirier; +Cc: linux-arm-kernel
On Thu, Jun 20, 2019 at 04:12:33PM -0600, Mathieu Poirier wrote:
> From: Suzuki K Poulose <suzuki.poulose@arm.com>
>
> During a perf session we try to allocate buffers on the "node" associated
> with the CPU the event is bound to. If it's 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/1743
> caller is alloc_etr_buf.isra.6+0x80/0xa0
> CPU: 1 PID: 1743 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
> alloc_etr_buf.isra.6+0x80/0xa0
> tmc_alloc_etr_buffer+0x12c/0x1f0
> 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: 855ab61c16bf70b646 ("coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()")
This should be:
Fixes: 855ab61c16bf ("coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()")
Add:
[core]
abbrev = 12
to your .gitconfig file, we only need 12 in the kernel tree. For now :)
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/5] coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from preemptible
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
2019-06-20 22:12 ` [PATCH 1/5] coresight: tmc-etr: Do not call smp_processor_id() from preemptible Mathieu Poirier
@ 2019-06-20 22:12 ` Mathieu Poirier
2019-06-20 22:12 ` [PATCH 3/5] coresight: tmc-etf: " Mathieu Poirier
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Mathieu Poirier @ 2019-06-20 22:12 UTC (permalink / raw)
To: gregkh; +Cc: linux-arm-kernel
From: Suzuki K Poulose <suzuki.poulose@arm.com>
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/1743
caller is tmc_alloc_etr_buffer+0x1bc/0x1f0
CPU: 1 PID: 1743 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_etr_buffer+0x1bc/0x1f0
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: 22f429f19c4135d51e9 ("coresight: etm-perf: Add support for ETR backend")
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: stable <stable@vger.kernel.org> # 4.20+
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-tmc-etr.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index c6a36897924f..9f293b9dce8c 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -1178,14 +1178,11 @@ static struct etr_buf *
alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,
int nr_pages, void **pages, bool snapshot)
{
- int node, cpu = event->cpu;
+ int node;
struct etr_buf *etr_buf;
unsigned long size;
- if (cpu == -1)
- cpu = smp_processor_id();
- node = cpu_to_node(cpu);
-
+ node = (event->cpu == -1) ? NUMA_NO_NODE : cpu_to_node(event->cpu);
/*
* Try to match the perf ring buffer size if it is larger
* than the size requested via sysfs.
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] coresight: tmc-etf: Do not call smp_processor_id from preemptible
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
2019-06-20 22:12 ` [PATCH 1/5] coresight: tmc-etr: Do not call smp_processor_id() from preemptible Mathieu Poirier
2019-06-20 22:12 ` [PATCH 2/5] coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id " Mathieu Poirier
@ 2019-06-20 22:12 ` Mathieu Poirier
2019-06-20 22:12 ` [PATCH 4/5] coresight: etb10: " Mathieu Poirier
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Mathieu Poirier @ 2019-06-20 22:12 UTC (permalink / raw)
To: gregkh; +Cc: linux-arm-kernel
From: Suzuki K Poulose <suzuki.poulose@arm.com>
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>
---
drivers/hwtracing/coresight/coresight-tmc-etf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
index 2527b5d3b65e..8de109de171f 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
@@ -378,12 +378,10 @@ static void *tmc_alloc_etf_buffer(struct coresight_device *csdev,
struct perf_event *event, void **pages,
int nr_pages, bool overwrite)
{
- int node, cpu = event->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.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] coresight: etb10: Do not call smp_processor_id from preemptible
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
` (2 preceding siblings ...)
2019-06-20 22:12 ` [PATCH 3/5] coresight: tmc-etf: " Mathieu Poirier
@ 2019-06-20 22:12 ` Mathieu Poirier
2019-06-20 22:12 ` [PATCH 5/5] coresight: Potential uninitialized variable in probe() Mathieu Poirier
2019-07-02 16:18 ` [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
5 siblings, 0 replies; 9+ messages in thread
From: Mathieu Poirier @ 2019-06-20 22:12 UTC (permalink / raw)
To: gregkh; +Cc: linux-arm-kernel
From: Suzuki K Poulose <suzuki.poulose@arm.com>
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 <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: stable <stable@vger.kernel.org> # 4.6+
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-etb10.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c
index 4ee4c80a4354..543cc3d36e1d 100644
--- a/drivers/hwtracing/coresight/coresight-etb10.c
+++ b/drivers/hwtracing/coresight/coresight-etb10.c
@@ -373,12 +373,10 @@ static void *etb_alloc_buffer(struct coresight_device *csdev,
struct perf_event *event, void **pages,
int nr_pages, bool overwrite)
{
- int node, cpu = event->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.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] coresight: Potential uninitialized variable in probe()
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
` (3 preceding siblings ...)
2019-06-20 22:12 ` [PATCH 4/5] coresight: etb10: " Mathieu Poirier
@ 2019-06-20 22:12 ` Mathieu Poirier
2019-07-02 16:18 ` [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
5 siblings, 0 replies; 9+ messages in thread
From: Mathieu Poirier @ 2019-06-20 22:12 UTC (permalink / raw)
To: gregkh; +Cc: linux-arm-kernel
From: Dan Carpenter <dan.carpenter@oracle.com>
The "drvdata->atclk" clock is optional, but if it gets set to an error
pointer then we're accidentally return an uninitialized variable instead
of success.
Fixes: 78e6427b4e7b ("coresight: funnel: Support static funnel")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-funnel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index 16b0c0e1e43a..ad6e16c96263 100644
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -241,6 +241,7 @@ static int funnel_probe(struct device *dev, struct resource *res)
}
pm_runtime_put(dev);
+ ret = 0;
out_disable_clk:
if (ret && !IS_ERR_OR_NULL(drvdata->atclk))
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] coresight: Fixes for v5.2-rc5
2019-06-20 22:12 [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
` (4 preceding siblings ...)
2019-06-20 22:12 ` [PATCH 5/5] coresight: Potential uninitialized variable in probe() Mathieu Poirier
@ 2019-07-02 16:18 ` Mathieu Poirier
2019-07-03 19:13 ` Greg KH
5 siblings, 1 reply; 9+ messages in thread
From: Mathieu Poirier @ 2019-07-02 16:18 UTC (permalink / raw)
To: Greg KH; +Cc: linux-arm-kernel
Hi Greg,
On Thu, 20 Jun 2019 at 16:12, Mathieu Poirier
<mathieu.poirier@linaro.org> wrote:
>
> As requested here is a set to fix problems found up to now in this
> cycle, supplemented with stable tags where applicable.
I haven't heard back from this set nor can I find the patches in any
of your trees. Given the late state in the cycle I'm not sure what to
do, i.e should I do a resend of this set or send you another series to
go in the 5.3 merge window - please advise.
>
> Thanks,
> Mathieu
>
> Dan Carpenter (1):
> coresight: Potential uninitialized variable in probe()
>
> Suzuki K Poulose (4):
> coresight: tmc-etr: Do not call smp_processor_id() from preemptible
> coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from
> preemptible
> coresight: tmc-etf: Do not call smp_processor_id from preemptible
> coresight: etb10: Do not call smp_processor_id from preemptible
>
> drivers/hwtracing/coresight/coresight-etb10.c | 6 ++----
> drivers/hwtracing/coresight/coresight-funnel.c | 1 +
> drivers/hwtracing/coresight/coresight-tmc-etf.c | 6 ++----
> drivers/hwtracing/coresight/coresight-tmc-etr.c | 13 ++++---------
> 4 files changed, 9 insertions(+), 17 deletions(-)
>
> --
> 2.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] coresight: Fixes for v5.2-rc5
2019-07-02 16:18 ` [PATCH 0/5] coresight: Fixes for v5.2-rc5 Mathieu Poirier
@ 2019-07-03 19:13 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2019-07-03 19:13 UTC (permalink / raw)
To: Mathieu Poirier; +Cc: linux-arm-kernel
On Tue, Jul 02, 2019 at 10:18:02AM -0600, Mathieu Poirier wrote:
> Hi Greg,
>
> On Thu, 20 Jun 2019 at 16:12, Mathieu Poirier
> <mathieu.poirier@linaro.org> wrote:
> >
> > As requested here is a set to fix problems found up to now in this
> > cycle, supplemented with stable tags where applicable.
>
> I haven't heard back from this set nor can I find the patches in any
> of your trees. Given the late state in the cycle I'm not sure what to
> do, i.e should I do a resend of this set or send you another series to
> go in the 5.3 merge window - please advise.
I'll take these for 5.3-rc1 and if anything needs to go in 5.2, we can
backport them to stable then.
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread