diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-01-08 17:35:52 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-02-23 18:14:40 -0500 |
commit | ad7c946b35ad455417fdd4bc0e17deda4011841b (patch) | |
tree | 8f78b9d52f74c2e4aed4acea5bbce6c96d5143d8 | |
parent | 65963d246147c46aafda2b04523d6dbe6c457e7c (diff) |
rcu: Create RCU-specific workqueues with rescuers
RCU's expedited grace periods can participate in out-of-memory deadlocks
due to all available system_wq kthreads being blocked and there not being
memory available to create more. This commit prevents such deadlocks
by allocating an RCU-specific workqueue_struct at early boot time, and
providing it with a rescuer to ensure forward progress. This uses the
shiny new init_rescuer() function provided by Tejun (but indirectly).
This commit also causes SRCU to use this new RCU-specific
workqueue_struct. Note that SRCU's use of workqueues never blocks them
waiting for readers, so this should be safe from a forward-progress
viewpoint. Note that this moves SRCU from system_power_efficient_wq
to a normal workqueue. In the unlikely event that this results in
measurable degradation, a separate power-efficient workqueue will be
creates for SRCU.
Reported-by: Prateek Sood <prsood@codeaurora.org>
Reported-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | kernel/rcu/rcu.h | 1 | ||||
-rw-r--r-- | kernel/rcu/srcutree.c | 8 | ||||
-rw-r--r-- | kernel/rcu/tree.c | 6 | ||||
-rw-r--r-- | kernel/rcu/tree_exp.h | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h index 1c868bcfd705..7a693e31184a 100644 --- a/kernel/rcu/rcu.h +++ b/kernel/rcu/rcu.h | |||
@@ -485,6 +485,7 @@ void show_rcu_gp_kthreads(void); | |||
485 | void rcu_force_quiescent_state(void); | 485 | void rcu_force_quiescent_state(void); |
486 | void rcu_bh_force_quiescent_state(void); | 486 | void rcu_bh_force_quiescent_state(void); |
487 | void rcu_sched_force_quiescent_state(void); | 487 | void rcu_sched_force_quiescent_state(void); |
488 | extern struct workqueue_struct *rcu_gp_wq; | ||
488 | #endif /* #else #ifdef CONFIG_TINY_RCU */ | 489 | #endif /* #else #ifdef CONFIG_TINY_RCU */ |
489 | 490 | ||
490 | #ifdef CONFIG_RCU_NOCB_CPU | 491 | #ifdef CONFIG_RCU_NOCB_CPU |
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c index 045b559b9f22..743d18379256 100644 --- a/kernel/rcu/srcutree.c +++ b/kernel/rcu/srcutree.c | |||
@@ -492,8 +492,7 @@ static bool srcu_queue_delayed_work_on(int cpu, struct workqueue_struct *wq, | |||
492 | */ | 492 | */ |
493 | static void srcu_schedule_cbs_sdp(struct srcu_data *sdp, unsigned long delay) | 493 | static void srcu_schedule_cbs_sdp(struct srcu_data *sdp, unsigned long delay) |
494 | { | 494 | { |
495 | srcu_queue_delayed_work_on(sdp->cpu, system_power_efficient_wq, | 495 | srcu_queue_delayed_work_on(sdp->cpu, rcu_gp_wq, &sdp->work, delay); |
496 | &sdp->work, delay); | ||
497 | } | 496 | } |
498 | 497 | ||
499 | /* | 498 | /* |
@@ -691,8 +690,7 @@ static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, | |||
691 | rcu_seq_state(sp->srcu_gp_seq) == SRCU_STATE_IDLE) { | 690 | rcu_seq_state(sp->srcu_gp_seq) == SRCU_STATE_IDLE) { |
692 | WARN_ON_ONCE(ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)); | 691 | WARN_ON_ONCE(ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)); |
693 | srcu_gp_start(sp); | 692 | srcu_gp_start(sp); |
694 | queue_delayed_work(system_power_efficient_wq, &sp->work, | 693 | queue_delayed_work(rcu_gp_wq, &sp->work, srcu_get_delay(sp)); |
695 | srcu_get_delay(sp)); | ||
696 | } | 694 | } |
697 | spin_unlock_irqrestore_rcu_node(sp, flags); | 695 | spin_unlock_irqrestore_rcu_node(sp, flags); |
698 | } | 696 | } |
@@ -1225,7 +1223,7 @@ static void srcu_reschedule(struct srcu_struct *sp, unsigned long delay) | |||
1225 | spin_unlock_irq_rcu_node(sp); | 1223 | spin_unlock_irq_rcu_node(sp); |
1226 | 1224 | ||
1227 | if (pushgp) | 1225 | if (pushgp) |
1228 | queue_delayed_work(system_power_efficient_wq, &sp->work, delay); | 1226 | queue_delayed_work(rcu_gp_wq, &sp->work, delay); |
1229 | } | 1227 | } |
1230 | 1228 | ||
1231 | /* | 1229 | /* |
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 99d404c6bbbb..2a734692a581 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -4167,6 +4167,8 @@ static void __init rcu_dump_rcu_node_tree(struct rcu_state *rsp) | |||
4167 | pr_cont("\n"); | 4167 | pr_cont("\n"); |
4168 | } | 4168 | } |
4169 | 4169 | ||
4170 | struct workqueue_struct *rcu_gp_wq; | ||
4171 | |||
4170 | void __init rcu_init(void) | 4172 | void __init rcu_init(void) |
4171 | { | 4173 | { |
4172 | int cpu; | 4174 | int cpu; |
@@ -4193,6 +4195,10 @@ void __init rcu_init(void) | |||
4193 | rcu_cpu_starting(cpu); | 4195 | rcu_cpu_starting(cpu); |
4194 | rcutree_online_cpu(cpu); | 4196 | rcutree_online_cpu(cpu); |
4195 | } | 4197 | } |
4198 | |||
4199 | /* Create workqueue for expedited GPs and for Tree SRCU. */ | ||
4200 | rcu_gp_wq = alloc_workqueue("rcu_gp", WQ_MEM_RECLAIM, 0); | ||
4201 | WARN_ON(!rcu_gp_wq); | ||
4196 | } | 4202 | } |
4197 | 4203 | ||
4198 | #include "tree_exp.h" | 4204 | #include "tree_exp.h" |
diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index 6ad87642f44a..f72eefab8543 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h | |||
@@ -626,7 +626,7 @@ static void _synchronize_rcu_expedited(struct rcu_state *rsp, | |||
626 | rew.rew_rsp = rsp; | 626 | rew.rew_rsp = rsp; |
627 | rew.rew_s = s; | 627 | rew.rew_s = s; |
628 | INIT_WORK_ONSTACK(&rew.rew_work, wait_rcu_exp_gp); | 628 | INIT_WORK_ONSTACK(&rew.rew_work, wait_rcu_exp_gp); |
629 | schedule_work(&rew.rew_work); | 629 | queue_work(rcu_gp_wq, &rew.rew_work); |
630 | } | 630 | } |
631 | 631 | ||
632 | /* Wait for expedited grace period to complete. */ | 632 | /* Wait for expedited grace period to complete. */ |