]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
smp: Defer check for local execution in smp_call_function_many_cond()
authorYury Norov [NVIDIA] <yury.norov@gmail.com>
Mon, 23 Jun 2025 00:00:09 +0000 (20:00 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 2 Jul 2025 17:13:14 +0000 (19:13 +0200)
Defer check for local execution to the actual place where it is needed,
which removes the extra local variable.

Signed-off-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250623000010.10124-5-yury.norov@gmail.com
kernel/smp.c

index 5871acf3cd45b1c65d1a89a00a801fd7c63bcf83..99d1fd0e9e0e8cfcecfcb12fb49932368eef0518 100644 (file)
@@ -779,7 +779,6 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
        bool wait = scf_flags & SCF_WAIT;
        int nr_cpus = 0;
        bool run_remote = false;
-       bool run_local = false;
 
        lockdep_assert_preemption_disabled();
 
@@ -801,11 +800,6 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
         */
        WARN_ON_ONCE(!in_task());
 
-       /* Check if we need local execution. */
-       if ((scf_flags & SCF_RUN_LOCAL) && cpumask_test_cpu(this_cpu, mask) &&
-           (!cond_func || cond_func(this_cpu, info)))
-               run_local = true;
-
        /* Check if we need remote execution, i.e., any CPU excluding this one. */
        if (cpumask_any_and_but(mask, cpu_online_mask, this_cpu) < nr_cpu_ids) {
                run_remote = true;
@@ -851,7 +845,9 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
                        send_call_function_ipi_mask(cfd->cpumask_ipi);
        }
 
-       if (run_local) {
+       /* Check if we need local execution. */
+       if ((scf_flags & SCF_RUN_LOCAL) && cpumask_test_cpu(this_cpu, mask) &&
+           (!cond_func || cond_func(this_cpu, info))) {
                unsigned long flags;
 
                local_irq_save(flags);