Skip to content

Commit b672daa

Browse files
Frederic Weisbeckergregkh
authored andcommitted
rcu: Fix racy re-initialization of irq_work causing hangs
commit 61399e0 upstream. RCU re-initializes the deferred QS irq work everytime before attempting to queue it. However there are situations where the irq work is attempted to be queued even though it is already queued. In that case re-initializing messes-up with the irq work queue that is about to be handled. The chances for that to happen are higher when the architecture doesn't support self-IPIs and irq work are then all lazy, such as with the following sequence: 1) rcu_read_unlock() is called when IRQs are disabled and there is a grace period involving blocked tasks on the node. The irq work is then initialized and queued. 2) The related tasks are unblocked and the CPU quiescent state is reported. rdp->defer_qs_iw_pending is reset to DEFER_QS_IDLE, allowing the irq work to be requeued in the future (note the previous one hasn't fired yet). 3) A new grace period starts and the node has blocked tasks. 4) rcu_read_unlock() is called when IRQs are disabled again. The irq work is re-initialized (but it's queued! and its node is cleared) and requeued. Which means it's requeued to itself. 5) The irq work finally fires with the tick. But since it was requeued to itself, it loops and hangs. Fix this with initializing the irq work only once before the CPU boots. Fixes: b41642c ("rcu: Fix rcu_read_unlock() deadloop due to IRQ work") Reported-by: kernel test robot <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202508071303.c1134cce-lkp@intel.com Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Reviewed-by: Joel Fernandes <joelagnelf@nvidia.com> Signed-off-by: Neeraj Upadhyay (AMD) <neeraj.upadhyay@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cf04cdc commit b672daa

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

kernel/rcu/tree.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5027,6 +5027,8 @@ int rcutree_prepare_cpu(unsigned int cpu)
50275027
rdp->rcu_iw_gp_seq = rdp->gp_seq - 1;
50285028
trace_rcu_grace_period(rcu_state.name, rdp->gp_seq, TPS("cpuonl"));
50295029
raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
5030+
5031+
rcu_preempt_deferred_qs_init(rdp);
50305032
rcu_spawn_rnp_kthreads(rnp);
50315033
rcu_spawn_cpu_nocb_kthread(cpu);
50325034
ASSERT_EXCLUSIVE_WRITER(rcu_state.n_online_cpus);

kernel/rcu/tree.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ static int rcu_print_task_exp_stall(struct rcu_node *rnp);
487487
static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);
488488
static void rcu_flavor_sched_clock_irq(int user);
489489
static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck);
490+
static void rcu_preempt_deferred_qs_init(struct rcu_data *rdp);
490491
static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
491492
static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
492493
static bool rcu_is_callbacks_kthread(struct rcu_data *rdp);

kernel/rcu/tree_plugin.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,6 @@ static void rcu_read_unlock_special(struct task_struct *t)
698698
cpu_online(rdp->cpu)) {
699699
// Get scheduler to re-evaluate and call hooks.
700700
// If !IRQ_WORK, FQS scan will eventually IPI.
701-
rdp->defer_qs_iw =
702-
IRQ_WORK_INIT_HARD(rcu_preempt_deferred_qs_handler);
703701
rdp->defer_qs_iw_pending = DEFER_QS_PENDING;
704702
irq_work_queue_on(&rdp->defer_qs_iw, rdp->cpu);
705703
}
@@ -839,6 +837,10 @@ dump_blkd_tasks(struct rcu_node *rnp, int ncheck)
839837
}
840838
}
841839

840+
static void rcu_preempt_deferred_qs_init(struct rcu_data *rdp)
841+
{
842+
rdp->defer_qs_iw = IRQ_WORK_INIT_HARD(rcu_preempt_deferred_qs_handler);
843+
}
842844
#else /* #ifdef CONFIG_PREEMPT_RCU */
843845

844846
/*
@@ -1038,6 +1040,8 @@ dump_blkd_tasks(struct rcu_node *rnp, int ncheck)
10381040
WARN_ON_ONCE(!list_empty(&rnp->blkd_tasks));
10391041
}
10401042

1043+
static void rcu_preempt_deferred_qs_init(struct rcu_data *rdp) { }
1044+
10411045
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
10421046

10431047
/*

0 commit comments

Comments
 (0)