Skip to contentSkip to conversation

trace: disable preemption before taking raw spinlocks

PATCH In review Heiko Carstens 3 participants 4 messages May 26, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trace: disable preemption before taking raw spinlocks

From: Heiko Carstens <[email protected]>

s390 code uses smp_processor_id() in __raw_spin_lock() code which reveals that a (raw) spinlock is taken without preemption disabled. This can potentially deadlock.

To fix this explicitly disable and enable preemption.

BUG: using smp_processor_id() in preemptible [00000000] code: cat/2278
caller is trace_find_cmdline+0x40/0xfc
CPU: 0 Not tainted 2.6.30-rc7-dirty #39
Process cat (pid: 2278, task: 000000003faedb68, ksp: 000000003b33b988)
000000003b33b988 000000003b33bae0 0000000000000002 0000000000000000 
       000000003b33bb80 000000003b33baf8 000000003b33baf8 00000000000175d6 
       0000000000000001 000000003b33b988 000000003f9b0000 000000000000000b 
       000000000000000c 000000003b33bb40 000000003b33bae0 0000000000000000 
       0000000000000000 00000000000175d6 000000003b33bae0 000000003b33bb28 
Call Trace:
([<00000000000174b2>] show_trace+0x112/0x170)
 [<0000000000017582>] show_stack+0x72/0x100
 [<0000000000441538>] dump_stack+0xc8/0xd8
 [<000000000025c350>] debug_smp_processor_id+0x114/0x130
 [<00000000000bf0e4>] trace_find_cmdline+0x40/0xfc
 [<00000000000c35d4>] trace_print_context+0x58/0xac
 [<00000000000bb676>] print_trace_line+0x416/0x470
 [<00000000000bc8fe>] s_show+0x4e/0x428
 [<000000000013834e>] seq_read+0x36a/0x5d4
 [<0000000000112a78>] vfs_read+0xc8/0x174
 [<0000000000112c58>] SyS_read+0x74/0xc4
 [<000000000002c7ae>] sysc_noemu+0x10/0x16
 [<000002000012436c>] 0x2000012436c
1 lock held by cat/2278:
 #0:  (&p->lock){+.+.+.}, at: [<0000000000138056>] seq_read+0x72/0x5d4
---
 kernel/trace/trace.c |    2 ++
 1 file changed, 2 insertions(+)
kernel/trace/trace.c +2 -0
Index: linux-2.6/kernel/trace/trace.c
===================================================================
@@ -800,6 +800,7 @@ void trace_find_cmdline(int pid, char co
 		return;
 	}
 
+	preempt_disable();
 	__raw_spin_lock(&trace_cmdline_lock);
 	map = map_pid_to_cmdline[pid];
 	if (map != NO_CMDLINE_MAP)
@@ -808,6 +809,7 @@ void trace_find_cmdline(int pid, char co
 		strcpy(comm, "<...>");
 
 	__raw_spin_unlock(&trace_cmdline_lock);
+	preempt_enable();
 }
 
 void tracing_record_cmdline(struct task_struct *tsk)
#1 lore raw
Quoted 25 lines · Heiko Carstens

From: Heiko Carstens <[email protected]>

s390 code uses smp_processor_id() in __raw_spin_lock() code which reveals that a (raw) spinlock is taken without preemption disabled. This can potentially deadlock.

To fix this explicitly disable and enable preemption.

BUG: using smp_processor_id() in preemptible [00000000] code: cat/2278
caller is trace_find_cmdline+0x40/0xfc
CPU: 0 Not tainted 2.6.30-rc7-dirty #39
Process cat (pid: 2278, task: 000000003faedb68, ksp: 000000003b33b988)
000000003b33b988 000000003b33bae0 0000000000000002 0000000000000000 
       000000003b33bb80 000000003b33baf8 000000003b33baf8 00000000000175d6 
       0000000000000001 000000003b33b988 000000003f9b0000 000000000000000b 
       000000000000000c 000000003b33bb40 000000003b33bae0 0000000000000000 
       0000000000000000 00000000000175d6 000000003b33bae0 000000003b33bb28 
Call Trace:
([<00000000000174b2>] show_trace+0x112/0x170)
 [<0000000000017582>] show_stack+0x72/0x100
 [<0000000000441538>] dump_stack+0xc8/0xd8
 [<000000000025c350>] debug_smp_processor_id+0x114/0x130
 [<00000000000bf0e4>] trace_find_cmdline+0x40/0xfc
 [<00000000000c35d4>] trace_print_context+0x58/0xac
 [<00000000000bb676>] print_trace_line+0x416/0x470
Quoted 8 lines
 [<00000000000bc8fe>] s_show+0x4e/0x428
 [<000000000013834e>] seq_read+0x36a/0x5d4
 [<0000000000112a78>] vfs_read+0xc8/0x174
 [<0000000000112c58>] SyS_read+0x74/0xc4
 [<000000000002c7ae>] sysc_noemu+0x10/0x16
 [<000002000012436c>] 0x2000012436c
1 lock held by cat/2278:
 #0:  (&p->lock){+.+.+.}, at: [<0000000000138056>] seq_read+0x72/0x5d4

Shouldn't that be preempt_disable_notrace() and co to avoid tracer recursion?

maintainer
#2 lore raw
Quoted 35 lines · Peter Zijlstra
Quoted 25 lines · Heiko Carstens

From: Heiko Carstens <[email protected]>

s390 code uses smp_processor_id() in __raw_spin_lock() code which reveals that a (raw) spinlock is taken without preemption disabled. This can potentially deadlock.

To fix this explicitly disable and enable preemption.

BUG: using smp_processor_id() in preemptible [00000000] code: cat/2278
caller is trace_find_cmdline+0x40/0xfc
CPU: 0 Not tainted 2.6.30-rc7-dirty #39
Process cat (pid: 2278, task: 000000003faedb68, ksp: 000000003b33b988)
000000003b33b988 000000003b33bae0 0000000000000002 0000000000000000 
       000000003b33bb80 000000003b33baf8 000000003b33baf8 00000000000175d6 
       0000000000000001 000000003b33b988 000000003f9b0000 000000000000000b 
       000000000000000c 000000003b33bb40 000000003b33bae0 0000000000000000 
       0000000000000000 00000000000175d6 000000003b33bae0 000000003b33bb28 
Call Trace:
([<00000000000174b2>] show_trace+0x112/0x170)
 [<0000000000017582>] show_stack+0x72/0x100
 [<0000000000441538>] dump_stack+0xc8/0xd8
 [<000000000025c350>] debug_smp_processor_id+0x114/0x130
 [<00000000000bf0e4>] trace_find_cmdline+0x40/0xfc
 [<00000000000c35d4>] trace_print_context+0x58/0xac
 [<00000000000bb676>] print_trace_line+0x416/0x470
Quoted 8 lines
 [<00000000000bc8fe>] s_show+0x4e/0x428
 [<000000000013834e>] seq_read+0x36a/0x5d4
 [<0000000000112a78>] vfs_read+0xc8/0x174
 [<0000000000112c58>] SyS_read+0x74/0xc4
 [<000000000002c7ae>] sysc_noemu+0x10/0x16
 [<000002000012436c>] 0x2000012436c
1 lock held by cat/2278:
 #0:  (&p->lock){+.+.+.}, at: [<0000000000138056>] seq_read+0x72/0x5d4
Quoted 2 lines

Shouldn't that be preempt_disable_notrace() and co to avoid tracer recursion?

Doesn't need to be. That function is done in the output (slow path), not during an actual trace.

-- Steve

maintainer Acked-by
#3 lore raw
Quoted 38 lines · Steven Rostedt
Quoted 35 lines · Peter Zijlstra
Quoted 33 lines · Heiko Carstens

From: Heiko Carstens <[email protected]>

s390 code uses smp_processor_id() in __raw_spin_lock() code which reveals that a (raw) spinlock is taken without preemption disabled. This can potentially deadlock.

To fix this explicitly disable and enable preemption.

BUG: using smp_processor_id() in preemptible [00000000] code: cat/2278
caller is trace_find_cmdline+0x40/0xfc
CPU: 0 Not tainted 2.6.30-rc7-dirty #39
Process cat (pid: 2278, task: 000000003faedb68, ksp: 000000003b33b988)
000000003b33b988 000000003b33bae0 0000000000000002 0000000000000000 
       000000003b33bb80 000000003b33baf8 000000003b33baf8 00000000000175d6 
       0000000000000001 000000003b33b988 000000003f9b0000 000000000000000b 
       000000000000000c 000000003b33bb40 000000003b33bae0 0000000000000000 
       0000000000000000 00000000000175d6 000000003b33bae0 000000003b33bb28 
Call Trace:
([<00000000000174b2>] show_trace+0x112/0x170)
 [<0000000000017582>] show_stack+0x72/0x100
 [<0000000000441538>] dump_stack+0xc8/0xd8
 [<000000000025c350>] debug_smp_processor_id+0x114/0x130
 [<00000000000bf0e4>] trace_find_cmdline+0x40/0xfc
 [<00000000000c35d4>] trace_print_context+0x58/0xac
 [<00000000000bb676>] print_trace_line+0x416/0x470
 [<00000000000bc8fe>] s_show+0x4e/0x428
 [<000000000013834e>] seq_read+0x36a/0x5d4
 [<0000000000112a78>] vfs_read+0xc8/0x174
 [<0000000000112c58>] SyS_read+0x74/0xc4
 [<000000000002c7ae>] sysc_noemu+0x10/0x16
 [<000002000012436c>] 0x2000012436c
1 lock held by cat/2278:
 #0:  (&p->lock){+.+.+.}, at: [<0000000000138056>] seq_read+0x72/0x5d4
Quoted 5 lines
Quoted 2 lines

Shouldn't that be preempt_disable_notrace() and co to avoid tracer recursion?

Doesn't need to be. That function is done in the output (slow path), not during an actual trace.

Oh, and I should also include:

-- Steve