[PATCH] timers/migration: turn tmigr_hierarchy level_list into a flexible array

[Rosen Penev <rosenp@gmail.com>]

level_list was kzalloc_objs()'d separately right after the parent
struct, with the count (tmigr_hierarchy_levels, a module-static set
during init) trivially available before the parent allocation.  Move
level_list to the struct tail as a flexible array member and fold the
two allocations into a single kzalloc_flex().

The cpumask sub-allocation has variable size from cpumask_size() and
stays separate; with level_list gone the err label collapses into a
short inline cleanup.

Assisted-by: Claude:Opus-4.7
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 kernel/time/timer_migration.c | 16 +++++-----------
 kernel/time/timer_migration.h |  5 ++---
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 25e3c563eb74..daaf6c91eead 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1925,17 +1925,15 @@ static struct tmigr_hierarchy *tmigr_get_hierarchy(unsigned int capacity)
 	if (hier)
 		return hier;
 
-	hier = kzalloc(sizeof(*hier), GFP_KERNEL);
+	hier = kzalloc_flex(*hier, level_list, tmigr_hierarchy_levels);
 	if (!hier)
 		return ERR_PTR(-ENOMEM);
 
 	hier->cpumask = kzalloc(cpumask_size(), GFP_KERNEL);
-	if (!hier->cpumask)
-		goto err;
-
-	hier->level_list = kzalloc_objs(struct list_head, tmigr_hierarchy_levels);
-	if (!hier->level_list)
-		goto err;
+	if (!hier->cpumask) {
+		kfree(hier);
+		return ERR_PTR(-ENOMEM);
+	}
 
 	for (int i = 0; i < tmigr_hierarchy_levels; i++)
 		INIT_LIST_HEAD(&hier->level_list[i]);
@@ -1944,10 +1942,6 @@ static struct tmigr_hierarchy *tmigr_get_hierarchy(unsigned int capacity)
 	list_add_tail(&hier->node, &tmigr_hierarchy_list);
 
 	return hier;
-err:
-	kfree(hier->cpumask);
-	kfree(hier);
-	return ERR_PTR(-ENOMEM);
 }
 
 static int tmigr_connect_old_root(struct tmigr_hierarchy *hier, int cpu,
diff --git a/kernel/time/timer_migration.h b/kernel/time/timer_migration.h
index 291bfb6adfc3..c75e31a644e1 100644
--- a/kernel/time/timer_migration.h
+++ b/kernel/time/timer_migration.h
@@ -9,19 +9,18 @@
  * struct tmigr_hierarchy - a hierarchy associated to a given CPU capacity.
  *                          Homogeneous systems have only one hierarchy.
  *                          Heterogenous have one hierarchy per CPU capacity.
- * @level_list:	Per level lists of tmigr groups
  * @cpumask:	CPUs belonging to this hierarchy
  * @root:	The current root of the hierarchy
  * @capacity:	CPU capacity associated to this hierarchy
  * @node:	Node in the global hierarchy list
+ * @level_list:	Per level lists of tmigr groups
  */
 struct tmigr_hierarchy {
-	struct list_head	*level_list;
 	struct cpumask		*cpumask;
 	struct tmigr_group	*root;
 	unsigned long		capacity;
 	struct list_head	node;
-
+	struct list_head	level_list[];
 };
 
 /**
-- 
2.54.0