Skip to content

Commit aa7e9fa

Browse files
paulmckrcuAvenger-285714
authored andcommitted
rcu-tasks: Add data to eliminate RCU-tasks/do_exit() deadlocks
[ Upstream commit bfe9393 ] 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 adds the data structures that will be needed to rely on these quiescent states and to eliminate these deadlocks. Link: https://lore.kernel.org/all/[email protected]/ Reported-by: Chen Zhongjin <[email protected]> Reported-by: Yang Jihong <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Tested-by: Yang Jihong <[email protected]> Tested-by: Chen Zhongjin <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Signed-off-by: Boqun Feng <[email protected]> Stable-dep-of: fd70e9f1d85f ("rcu-tasks: Fix access non-existent percpu rtpcp variable in rcu_tasks_need_gpcb()") Signed-off-by: Sasha Levin <[email protected]>
1 parent 4fa2e62 commit aa7e9fa

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

include/linux/sched.h

+2
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,8 @@ struct task_struct {
854854
u8 rcu_tasks_idx;
855855
int rcu_tasks_idle_cpu;
856856
struct list_head rcu_tasks_holdout_list;
857+
int rcu_tasks_exit_cpu;
858+
struct list_head rcu_tasks_exit_list;
857859
#endif /* #ifdef CONFIG_TASKS_RCU */
858860

859861
#ifdef CONFIG_TASKS_TRACE_RCU

kernel/rcu/tasks.h

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ typedef void (*postgp_func_t)(struct rcu_tasks *rtp);
3232
* @rtp_irq_work: IRQ work queue for deferred wakeups.
3333
* @barrier_q_head: RCU callback for barrier operation.
3434
* @rtp_blkd_tasks: List of tasks blocked as readers.
35+
* @rtp_exit_list: List of tasks in the latter portion of do_exit().
3536
* @cpu: CPU number corresponding to this entry.
3637
* @rtpp: Pointer to the rcu_tasks structure.
3738
*/
@@ -46,6 +47,7 @@ struct rcu_tasks_percpu {
4647
struct irq_work rtp_irq_work;
4748
struct rcu_head barrier_q_head;
4849
struct list_head rtp_blkd_tasks;
50+
struct list_head rtp_exit_list;
4951
int cpu;
5052
struct rcu_tasks *rtpp;
5153
};

0 commit comments

Comments
 (0)