rcu-tasks: Avoid pr_info() with spin lock in cblist_init_generic()
Subsystems (2)
Sasha Levin
maintainerPATCH 1/3 rcu-tasks: Avoid pr_info() with spin lock in cblist_init_generic()
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 5fc8cbe4cf0fd34ded8045c385790c3bf04f6785 ]
pr_info() is called with rtp->cbs_gbl_lock spin lock locked. Because pr_info() calls printk() that might sleep, this will result in BUG like below:
[ 0.206455] cblist_init_generic: Setting adjustable number of callback queues.
[ 0.206463]
[ 0.206464] =============================
[ 0.206464] [ BUG: Invalid wait context ]
[ 0.206465] 5.19.0-00428-g9de1f9c8ca51 #5 Not tainted
[ 0.206466] -----------------------------
[ 0.206466] swapper/0/1 is trying to lock:
[ 0.206467] ffffffffa0167a58 (&port_lock_key){....}-{3:3}, at: serial8250_console_write+0x327/0x4a0
[ 0.206473] other info that might help us debug this:
[ 0.206473] context-{5:5}
[ 0.206474] 3 locks held by swapper/0/1:
[ 0.206474] #0: ffffffff9eb597e0 (rcu_tasks.cbs_gbl_lock){....}-{2:2}, at: cblist_init_generic.constprop.0+0x14/0x1f0
[ 0.206478] #1: ffffffff9eb579c0 (console_lock){+.+.}-{0:0}, at: _printk+0x63/0x7e
[ 0.206482] #2: ffffffff9ea77780 (console_owner){....}-{0:0}, at: console_emit_next_record.constprop.0+0x111/0x330
[ 0.206485] stack backtrace:
[ 0.206486] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-00428-g9de1f9c8ca51 #5
[ 0.206488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-1.fc36 04/01/2014
[ 0.206489] Call Trace:
[ 0.206490] <TASK>
[ 0.206491] dump_stack_lvl+0x6a/0x9f
[ 0.206493] __lock_acquire.cold+0x2d7/0x2fe
[ 0.206496] ? stack_trace_save+0x46/0x70
[ 0.206497] lock_acquire+0xd1/0x2f0
[ 0.206499] ? serial8250_console_write+0x327/0x4a0
[ 0.206500] ? __lock_acquire+0x5c7/0x2720
[ 0.206502] _raw_spin_lock_irqsave+0x3d/0x90
[ 0.206504] ? serial8250_console_write+0x327/0x4a0
[ 0.206506] serial8250_console_write+0x327/0x4a0
[ 0.206508] console_emit_next_record.constprop.0+0x180/0x330
[ 0.206511] console_unlock+0xf7/0x1f0
[ 0.206512] vprintk_emit+0xf7/0x330
[ 0.206514] _printk+0x63/0x7e
[ 0.206516] cblist_init_generic.constprop.0.cold+0x24/0x32
[ 0.206518] rcu_init_tasks_generic+0x5/0xd9
[ 0.206522] kernel_init_freeable+0x15b/0x2a2
[ 0.206523] ? rest_init+0x160/0x160
[ 0.206526] kernel_init+0x11/0x120
[ 0.206527] ret_from_fork+0x1f/0x30
[ 0.206530] </TASK>
[ 0.207018] cblist_init_generic: Setting shift to 1 and lim to 1.This patch moves pr_info() so that it is called without rtp->cbs_gbl_lock locked.
--- kernel/rcu/tasks.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/tasks.h +4 -1
@@ -233,7 +233,6 @@ static void cblist_init_generic(struct rcu_tasks *rtp)if (rcu_task_enqueue_lim <0 ) { rcu_task_enqueue_lim =1 ; rcu_task_cb_adjust = true; -pr_info ("%s: Setting adjustable number of callback queues.\n" , __func__); }else if (rcu_task_enqueue_lim ==0 ) { rcu_task_enqueue_lim =1 ; }
@@ -264,6 +263,10 @@ static void cblist_init_generic(struct rcu_tasks *rtp)raw_spin_unlock_rcu_node (rtpcp);// irqs remain disabled. }raw_spin_unlock_irqrestore (&rtp->cbs_gbl_lock, flags); + +if (rcu_task_cb_adjust) +pr_info ("%s: Setting adjustable number of callback queues.\n" , __func__); +pr_info ("%s: Setting shift to %d and lim to %d.\n" , __func__,data_race (rtp->percpu_enqueue_shift),data_race (rtp->percpu_enqueue_lim)); }
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 2/3 rcu: Mark additional concurrent load from ->cpu_no_qs.b.exp
From: "Paul E. McKenney" <[email protected]>
[ Upstream commit 9146eb25495ea8bfb5010192e61e3ed5805ce9ef ]
The per-CPU rcu_data structure's ->cpu_no_qs.b.exp field is updated only on the instance corresponding to the current CPU, but can be read more widely. Unmarked accesses are OK from the corresponding CPU, but only if interrupts are disabled, given that interrupt handlers can and do modify this field.
Unfortunately, although the load from rcu_preempt_deferred_qs() is always carried out from the corresponding CPU, interrupts are not necessarily disabled. This commit therefore upgrades this load to READ_ONCE.
Similarly, the diagnostic access from synchronize_rcu_expedited_wait() might run with interrupts disabled and from some other CPU. This commit therefore marks this load with data_race().
Finally, the C-language access in rcu_preempt_ctxt_queue() is OK as is because interrupts are disabled and this load is always from the corresponding CPU. This commit adds a comment giving the rationale for this access being safe.
This data race was reported by KCSAN. Not appropriate for backporting due to failure being unlikely.
--- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
kernel/rcu/tree_exp.h +1 -1
@@ -641,7 +641,7 @@ static void synchronize_rcu_expedited_wait(void)"O." [!!cpu_online (cpu)],"o." [!!(rdp->grpmask & rnp->expmaskinit)],"N." [!!(rdp->grpmask & rnp->expmaskinitnext)], - "D."[!!(rdp->cpu_no_qs.b.exp)]); + "D."[!!data_race(rdp->cpu_no_qs.b.exp)]); } } pr_cont(" } %lu jiffies s: %lu root: %#lx/%c\n",
kernel/rcu/tree_plugin.h +3 -1
@@ -257,6 +257,8 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)* GP should not be able to end until we report, so there should be * no need to check for a subsequent expedited GP. (Though we are * still in a quiescent state in any case.) +* +* Interrupts are disabled, so ->cpu_no_qs.b.exp cannot change. */ if (blkd_state &RCU_EXP_BLKD && rdp->cpu_no_qs.b.exp)rcu_report_exp_rdp (rdp);
@@ -941,7 +943,7 @@ notrace void rcu_preempt_deferred_qs(struct task_struct *t) {struct rcu_data *rdp =this_cpu_ptr (&rcu_data); -if (rdp->cpu_no_qs.b.exp) +if (READ_ONCE (rdp->cpu_no_qs.b.exp))rcu_report_exp_rdp (rdp); }
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 3/3 rcu: Mark rcu_cpu_kthread() accesses to ->rcu_cpu_has_work
In reply to Sasha LevinFrom: "Paul E. McKenney" <[email protected]>
[ Upstream commit a24c1aab652ebacf9ea62470a166514174c96fe1 ]
The rcu_data structure's ->rcu_cpu_has_work field can be modified by any CPU attempting to wake up the rcuc kthread. Therefore, this commit marks accesses to this field from the rcu_cpu_kthread() function.
This data race was reported by KCSAN. Not appropriate for backporting due to failure being unlikely.
--- kernel/rcu/tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/rcu/tree.c +2 -2
@@ -2593,12 +2593,12 @@ static void rcu_cpu_kthread(unsigned int cpu) *statusp =RCU_KTHREAD_RUNNING ;local_irq_disable (); work = *workp; - *workp =0 ; +WRITE_ONCE (*workp,0 );local_irq_enable ();if (work)rcu_core ();local_bh_enable (); -if (*workp ==0 ) { +if (!READ_ONCE (*workp)) {trace_rcu_utilization (TPS ("End CPU kthread@rcu_wait" )); *statusp =RCU_KTHREAD_WAITING ;return ;
Signature · 1 line
2.39.2