clocksource: use better cpumask API where appropriate

[PATCH 1/2] clocksource: fix opencoded cpumask_any_but() in clocksource_verify_choose_cpus()

Posted by Yury Norov 6 months, 2 weeks ago

From: Yury Norov [NVIDIA] <yury.norov@gmail.com>

cpumask_any_but() is more verbose than cpumask_first() followed by
cpumask_next(). Use it in clocksource_verify_choose_cpus().

Signed-off-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>
---
 kernel/time/clocksource.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 4b005b2f3ef5..2e24ce884272 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -323,9 +323,7 @@ static void clocksource_verify_choose_cpus(void)
 		return;
 
 	/* Make sure to select at least one CPU other than the current CPU. */
-	cpu = cpumask_first(cpu_online_mask);
-	if (cpu == smp_processor_id())
-		cpu = cpumask_next(cpu, cpu_online_mask);
+	cpu = cpumask_any_but(cpu_online_mask, smp_processor_id());
 	if (WARN_ON_ONCE(cpu >= nr_cpu_ids))
 		return;
 	cpumask_set_cpu(cpu, &cpus_chosen);
-- 
2.43.0

Re: [PATCH 1/2] clocksource: fix opencoded cpumask_any_but() in clocksource_verify_choose_cpus()

Posted by John Stultz 6 months, 2 weeks ago

On Wed, Jun 4, 2025 at 4:25 PM Yury Norov <yury.norov@gmail.com> wrote:
>
> From: Yury Norov [NVIDIA] <yury.norov@gmail.com>
>
> cpumask_any_but() is more verbose than cpumask_first() followed by
> cpumask_next(). Use it in clocksource_verify_choose_cpus().
>
> Signed-off-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>
> ---
>  kernel/time/clocksource.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
> index 4b005b2f3ef5..2e24ce884272 100644
> --- a/kernel/time/clocksource.c
> +++ b/kernel/time/clocksource.c
> @@ -323,9 +323,7 @@ static void clocksource_verify_choose_cpus(void)
>                 return;
>
>         /* Make sure to select at least one CPU other than the current CPU. */
> -       cpu = cpumask_first(cpu_online_mask);
> -       if (cpu == smp_processor_id())
> -               cpu = cpumask_next(cpu, cpu_online_mask);
> +       cpu = cpumask_any_but(cpu_online_mask, smp_processor_id());
>         if (WARN_ON_ONCE(cpu >= nr_cpu_ids))
>                 return;
>         cpumask_set_cpu(cpu, &cpus_chosen);

Acked-by: John Stultz <jstultz@google.com>

Same nit comment from the other patch, just need to capitalize the
commit description in the subject.
  "clocksource: Fix opencoded..."

thanks
-john

[PATCH 1/2] clocksource: fix opencoded cpumask_any_but() in clocksource_verify_choose_cpus()
[PATCH 2/2] clocksource: fix opencoded cpumask_next_wrap()