Skip to content

Commit a048ca5

Browse files
glemcoKAGA-KOKO
authored andcommitted
timers/migration: Add mask for CPUs available in the hierarchy
Keep track of the CPUs available for timer migration in a cpumask. This prepares the ground to generalise the concept of unavailable CPUs. Signed-off-by: Gabriele Monaco <gmonaco@redhat.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Link: https://patch.msgid.link/20251120145653.296659-3-gmonaco@redhat.com
1 parent 8312cab commit a048ca5

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

kernel/time/timer_migration.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,12 @@ static struct tmigr_group *tmigr_root;
424424

425425
static DEFINE_PER_CPU(struct tmigr_cpu, tmigr_cpu);
426426

427+
/*
428+
* CPUs available for timer migration.
429+
* Protected by cpuset_mutex (with cpus_read_lock held) or cpus_write_lock.
430+
*/
431+
static cpumask_var_t tmigr_available_cpumask;
432+
427433
#define TMIGR_NONE 0xFF
428434
#define BIT_CNT 8
429435

@@ -1433,6 +1439,7 @@ static int tmigr_clear_cpu_available(unsigned int cpu)
14331439
int migrator;
14341440
u64 firstexp;
14351441

1442+
cpumask_clear_cpu(cpu, tmigr_available_cpumask);
14361443
raw_spin_lock_irq(&tmc->lock);
14371444
tmc->available = false;
14381445
WRITE_ONCE(tmc->wakeup, KTIME_MAX);
@@ -1446,7 +1453,7 @@ static int tmigr_clear_cpu_available(unsigned int cpu)
14461453
raw_spin_unlock_irq(&tmc->lock);
14471454

14481455
if (firstexp != KTIME_MAX) {
1449-
migrator = cpumask_any_but(cpu_online_mask, cpu);
1456+
migrator = cpumask_any(tmigr_available_cpumask);
14501457
work_on_cpu(migrator, tmigr_trigger_active, NULL);
14511458
}
14521459

@@ -1461,6 +1468,7 @@ static int tmigr_set_cpu_available(unsigned int cpu)
14611468
if (WARN_ON_ONCE(!tmc->tmgroup))
14621469
return -EINVAL;
14631470

1471+
cpumask_set_cpu(cpu, tmigr_available_cpumask);
14641472
raw_spin_lock_irq(&tmc->lock);
14651473
trace_tmigr_cpu_available(tmc);
14661474
tmc->idle = timer_base_is_idle();
@@ -1805,6 +1813,11 @@ static int __init tmigr_init(void)
18051813
if (ncpus == 1)
18061814
return 0;
18071815

1816+
if (!zalloc_cpumask_var(&tmigr_available_cpumask, GFP_KERNEL)) {
1817+
ret = -ENOMEM;
1818+
goto err;
1819+
}
1820+
18081821
/*
18091822
* Calculate the required hierarchy levels. Unfortunately there is no
18101823
* reliable information available, unless all possible CPUs have been

0 commit comments

Comments
 (0)