Skip to content

Commit fcb42c9

Browse files
qiangzh3paulmckrcu
authored andcommitted
rcu: Add QS check in rcu_exp_handler() for non-preemptible kernels
Kernels built with CONFIG_PREEMPTION=n and CONFIG_PREEMPT_COUNT=y maintain preempt_count() state. Because such kernels map __rcu_read_lock() and __rcu_read_unlock() to preempt_disable() and preempt_enable(), respectively, this allows the expedited grace period's !CONFIG_PREEMPT_RCU version of the rcu_exp_handler() IPI handler function to use preempt_count() to detect quiescent states. This preempt_count() usage might seem to risk failures due to use of implicit RCU readers in portions of the kernel under #ifndef CONFIG_PREEMPTION, except that rcu_core() already disallows such implicit RCU readers. The moral of this story is that you must use explicit read-side markings such as rcu_read_lock() or preempt_disable() even if the code knows that this kernel does not support preemption. This commit therefore adds a preempt_count()-based check for a quiescent state in the !CONFIG_PREEMPT_RCU version of the rcu_exp_handler() function for kernels built with CONFIG_PREEMPT_COUNT=y, reporting an immediate quiescent state when the interrupted code had both preemption and softirqs enabled. This change results in about a 2% reduction in expedited grace-period latency in kernels built with both CONFIG_PREEMPT_RCU=n and CONFIG_PREEMPT_COUNT=y. Signed-off-by: Zqiang <qiang1.zhang@intel.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Link: https://lore.kernel.org/all/20220622103549.2840087-1-qiang1.zhang@intel.com/
1 parent bca4fa8 commit fcb42c9

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

kernel/rcu/tree_exp.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,11 +828,13 @@ static void rcu_exp_handler(void *unused)
828828
{
829829
struct rcu_data *rdp = this_cpu_ptr(&rcu_data);
830830
struct rcu_node *rnp = rdp->mynode;
831+
bool preempt_bh_enabled = !(preempt_count() & (PREEMPT_MASK | SOFTIRQ_MASK));
831832

832833
if (!(READ_ONCE(rnp->expmask) & rdp->grpmask) ||
833834
__this_cpu_read(rcu_data.cpu_no_qs.b.exp))
834835
return;
835-
if (rcu_is_cpu_rrupt_from_idle()) {
836+
if (rcu_is_cpu_rrupt_from_idle() ||
837+
(IS_ENABLED(CONFIG_PREEMPT_COUNT) && preempt_bh_enabled)) {
836838
rcu_report_exp_rdp(this_cpu_ptr(&rcu_data));
837839
return;
838840
}

0 commit comments

Comments
 (0)