Skip to content

Commit 1ad3db8

Browse files
Suzuki K Poulosemathieupoirier
Suzuki K Poulose
authored andcommitted
coresight: tmc-etf: Do not call smp_processor_id from preemptible
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 torvalds#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: 2e499bb ("coresight: tmc: implementing TMC-ETF AUX space API") Cc: Mathieu Poirier <[email protected]> Signed-off-by: Suzuki K Poulose <[email protected]> Signed-off-by: Mathieu Poirier <[email protected]>
1 parent 83cc588 commit 1ad3db8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/hwtracing/coresight/coresight-tmc-etf.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,10 @@ static void *tmc_alloc_etf_buffer(struct coresight_device *csdev,
377377
struct perf_event *event, void **pages,
378378
int nr_pages, bool overwrite)
379379
{
380-
int node, cpu = event->cpu;
380+
int node;
381381
struct cs_buffers *buf;
382382

383-
if (cpu == -1)
384-
cpu = smp_processor_id();
385-
node = cpu_to_node(cpu);
383+
node = (event->cpu == -1) ? NUMA_NO_NODE : cpu_to_node(event->cpu);
386384

387385
/* Allocate memory structure for interaction with Perf */
388386
buf = kzalloc_node(sizeof(struct cs_buffers), GFP_KERNEL, node);

0 commit comments

Comments
 (0)