Skip to content

Commit 46faf9d

Browse files
paulmckrcufbq
authored andcommitted
rcu-tasks: Initialize data to eliminate RCU-tasks/do_exit() deadlocks
Holding a mutex across synchronize_rcu_tasks() and acquiring that same mutex in code called from do_exit() after its call to exit_tasks_rcu_start() but before its call to exit_tasks_rcu_stop() results in deadlock. This is by design, because tasks that are far enough into do_exit() are no longer present on the tasks list, making it a bit difficult for RCU Tasks to find them, let alone wait on them to do a voluntary context switch. However, such deadlocks are becoming more frequent. In addition, lockdep currently does not detect such deadlocks and they can be difficult to reproduce. In addition, if a task voluntarily context switches during that time (for example, if it blocks acquiring a mutex), then this task is in an RCU Tasks quiescent state. And with some adjustments, RCU Tasks could just as well take advantage of that fact. This commit therefore initializes the data structures that will be needed to rely on these quiescent states and to eliminate these deadlocks. 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 30ef096 commit 46faf9d

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

init/init_task.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ struct task_struct init_task __aligned(L1_CACHE_BYTES) = {
147147
.rcu_tasks_holdout = false,
148148
.rcu_tasks_holdout_list = LIST_HEAD_INIT(init_task.rcu_tasks_holdout_list),
149149
.rcu_tasks_idle_cpu = -1,
150+
.rcu_tasks_exit_list = LIST_HEAD_INIT(init_task.rcu_tasks_exit_list),
150151
#endif
151152
#ifdef CONFIG_TASKS_TRACE_RCU
152153
.trc_reader_nesting = 0,

kernel/fork.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,6 +1976,7 @@ static inline void rcu_copy_process(struct task_struct *p)
19761976
p->rcu_tasks_holdout = false;
19771977
INIT_LIST_HEAD(&p->rcu_tasks_holdout_list);
19781978
p->rcu_tasks_idle_cpu = -1;
1979+
INIT_LIST_HEAD(&p->rcu_tasks_exit_list);
19791980
#endif /* #ifdef CONFIG_TASKS_RCU */
19801981
#ifdef CONFIG_TASKS_TRACE_RCU
19811982
p->trc_reader_nesting = 0;

kernel/rcu/tasks.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ static void cblist_init_generic(struct rcu_tasks *rtp)
274274
rtpcp->rtpp = rtp;
275275
if (!rtpcp->rtp_blkd_tasks.next)
276276
INIT_LIST_HEAD(&rtpcp->rtp_blkd_tasks);
277+
if (!rtpcp->rtp_exit_list.next)
278+
INIT_LIST_HEAD(&rtpcp->rtp_exit_list);
277279
}
278280

279281
pr_info("%s: Setting shift to %d and lim to %d rcu_task_cb_adjust=%d.\n", rtp->name,

0 commit comments

Comments
 (0)