smpboot: introduce SDTL_INIT() helper to tidy sched topology setup
Define a small SDTL_INIT(maskfn, flagsfn, name) macro and use it to build the sched_domain_topology_level array. Purely a cleanup; behaviour is unchanged. Suggested-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Li Chen <chenl311@chinatelecom.cn> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: K Prateek Nayak <kprateek.nayak@amd.com> Tested-by: K Prateek Nayak <kprateek.nayak@amd.com> Link: https://lore.kernel.org/r/20250710105715.66594-2-me@linux.beauty
This commit is contained in:
+8
-16
@@ -1737,17 +1737,17 @@ sd_init(struct sched_domain_topology_level *tl,
|
||||
*/
|
||||
static struct sched_domain_topology_level default_topology[] = {
|
||||
#ifdef CONFIG_SCHED_SMT
|
||||
{ cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },
|
||||
SDTL_INIT(cpu_smt_mask, cpu_smt_flags, SMT),
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SCHED_CLUSTER
|
||||
{ cpu_clustergroup_mask, cpu_cluster_flags, SD_INIT_NAME(CLS) },
|
||||
SDTL_INIT(cpu_clustergroup_mask, cpu_cluster_flags, CLS),
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SCHED_MC
|
||||
{ cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) },
|
||||
SDTL_INIT(cpu_coregroup_mask, cpu_core_flags, MC),
|
||||
#endif
|
||||
{ cpu_cpu_mask, SD_INIT_NAME(PKG) },
|
||||
SDTL_INIT(cpu_cpu_mask, NULL, PKG),
|
||||
{ NULL, },
|
||||
};
|
||||
|
||||
@@ -2008,23 +2008,15 @@ void sched_init_numa(int offline_node)
|
||||
/*
|
||||
* Add the NUMA identity distance, aka single NODE.
|
||||
*/
|
||||
tl[i++] = (struct sched_domain_topology_level){
|
||||
.mask = sd_numa_mask,
|
||||
.numa_level = 0,
|
||||
SD_INIT_NAME(NODE)
|
||||
};
|
||||
tl[i++] = SDTL_INIT(sd_numa_mask, NULL, NODE);
|
||||
|
||||
/*
|
||||
* .. and append 'j' levels of NUMA goodness.
|
||||
*/
|
||||
for (j = 1; j < nr_levels; i++, j++) {
|
||||
tl[i] = (struct sched_domain_topology_level){
|
||||
.mask = sd_numa_mask,
|
||||
.sd_flags = cpu_numa_flags,
|
||||
.flags = SDTL_OVERLAP,
|
||||
.numa_level = j,
|
||||
SD_INIT_NAME(NUMA)
|
||||
};
|
||||
tl[i] = SDTL_INIT(sd_numa_mask, cpu_numa_flags, NUMA);
|
||||
tl[i].numa_level = j;
|
||||
tl[i].flags = SDTL_OVERLAP;
|
||||
}
|
||||
|
||||
sched_domain_topology_saved = sched_domain_topology;
|
||||
|
||||
Reference in New Issue
Block a user