On 3/16/2025 7:07 AM, Frederic Weisbecker wrote: >>> diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h >>> index c36c7d5575ca..2fa7aa9155bd 100644 >>> --- a/kernel/rcu/tree_exp.h >>> +++ b/kernel/rcu/tree_exp.h >>> @@ -141,6 +141,13 @@ static void __maybe_unused sync_exp_reset_tree(void) >>> raw_spin_lock_irqsave_rcu_node(rnp, flags); >>> WARN_ON_ONCE(rnp->expmask); >>> WRITE_ONCE(rnp->expmask, rnp->expmaskinit); >>> + /* >>> + * Need to wait for any blocked tasks as well. Note that >>> + * additional blocking tasks will also block the expedited GP >>> + * until such time as the ->expmask bits are cleared. >>> + */ >>> + if (rcu_is_leaf_node(rnp) && rcu_preempt_has_tasks(rnp)) >>> + WRITE_ONCE(rnp->exp_tasks, rnp->blkd_tasks.next); >>> raw_spin_unlock_irqrestore_rcu_node(rnp, flags); >>> } >>> } >>> @@ -393,13 +400,6 @@ static void __sync_rcu_exp_select_node_cpus(struct rcu_exp_work *rewp) >>> } >>> mask_ofl_ipi = rnp->expmask & ~mask_ofl_test; >>> >>> - /* >>> - * Need to wait for any blocked tasks as well. Note that >>> - * additional blocking tasks will also block the expedited GP >>> - * until such time as the ->expmask bits are cleared. >>> - */ >>> - if (rcu_preempt_has_tasks(rnp)) >>> - WRITE_ONCE(rnp->exp_tasks, rnp->blkd_tasks.next); >>> raw_spin_unlock_irqrestore_rcu_node(rnp, flags); >> A small side effect of this patch could be: >> >> In the existing code, if between the sync_exp_reset_tree() and the >> __sync_rcu_exp_select_node_cpus(), if a pre-existing reader unblocked and >> completed, then I think it wouldn't be responsible for blocking the GP >> anymore. > Hmm, I don't see how that changes after this patch. > >> Where as with this patch, it would not get a chance to be removed from the >> blocked list because it would have to wait on the rnp lock, which after this >> patch would now be held across the setting of exp_mask and exp_tasks? > So that's sync_exp_reset_tree(). I'm a bit confused. An unblocking task > contend on rnp lock in any case. But after this patch it is still going > to remove itself from the blocking task once the rnp lock is released by > sync_exp_reset_tree(). > > What am I missing? You are probably not missing anything and I'm the one missing something. But I was thinking: In in the original code, in __sync_rcu_exp_select_node_cpus() if rcu_preempt_has_tasks() returns FALSE because of the finer grained locking, then there is a chance for the GP to conclude sooner, On the other hand, after the patch because the unblocking task had to wait (on the lock) to remove itself from the blocked task list, the GP may conclude later than usual. This is just an intuitive guess. Because this is an expedited GP, my intuition is to unblock + reader unlock and get out of the way ASAP than hoping that it will get access to the lock before any IPIs go out or quiescent state reports/checks happen which are required to conclude the GP Its just a theory and you're right, if it acquires the lock soon enough and gets out of the way, then it doesn't matter either way. Thanks! - Joel
