]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
srcu/tiny: Remove preempt_disable/enable() in srcu_gp_start_if_needed()
authorZqiang <qiang.zhang@linux.dev>
Thu, 11 Sep 2025 12:51:55 +0000 (20:51 +0800)
committerPaul E. McKenney <paulmck@kernel.org>
Mon, 15 Sep 2025 12:16:28 +0000 (05:16 -0700)
Currently, the srcu_gp_start_if_needed() is always be invoked in
preempt disable's critical section, this commit therefore remove
redundant preempt_disable/enable() in srcu_gp_start_if_needed()
and adds a call to lockdep_assert_preemption_disabled() in order
to enable lockdep to diagnose mistaken invocations of this function
from preempts-enabled code.

Fixes: 65b4a59557f6 ("srcu: Make Tiny SRCU explicitly disable preemption")
Signed-off-by: Zqiang <qiang.zhang@linux.dev>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/rcu/srcutiny.c

index 6e9fe2ce1075d5d7d1b9b69a1e54486680f5f1c2..e3b64a5e0ec7e1ea3f1bd501275bc819b4cbd89e 100644 (file)
@@ -176,10 +176,9 @@ static void srcu_gp_start_if_needed(struct srcu_struct *ssp)
 {
        unsigned long cookie;
 
-       preempt_disable();  // Needed for PREEMPT_LAZY
+       lockdep_assert_preemption_disabled(); // Needed for PREEMPT_LAZY
        cookie = get_state_synchronize_srcu(ssp);
        if (ULONG_CMP_GE(READ_ONCE(ssp->srcu_idx_max), cookie)) {
-               preempt_enable();
                return;
        }
        WRITE_ONCE(ssp->srcu_idx_max, cookie);
@@ -189,7 +188,6 @@ static void srcu_gp_start_if_needed(struct srcu_struct *ssp)
                else if (list_empty(&ssp->srcu_work.entry))
                        list_add(&ssp->srcu_work.entry, &srcu_boot_list);
        }
-       preempt_enable();
 }
 
 /*