mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
timers/migration: Track CPUs in a hierarchy
When a new root is created, the old root is connected to it and propagates up its own assumed to be active state, since the hotplug control CPU is itself active and part of the old root. However with per-capacity hierarchies, this assumption won't be true anymore because the hotplug control CPU calling the timer migration prepare callback may not belong to the same hierarchy as the booting CPU. To solve this, track the available CPUs per hierarchies so that the root connection can be offlined to safe CPUs. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Link: https://patch.msgid.link/20260423165354.95152-4-frederic@kernel.org
This commit is contained in:
parent
ff65875f80
commit
3ba2548838
|
|
@ -1916,17 +1916,23 @@ static struct tmigr_hierarchy *tmigr_get_hierarchy(void)
|
|||
if (!hierarchy)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
hierarchy->cpumask = kzalloc(cpumask_size(), GFP_KERNEL);
|
||||
if (!hierarchy->cpumask)
|
||||
goto err;
|
||||
|
||||
hierarchy->level_list = kzalloc_objs(struct list_head, tmigr_hierarchy_levels);
|
||||
if (!hierarchy->level_list) {
|
||||
kfree(hierarchy);
|
||||
hierarchy = NULL;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
if (!hierarchy->level_list)
|
||||
goto err;
|
||||
|
||||
for (int i = 0; i < tmigr_hierarchy_levels; i++)
|
||||
INIT_LIST_HEAD(&hierarchy->level_list[i]);
|
||||
|
||||
return hierarchy;
|
||||
err:
|
||||
kfree(hierarchy->cpumask);
|
||||
kfree(hierarchy);
|
||||
hierarchy = NULL;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
static int tmigr_add_cpu(unsigned int cpu)
|
||||
|
|
@ -1946,8 +1952,11 @@ static int tmigr_add_cpu(unsigned int cpu)
|
|||
|
||||
ret = tmigr_setup_groups(hier, cpu, node, NULL, false);
|
||||
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* Root has changed? Connect the old one to the new */
|
||||
if (ret >= 0 && old_root && old_root != hier->root) {
|
||||
if (old_root && old_root != hier->root) {
|
||||
/*
|
||||
* The target CPU must never do the prepare work, except
|
||||
* on early boot when the boot CPU is the target. Otherwise
|
||||
|
|
@ -1964,6 +1973,9 @@ static int tmigr_add_cpu(unsigned int cpu)
|
|||
ret = tmigr_setup_groups(hier, -1, old_root->numa_node, old_root, true);
|
||||
}
|
||||
|
||||
if (ret >= 0)
|
||||
cpumask_set_cpu(cpu, hier->cpumask);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,12 @@
|
|||
/**
|
||||
* struct tmigr_hierarchy - a hierarchy associated to a given CPU capacity.
|
||||
* @level_list: Per level lists of tmigr groups
|
||||
* @cpumask: CPUs belonging to this hierarchy
|
||||
* @root: The current root of the hierarchy
|
||||
*/
|
||||
struct tmigr_hierarchy {
|
||||
struct list_head *level_list;
|
||||
struct cpumask *cpumask;
|
||||
struct tmigr_group *root;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user