sched_domain: Allocate sched_group structures dynamically
PATCH 4/4 sched_domain: Allocate sched_group structures dynamically
As explained here:
http://marc.theaimsgroup.com/?l=linux-kernel&m=114327539012323&w=2
there is a problem with sharing sched_group structures between two different sched_domains. This patch overcomes the problem by allocating separate sched_group structures for different sched_domains.
The patch has been tested and found to avoid the kernel lockup problem described in above URL.
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +43 -5
@@ -5988,7 +5988,7 @@ static int cpu_to_cpu_group(int cpu)#ifdef CONFIG_SCHED_MC static DEFINE_PER_CPU(struct sched_domain, core_domains); -static struct sched_group sched_group_core[NR_CPUS ]; +static struct sched_group *sched_group_core_bycpu[NR_CPUS ];#endif #if defined(CONFIG_SCHED_MC ) && defined(CONFIG_SCHED_SMT )
@@ -6004,7 +6004,7 @@ static int cpu_to_core_group(int cpu)#endif static DEFINE_PER_CPU(struct sched_domain, phys_domains); -static struct sched_group sched_group_phys[NR_CPUS ]; +static struct sched_group *sched_group_phys_bycpu[NR_CPUS ];static int cpu_to_phys_group (int cpu) {#if defined(CONFIG_SCHED_MC )
@@ -6064,9 +6064,9 @@ next_sg:/* Free memory allocated for various sched_group structures */ static void free_sched_groups (const cpumask_t *cpu_map) { +int cpu;#ifdef CONFIG_NUMA int i; -int cpu;for_each_cpu_mask (cpu, *cpu_map) {struct sched_group *sched_group_allnodes
@@ -6104,6 +6104,18 @@ next_sg: sched_group_nodes_bycpu[cpu] = NULL; }#endif +for_each_cpu_mask (cpu, *cpu_map) { +if (sched_group_phys_bycpu[cpu]) { +kfree (sched_group_phys_bycpu[cpu]); + sched_group_phys_bycpu[cpu] =NULL ; + } +#ifdef CONFIG_SCHED_MC +if (sched_group_core_bycpu[cpu]) { +kfree (sched_group_core_bycpu[cpu]); + sched_group_core_bycpu[cpu] =NULL ; + } +#endif + } }/*
@@ -6113,6 +6125,10 @@ next_sg:static int build_sched_domains (const cpumask_t *cpu_map) {int i; +struct sched_group *sched_group_phys =NULL ; +#ifdef CONFIG_SCHED_MC +struct sched_group *sched_group_core =NULL ; +#endif #ifdef CONFIG_NUMA struct sched_group **sched_group_nodes =NULL ;struct sched_group *sched_group_allnodes =NULL ;
@@ -6171,6 +6187,18 @@ static int build_sched_domains(const cpucpus_and (sd->span, sd->span, *cpu_map);#endif +if (!sched_group_phys) { + sched_group_phys + =kmalloc (sizeof (struct sched_group ) *NR_CPUS , +GFP_KERNEL ); +if (!sched_group_phys) { +printk (KERN_WARNING "Can not alloc phys sched" +"group\n" ); + goto error; + } + sched_group_phys_bycpu[i] = sched_group_phys; + } + p = sd; sd = &per_cpu (phys_domains, i); group =cpu_to_phys_group (i);
@@ -6180,6 +6208,18 @@ static int build_sched_domains(const cpu sd->groups = &sched_group_phys[group];#ifdef CONFIG_SCHED_MC +if (!sched_group_core) { + sched_group_core + =kmalloc (sizeof (struct sched_group ) *NR_CPUS , +GFP_KERNEL ); +if (!sched_group_core) { +printk (KERN_WARNING "Can not alloc core sched" +"group\n" ); + goto error; + } + sched_group_core_bycpu[i] = sched_group_core; + } + p = sd; sd = &per_cpu (core_domains, i); group =cpu_to_core_group (i);
@@ -6375,11 +6415,9 @@ static int build_sched_domains(const cpureturn 0 ; -#ifdef CONFIG_NUMA error:free_sched_groups (cpu_map);return -ENOMEM ; -#endif }/* * Set up scheduler domains and groups. Callers must hold the hotplug lock.
_
Signature · 2 lines
Regards, vatsa
Quoted 17 lines · Srivatsa Vaddagiri
/*
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +5
-0@@ -6113,6 +6125,10 @@ next_sg:static int build_sched_domains (const cpumask_t *cpu_map) {int i; +struct sched_group *sched_group_phys =NULL ; +#ifdef CONFIG_SCHED_MC +struct sched_group *sched_group_core =NULL ; +#endif #ifdef CONFIG_NUMA struct sched_group **sched_group_nodes =NULL ;struct sched_group *sched_group_allnodes =NULL ;@@ -6171,6 +6187,18 @@ static int build_sched_domains(const cpucpus_and (sd->span, sd->span, *cpu_map);#endif +if (!sched_group_phys) {
kernel/sched.c static int build_sched_domains(const cpu · line 6200
Quoted 10 lines
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +10
-0+ sched_group_phys + =kmalloc (sizeof (struct sched_group ) *NR_CPUS , +GFP_KERNEL ); +if (!sched_group_phys) { +printk (KERN_WARNING "Can not alloc phys sched" +"group\n" ); + goto error; + } + sched_group_phys_bycpu[i] = sched_group_phys; + }
Doesn't the last assignment have to be outside the if statement?
Hmm.. this design seems like the best way to go for now. Suresh?
Signature · 2 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com
Quoted 17 lines · Nick Piggin
Quoted 9 lines · Srivatsa Vaddagiri
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +3
-0+if (!sched_group_phys) { + sched_group_phys + = kmalloc(sizeof(struct sched_group) *
NR_CPUS,kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +3
-0+ GFP_KERNEL); + if (!sched_group_phys) { + printk (KERN_WARNING "Can not alloc physsched"
kernel/sched.c static int build_sched_domains(const cpu · line 6200
Quoted 5 lines
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +5
-0+ "group\n"); + goto error; + } + sched_group_phys_bycpu[i] = sched_group_phys; + }Doesn't the last assignment have to be outside the if statement?
I dont think so. The assignment can happen once (when we allocate successfully) and not every time in the for loop?
Signature · 2 lines
Regards, vatsa
Quoted 21 lines · Srivatsa Vaddagiri
Quoted 17 lines · Nick Piggin
kernel/sched.c static int build_sched_domains(const cpu · line 6200
Quoted 13 lines · Srivatsa Vaddagiri
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +3
-0+if (!sched_group_phys) { + sched_group_phys + = kmalloc(sizeof(struct sched_group) *
NR_CPUS,kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +3
-0+ GFP_KERNEL); + if (!sched_group_phys) { + printk (KERN_WARNING "Can not alloc physsched"
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +5
-0+ "group\n"); + goto error; + } + sched_group_phys_bycpu[i] = sched_group_phys; + }Doesn't the last assignment have to be outside the if statement?
Quoted 3 lines
I dont think so. The assignment can happen once (when we allocate successfully) and not every time in the for loop?
Then after you have allocated sched_group_phys, subsequent cpus in cpu_map will have their sched_group_phys_bycpu[] entry uninitialised, by the looks?
Signature · 2 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com
Quoted 3 lines · Nick Piggin
Then after you have allocated
sched_group_phys, subsequent cpus incpu_mapwill have their sched_group_phys_bycpu[] entry uninitialised, by the looks?
Not all the CPUs in cpu_map need to have an entry in sched_group_phys_bycpu[]. sched_group_phys_bycpu[] is purely used to "remember" the chunk of memory we allocated for sched_group array for later freeing. Individual CPU's in cpu_map point to a suitable entry in the sched_group array (thr' their phys_domains structure), as in the following lines of code after memory allocation:
sd = &per_cpu(phys_domains, i); ... sd->groups = &sched_group_phys[group];
Hope this clarifies!
Signature · 2 lines
Regards, vatsa
Quoted 32 lines · Nick Piggin
Quoted 17 lines · Srivatsa Vaddagiri
/*
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +5
-0@@ -6113,6 +6125,10 @@ next_sg:static int build_sched_domains (const cpumask_t *cpu_map) {int i; +struct sched_group *sched_group_phys =NULL ; +#ifdef CONFIG_SCHED_MC +struct sched_group *sched_group_core =NULL ; +#endif #ifdef CONFIG_NUMA struct sched_group **sched_group_nodes =NULL ;struct sched_group *sched_group_allnodes =NULL ;@@ -6171,6 +6187,18 @@ static int build_sched_domains(const cpucpus_and (sd->span, sd->span, *cpu_map);#endif +if (!sched_group_phys) {kernel/sched.c static int build_sched_domains(const cpu · line 6200
Quoted 10 lines
kernel/sched.c renamed from kernel/sched.c~sd_dynschedgroup +10
-0+ sched_group_phys + =kmalloc (sizeof (struct sched_group ) *NR_CPUS , +GFP_KERNEL ); +if (!sched_group_phys) { +printk (KERN_WARNING "Can not alloc phys sched" +"group\n" ); + goto error; + } + sched_group_phys_bycpu[i] = sched_group_phys; + }Doesn't the last assignment have to be outside the if statement?
Quoted 1 line
Hmm.. this design seems like the best way to go for now. Suresh?
Only thing I see in this is, even if there are very few cpus in the exclusive cpuset, we end up allocating NR_CPUS groups and waste memory.
thanks,
suresh
Quoted 2 lines · Suresh B
Only thing I see in this is, even if there are very few cpus in the exclusive cpuset, we end up allocating
NR_CPUSgroups and waste memory.
I had realized that, but used NR_CPUS just to keep it simple (as is being done in the case of NUMA - where they simply allocate for MAX_NODES). I can take a shot at optimizing the memory allocation size (for NUMA as well) and send another patch later, if people think so.
Signature · 2 lines
Regards, vatsa