Skip to content

Commit 6b70399

Browse files
paulmckrcufbq
authored andcommitted
rcu-tasks: Maintain lists to eliminate RCU-tasks/do_exit() deadlocks
This commit continues the elimination of deadlocks involving do_exit() and RCU tasks by causing exit_tasks_rcu_start() to add the current task to a per-CPU list and causing exit_tasks_rcu_stop() to remove the current task from whatever list it is on. These lists will be used to track tasks that are exiting, while still accounting for any RCU-tasks quiescent states that these tasks pass though. [ paulmck: Apply Frederic Weisbecker feedback. ] Link: https://lore.kernel.org/all/20240118021842.290665-1-chenzhongjin@huawei.com/ Reported-by: Chen Zhongjin <chenzhongjin@huawei.com> Reported-by: Yang Jihong <yangjihong1@huawei.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Tested-by: Yang Jihong <yangjihong1@huawei.com> Tested-by: Chen Zhongjin <chenzhongjin@huawei.com> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
1 parent 46faf9d commit 6b70399

File tree

1 file changed

+33
-10
lines changed

1 file changed

+33
-10
lines changed

kernel/rcu/tasks.h

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,25 +1147,48 @@ struct task_struct *get_rcu_tasks_gp_kthread(void)
11471147
EXPORT_SYMBOL_GPL(get_rcu_tasks_gp_kthread);
11481148

11491149
/*
1150-
* Contribute to protect against tasklist scan blind spot while the
1151-
* task is exiting and may be removed from the tasklist. See
1152-
* corresponding synchronize_srcu() for further details.
1150+
* Protect against tasklist scan blind spot while the task is exiting and
1151+
* may be removed from the tasklist. Do this by adding the task to yet
1152+
* another list.
1153+
*
1154+
* Note that the task will remove itself from this list, so there is no
1155+
* need for get_task_struct(), except in the case where rcu_tasks_pertask()
1156+
* adds it to the holdout list, in which case rcu_tasks_pertask() supplies
1157+
* the needed get_task_struct().
11531158
*/
1154-
void exit_tasks_rcu_start(void) __acquires(&tasks_rcu_exit_srcu)
1159+
void exit_tasks_rcu_start(void)
11551160
{
1156-
current->rcu_tasks_idx = __srcu_read_lock(&tasks_rcu_exit_srcu);
1161+
unsigned long flags;
1162+
struct rcu_tasks_percpu *rtpcp;
1163+
struct task_struct *t = current;
1164+
1165+
WARN_ON_ONCE(!list_empty(&t->rcu_tasks_exit_list));
1166+
preempt_disable();
1167+
rtpcp = this_cpu_ptr(rcu_tasks.rtpcpu);
1168+
t->rcu_tasks_exit_cpu = smp_processor_id();
1169+
raw_spin_lock_irqsave_rcu_node(rtpcp, flags);
1170+
if (!rtpcp->rtp_exit_list.next)
1171+
INIT_LIST_HEAD(&rtpcp->rtp_exit_list);
1172+
list_add(&t->rcu_tasks_exit_list, &rtpcp->rtp_exit_list);
1173+
raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags);
1174+
preempt_enable();
11571175
}
11581176

11591177
/*
1160-
* Contribute to protect against tasklist scan blind spot while the
1161-
* task is exiting and may be removed from the tasklist. See
1162-
* corresponding synchronize_srcu() for further details.
1178+
* Remove the task from the "yet another list" because do_exit() is now
1179+
* non-preemptible, allowing synchronize_rcu() to wait beyond this point.
11631180
*/
1164-
void exit_tasks_rcu_stop(void) __releases(&tasks_rcu_exit_srcu)
1181+
void exit_tasks_rcu_stop(void)
11651182
{
1183+
unsigned long flags;
1184+
struct rcu_tasks_percpu *rtpcp;
11661185
struct task_struct *t = current;
11671186

1168-
__srcu_read_unlock(&tasks_rcu_exit_srcu, t->rcu_tasks_idx);
1187+
WARN_ON_ONCE(list_empty(&t->rcu_tasks_exit_list));
1188+
rtpcp = per_cpu_ptr(rcu_tasks.rtpcpu, t->rcu_tasks_exit_cpu);
1189+
raw_spin_lock_irqsave_rcu_node(rtpcp, flags);
1190+
list_del_init(&t->rcu_tasks_exit_list);
1191+
raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags);
11691192
}
11701193

11711194
/*

0 commit comments

Comments
 (0)