Skip to content

Commit 10c5357

Browse files
committed
rcu: Don't deboost before reporting expedited quiescent state
Currently rcu_preempt_deferred_qs_irqrestore() releases rnp->boost_mtx before reporting the expedited quiescent state. Under heavy real-time load, this can result in this function being preempted before the quiescent state is reported, which can in turn prevent the expedited grace period from completing. Tim Murray reports that the resulting expedited grace periods can take hundreds of milliseconds and even more than one second, when they should normally complete in less than a millisecond. This was fine given that there were no particular response-time constraints for synchronize_rcu_expedited(), as it was designed for throughput rather than latency. However, some users now need sub-100-millisecond response-time constratints. This patch therefore follows Neeraj's suggestion (seconded by Tim and by Uladzislau Rezki) of simply reversing the two operations. Reported-by: Tim Murray <timmurray@google.com> Reported-by: Joel Fernandes <joelaf@google.com> Reported-by: Neeraj Upadhyay <quic_neeraju@quicinc.com> Reviewed-by: Neeraj Upadhyay <quic_neeraju@quicinc.com> Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com> Tested-by: Tim Murray <timmurray@google.com> Cc: Todd Kjos <tkjos@google.com> Cc: Sandeep Patil <sspatil@google.com> Cc: <stable@vger.kernel.org> # 5.4.x Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent a469948 commit 10c5357

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kernel/rcu/tree_plugin.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,16 +556,16 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
556556
raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
557557
}
558558

559-
/* Unboost if we were boosted. */
560-
if (IS_ENABLED(CONFIG_RCU_BOOST) && drop_boost_mutex)
561-
rt_mutex_futex_unlock(&rnp->boost_mtx.rtmutex);
562-
563559
/*
564560
* If this was the last task on the expedited lists,
565561
* then we need to report up the rcu_node hierarchy.
566562
*/
567563
if (!empty_exp && empty_exp_now)
568564
rcu_report_exp_rnp(rnp, true);
565+
566+
/* Unboost if we were boosted. */
567+
if (IS_ENABLED(CONFIG_RCU_BOOST) && drop_boost_mutex)
568+
rt_mutex_futex_unlock(&rnp->boost_mtx.rtmutex);
569569
} else {
570570
local_irq_restore(flags);
571571
}

0 commit comments

Comments
 (0)