sched: Simplify __sched_init runtime checks
PATCH v2 1/1 sched: Simplify __sched_init runtime checks
Improve runtime checks in __sched_init(void) by replacing if conditional checks with preprocessor directives.
Signed-off-by Chun-Hung Tseng <[email protected]>
--- kernel/sched/core.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
kernel/sched/core.c +15 -14
@@ -9308,28 +9308,29 @@ void __init sched_init(void)#ifdef CONFIG_RT_GROUP_SCHED ptr +=2 * nr_cpu_ids *sizeof (void **);#endif -if (ptr) { - ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT ); + +#if defined(CONFIG_FAIR_GROUP_SCHED ) || defined(CONFIG_RT_GROUP_SCHED ) + ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT );#ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.se = (struct sched_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.se = (struct sched_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.cfs_rq = (struct cfs_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.cfs_rq = (struct cfs_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.shares =ROOT_TASK_GROUP_LOAD ; -init_cfs_bandwidth (&root_task_group.cfs_bandwidth); + root_task_group.shares =ROOT_TASK_GROUP_LOAD ; +init_cfs_bandwidth (&root_task_group.cfs_bandwidth);#endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - root_task_group.rt_se = (struct sched_rt_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); - - root_task_group.rt_rq = (struct rt_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_se = (struct sched_rt_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_rq = (struct rt_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **);#endif /* CONFIG_RT_GROUP_SCHED */ - } +#endif /* CONFIG_FAIR_GROUP_SCHED || CONFIG_RT_GROUP_SCHED */ +#ifdef CONFIG_CPUMASK_OFFSTACK for_each_possible_cpu (i) { per_cpu(load_balance_mask, i) = (cpumask_var_t)kzalloc_node(
Signature · 1 line
2.34.1
Improve runtime checks in __sched_init(void) by replacing if conditional checks with preprocessor directives.
Signed-off-by Chun-Hung Tseng <[email protected]>
Signed-off-by Huichun Feng <[email protected]>
--- kernel/sched/core.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
kernel/sched/core.c +15 -14
@@ -9308,28 +9308,29 @@ void __init sched_init(void)#ifdef CONFIG_RT_GROUP_SCHED ptr +=2 * nr_cpu_ids *sizeof (void **);#endif -if (ptr) { - ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT ); + +#if defined(CONFIG_FAIR_GROUP_SCHED ) || defined(CONFIG_RT_GROUP_SCHED ) + ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT );#ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.se = (struct sched_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.se = (struct sched_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.cfs_rq = (struct cfs_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.cfs_rq = (struct cfs_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.shares =ROOT_TASK_GROUP_LOAD ; -init_cfs_bandwidth (&root_task_group.cfs_bandwidth); + root_task_group.shares =ROOT_TASK_GROUP_LOAD ; +init_cfs_bandwidth (&root_task_group.cfs_bandwidth);#endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - root_task_group.rt_se = (struct sched_rt_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); - - root_task_group.rt_rq = (struct rt_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_se = (struct sched_rt_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_rq = (struct rt_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **);#endif /* CONFIG_RT_GROUP_SCHED */ - } +#endif /* CONFIG_FAIR_GROUP_SCHED || CONFIG_RT_GROUP_SCHED */ +#ifdef CONFIG_CPUMASK_OFFSTACK for_each_possible_cpu (i) { per_cpu(load_balance_mask, i) = (cpumask_var_t)kzalloc_node(
Signature · 1 line
2.34.1
Quoted 5 lines · Chun-Hung Tseng
Improve runtime checks in
__sched_init(void)by replacing if conditional checks with preprocessor directives.Signed-off-by Chun-Hung Tseng <[email protected]>
Sorry, I didn't reply properly.
Signed-off-by Huichun Feng <[email protected]>
Quoted 54 lines
--- kernel/sched/core.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)kernel/sched/core.c +15
-15@@ -9308,28 +9308,29 @@ void __init sched_init(void)#ifdef CONFIG_RT_GROUP_SCHED ptr +=2 * nr_cpu_ids *sizeof (void **);#endif -if (ptr) { - ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT ); + +#if defined(CONFIG_FAIR_GROUP_SCHED ) || defined(CONFIG_RT_GROUP_SCHED ) + ptr = (unsigned long )kzalloc (ptr,GFP_NOWAIT );#ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.se = (struct sched_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.se = (struct sched_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.cfs_rq = (struct cfs_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.cfs_rq = (struct cfs_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **); - root_task_group.shares =ROOT_TASK_GROUP_LOAD ; -init_cfs_bandwidth (&root_task_group.cfs_bandwidth); + root_task_group.shares =ROOT_TASK_GROUP_LOAD ; +init_cfs_bandwidth (&root_task_group.cfs_bandwidth);#endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - root_task_group.rt_se = (struct sched_rt_entity **)ptr; - ptr += nr_cpu_ids *sizeof (void **); - - root_task_group.rt_rq = (struct rt_rq **)ptr; - ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_se = (struct sched_rt_entity **)ptr; + ptr += nr_cpu_ids *sizeof (void **); + root_task_group.rt_rq = (struct rt_rq **)ptr; + ptr += nr_cpu_ids *sizeof (void **);#endif /* CONFIG_RT_GROUP_SCHED */ - } +#endif /* CONFIG_FAIR_GROUP_SCHED || CONFIG_RT_GROUP_SCHED */ +#ifdef CONFIG_CPUMASK_OFFSTACK for_each_possible_cpu (i) { per_cpu(load_balance_mask, i) = (cpumask_var_t)kzalloc_node( --2.34.1