diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-08-10 12:17:50 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-08-10 15:32:53 -0400 |
commit | f8a79d5c7ef47c62d97a30e16064caf2ef91f648 (patch) | |
tree | e5004080ca0ef3ac8dd2c361a95ecbf70f5150db | |
parent | 016f8ffc48cb01d1e7701649c728c5d2e737d295 (diff) |
tracepoints: Free early tracepoints after RCU is initialized
When enabling trace events via the kernel command line, I hit this warning:
WARNING: CPU: 0 PID: 13 at kernel/rcu/srcutree.c:236 check_init_srcu_struct+0xe/0x61
Modules linked in:
CPU: 0 PID: 13 Comm: watchdog/0 Not tainted 4.18.0-rc6-test+ #6
Hardware name: MSI MS-7823/CSM-H87M-G43 (MS-7823), BIOS V1.6 02/22/2014
RIP: 0010:check_init_srcu_struct+0xe/0x61
Code: 48 c7 c6 ec 8a 65 b4 e8 ff 79 fe ff 48 89 df 31 f6 e8 f2 fa ff ff 5a
5b 41 5c 5d c3 0f 1f 44 00 00 83 3d 68 94 b8 01 01 75 02 <0f> 0b 48 8b 87 f0
0a 00 00 a8 03 74 45 55 48 89 e5 41 55 41 54 4c
RSP: 0000:ffff96eb9ea03e68 EFLAGS: 00010246
RAX: ffff96eb962b5b01 RBX: ffffffffb4a87420 RCX: 0000000000000001
RDX: ffffffffb3107969 RSI: ffff96eb962b5b40 RDI: ffffffffb4a87420
RBP: ffff96eb9ea03eb0 R08: ffffabbd00cd7f48 R09: 0000000000000000
R10: ffff96eb9ea03e68 R11: ffffffffb4a6eec0 R12: ffff96eb962b5b40
R13: ffff96eb9ea03ef8 R14: ffffffffb3107969 R15: ffffffffb3107948
FS: 0000000000000000(0000) GS:ffff96eb9ea00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: ffff96eb13ab2000 CR3: 0000000192a1e001 CR4: 00000000001606f0
Call Trace:
<IRQ>
? __call_srcu+0x2d/0x290
? rcu_process_callbacks+0x26e/0x448
? allocate_probes+0x2b/0x2b
call_srcu+0x13/0x15
rcu_free_old_probes+0x1f/0x21
rcu_process_callbacks+0x2ed/0x448
__do_softirq+0x172/0x336
irq_exit+0x62/0xb2
smp_apic_timer_interrupt+0x161/0x19e
apic_timer_interrupt+0xf/0x20
</IRQ>
The problem is that the enabling of trace events before RCU is set up will
cause SRCU to give this warning. To avoid this, add a list to store probes
that need to be freed till after RCU is initialized, and then free them
then.
Link: http://lkml.kernel.org/r/20180810113554.1df28050@gandalf.local.home
Link: http://lkml.kernel.org/r/20180810123517.5e9714ad@gandalf.local.home
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Fixes: e6753f23d961d ("tracepoint: Make rcuidle tracepoint callers use SRCU")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r-- | kernel/tracepoint.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 955148d91b74..96db841bf0fc 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
@@ -53,6 +53,9 @@ static LIST_HEAD(tracepoint_module_list); | |||
53 | */ | 53 | */ |
54 | static DEFINE_MUTEX(tracepoints_mutex); | 54 | static DEFINE_MUTEX(tracepoints_mutex); |
55 | 55 | ||
56 | static struct rcu_head *early_probes; | ||
57 | static bool ok_to_free_tracepoints; | ||
58 | |||
56 | /* | 59 | /* |
57 | * Note about RCU : | 60 | * Note about RCU : |
58 | * It is used to delay the free of multiple probes array until a quiescent | 61 | * It is used to delay the free of multiple probes array until a quiescent |
@@ -80,11 +83,40 @@ static void rcu_free_old_probes(struct rcu_head *head) | |||
80 | call_srcu(&tracepoint_srcu, head, srcu_free_old_probes); | 83 | call_srcu(&tracepoint_srcu, head, srcu_free_old_probes); |
81 | } | 84 | } |
82 | 85 | ||
86 | static __init int release_early_probes(void) | ||
87 | { | ||
88 | struct rcu_head *tmp; | ||
89 | |||
90 | ok_to_free_tracepoints = true; | ||
91 | |||
92 | while (early_probes) { | ||
93 | tmp = early_probes; | ||
94 | early_probes = tmp->next; | ||
95 | call_rcu_sched(tmp, rcu_free_old_probes); | ||
96 | } | ||
97 | |||
98 | return 0; | ||
99 | } | ||
100 | |||
101 | /* SRCU is initialized at core_initcall */ | ||
102 | postcore_initcall(release_early_probes); | ||
103 | |||
83 | static inline void release_probes(struct tracepoint_func *old) | 104 | static inline void release_probes(struct tracepoint_func *old) |
84 | { | 105 | { |
85 | if (old) { | 106 | if (old) { |
86 | struct tp_probes *tp_probes = container_of(old, | 107 | struct tp_probes *tp_probes = container_of(old, |
87 | struct tp_probes, probes[0]); | 108 | struct tp_probes, probes[0]); |
109 | |||
110 | /* | ||
111 | * We can't free probes if SRCU is not initialized yet. | ||
112 | * Postpone the freeing till after SRCU is initialized. | ||
113 | */ | ||
114 | if (unlikely(!ok_to_free_tracepoints)) { | ||
115 | tp_probes->rcu.next = early_probes; | ||
116 | early_probes = &tp_probes->rcu; | ||
117 | return; | ||
118 | } | ||
119 | |||
88 | /* | 120 | /* |
89 | * Tracepoint probes are protected by both sched RCU and SRCU, | 121 | * Tracepoint probes are protected by both sched RCU and SRCU, |
90 | * by calling the SRCU callback in the sched RCU callback we | 122 | * by calling the SRCU callback in the sched RCU callback we |