Skip to content

Commit 4e86206

Browse files
paulmckrcugregkh
authored andcommitted
rcu-tasks: Maintain lists to eliminate RCU-tasks/do_exit() deadlocks
commit 6b70399 upstream. 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> Cc: Tahera Fahimi <taherafahimi@linux.microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8be3d52 commit 4e86206

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
@@ -1175,25 +1175,48 @@ struct task_struct *get_rcu_tasks_gp_kthread(void)
11751175
EXPORT_SYMBOL_GPL(get_rcu_tasks_gp_kthread);
11761176

11771177
/*
1178-
* Contribute to protect against tasklist scan blind spot while the
1179-
* task is exiting and may be removed from the tasklist. See
1180-
* corresponding synchronize_srcu() for further details.
1178+
* Protect against tasklist scan blind spot while the task is exiting and
1179+
* may be removed from the tasklist. Do this by adding the task to yet
1180+
* another list.
1181+
*
1182+
* Note that the task will remove itself from this list, so there is no
1183+
* need for get_task_struct(), except in the case where rcu_tasks_pertask()
1184+
* adds it to the holdout list, in which case rcu_tasks_pertask() supplies
1185+
* the needed get_task_struct().
11811186
*/
1182-
void exit_tasks_rcu_start(void) __acquires(&tasks_rcu_exit_srcu)
1187+
void exit_tasks_rcu_start(void)
11831188
{
1184-
current->rcu_tasks_idx = __srcu_read_lock(&tasks_rcu_exit_srcu);
1189+
unsigned long flags;
1190+
struct rcu_tasks_percpu *rtpcp;
1191+
struct task_struct *t = current;
1192+
1193+
WARN_ON_ONCE(!list_empty(&t->rcu_tasks_exit_list));
1194+
preempt_disable();
1195+
rtpcp = this_cpu_ptr(rcu_tasks.rtpcpu);
1196+
t->rcu_tasks_exit_cpu = smp_processor_id();
1197+
raw_spin_lock_irqsave_rcu_node(rtpcp, flags);
1198+
if (!rtpcp->rtp_exit_list.next)
1199+
INIT_LIST_HEAD(&rtpcp->rtp_exit_list);
1200+
list_add(&t->rcu_tasks_exit_list, &rtpcp->rtp_exit_list);
1201+
raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags);
1202+
preempt_enable();
11851203
}
11861204

11871205
/*
1188-
* Contribute to protect against tasklist scan blind spot while the
1189-
* task is exiting and may be removed from the tasklist. See
1190-
* corresponding synchronize_srcu() for further details.
1206+
* Remove the task from the "yet another list" because do_exit() is now
1207+
* non-preemptible, allowing synchronize_rcu() to wait beyond this point.
11911208
*/
1192-
void exit_tasks_rcu_stop(void) __releases(&tasks_rcu_exit_srcu)
1209+
void exit_tasks_rcu_stop(void)
11931210
{
1211+
unsigned long flags;
1212+
struct rcu_tasks_percpu *rtpcp;
11941213
struct task_struct *t = current;
11951214

1196-
__srcu_read_unlock(&tasks_rcu_exit_srcu, t->rcu_tasks_idx);
1215+
WARN_ON_ONCE(list_empty(&t->rcu_tasks_exit_list));
1216+
rtpcp = per_cpu_ptr(rcu_tasks.rtpcpu, t->rcu_tasks_exit_cpu);
1217+
raw_spin_lock_irqsave_rcu_node(rtpcp, flags);
1218+
list_del_init(&t->rcu_tasks_exit_list);
1219+
raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags);
11971220
}
11981221

11991222
/*

0 commit comments

Comments
 (0)