refscale: Move shutdown from wait_event() to wait_event_idle()
Subsystems (2)
Sasha Levin
maintainerPATCH 1/2 refscale: Move shutdown from wait_event() to wait_event_idle()
From: "Paul E. McKenney" <[email protected]>
[ Upstream commit 6bc6e6b27524304aadb9c04611ddb1c84dd7617a ]
The ref_scale_shutdown() kthread/function uses wait_event() to wait for the refscale test to complete. However, although the read-side tests are normally extremely fast, there is no law against specifying a very large value for the refscale.loops module parameter or against having a slow read-side primitive. Either way, this might well trigger the hung-task timeout.
This commit therefore replaces those wait_event() calls with calls to wait_event_idle(), which do not trigger the hung-task timeout.
--- kernel/rcu/refscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/refscale.c +1 -1
@@ -625,7 +625,7 @@ ref_scale_cleanup(void)static int ref_scale_shutdown (void *arg) { -wait_event (shutdown_wq, shutdown_start); +wait_event_idle (shutdown_wq, shutdown_start);smp_mb ();// Wake before output. ref_scale_cleanup ();
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 2/2 rcu: Protect rcu_print_task_exp_stall() ->exp_tasks access
From: Zqiang <[email protected]>
[ Upstream commit 3c1566bca3f8349f12b75d0a2d5e4a20ad6262ec ]
For kernels built with CONFIG_PREEMPT_RCU=y, the following scenario can result in a NULL-pointer dereference:
CPU1 CPU2rcu_preempt_deferred_qs_irqrestore rcu_print_task_exp_stall
if (special.b.blocked) READ_ONCE(rnp->exp_tasks) != NULL
raw_spin_lock_rcu_node
np = rcu_next_node_entry(t, rnp)
if (&t->rcu_node_entry == rnp->exp_tasks)
WRITE_ONCE(rnp->exp_tasks, np)
....
raw_spin_unlock_irqrestore_rcu_node
raw_spin_lock_irqsave_rcu_node
t = list_entry(rnp->exp_tasks->prev,
struct task_struct, rcu_node_entry)
(if rnp->exp_tasks is NULL, this
will dereference a NULL pointer)The problem is that CPU2 accesses the rcu_node structure's->exp_tasks field without holding the rcu_node structure's ->lock and CPU2 did not observe CPU1's change to rcu_node structure's ->exp_tasks in time. Therefore, if CPU1 sets rcu_node structure's->exp_tasks pointer to NULL, then CPU2 might dereference that NULL pointer.
This commit therefore holds the rcu_node structure's ->lock while accessing that structure's->exp_tasks field.
[ paulmck: Apply Frederic Weisbecker feedback. ]
--- kernel/rcu/tree_exp.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/rcu/tree_exp.h +4 -2
@@ -707,9 +707,11 @@ static int rcu_print_task_exp_stall(struct rcu_node *rnp)int ndetected =0 ;struct task_struct *t; -if (!READ_ONCE (rnp->exp_tasks)) -return 0 ;raw_spin_lock_irqsave_rcu_node (rnp, flags); +if (!rnp->exp_tasks) { +raw_spin_unlock_irqrestore_rcu_node (rnp, flags); +return 0 ; + } t =list_entry (rnp->exp_tasks->prev, struct task_struct, rcu_node_entry);list_for_each_entry_continue (t, &rnp->blkd_tasks, rcu_node_entry) {
Signature · 1 line
2.39.2