Skip to content

Commit

Permalink
sched: domain sysctl fixes: do not crash on allocation failure
Browse files Browse the repository at this point in the history
Now that we are calling this at runtime, a more relaxed error path is
suggested.  If an allocation fails, we just register the partial table,
which will show empty directories.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Milton Miller authored and Ingo Molnar committed Oct 15, 2007
1 parent 6382bc9 commit ad1cdc1
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -5245,8 +5245,6 @@ static struct ctl_table *sd_alloc_ctl_entry(int n)
struct ctl_table *entry =
kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);

BUG_ON(!entry);

return entry;
}

Expand Down Expand Up @@ -5279,6 +5277,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
{
struct ctl_table *table = sd_alloc_ctl_entry(12);

if (table == NULL)
return NULL;

set_table_entry(&table[0], "min_interval", &sd->min_interval,
sizeof(long), 0644, proc_doulongvec_minmax);
set_table_entry(&table[1], "max_interval", &sd->max_interval,
Expand Down Expand Up @@ -5316,6 +5317,8 @@ static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
for_each_domain(cpu, sd)
domain_num++;
entry = table = sd_alloc_ctl_entry(domain_num + 1);
if (table == NULL)
return NULL;

i = 0;
for_each_domain(cpu, sd) {
Expand All @@ -5336,6 +5339,9 @@ static void register_sched_domain_sysctl(void)
struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
char buf[32];

if (entry == NULL)
return;

sd_ctl_dir[0].child = entry;

for_each_online_cpu(i) {
Expand Down

0 comments on commit ad1cdc1

Please sign in to comment.