| title: | patch sched fix isolcpus boot option patch ad |
|
This is a note to let you know that we have just queued up the patch titled
Subject: sched: Fix isolcpus boot option
to the 2.6.32-stable tree. Its filename is
sched-fix-isolcpus-boot-option.patch
A git repo of this tree can be found at
rel="nofollow" www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
From bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@xxxxxxxxxxxxxxx
Date: Wed, 2 Dec 2009 14:09:16 +1030
Subject: sched: Fix isolcpus boot option
From: Rusty Russell <rusty@xxxxxxxxxxxxxxx
commit bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 upstream.
Anton Blanchard wrote:
We allocate and zero cpu_isolated_map after the isolcpus
__setup option has run. This means cpu_isolated_map always
ends up empty and if CPUMASK_OFFSTACK is enabled we write to a
cpumask that hasnt been allocated.
I introduced this regression in 49557e620339cb13 (sched: Fix
boot crash by zalloc()ing most of the cpu masks).
Use the bootmem allocator if they set isolcpus=, otherwise
allocate and zero like normal.
Reported-by: Anton Blanchard <anton@xxxxxxxxx
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx
Cc: peterz@xxxxxxxxxxxxx
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx
Cc: <stable@xxxxxxxxxx
LKML-Reference: <200912021409.17013.rusty@xxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx
Tested-by: Anton Blanchard <anton@xxxxxxxxx
---
kernel/sched.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8061,6 +8061,7 @@ static cpumask_var_t cpu_isolated_map;
/* Setup the mask of cpus configured for isolated domains */
static int __init isolated_cpu_setup(char *str)
{
+ alloc_bootmem_cpumask_var(&cpu_isolated_map);
cpulist_parse(str, cpu_isolated_map);
return 1;
}
@@ -9591,7 +9592,9 @@ void __init sched_init(void)
zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
#endif
- zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
+ /* May be allocated at isolcpus cmdline parse time */
+ if (cpu_isolated_map == NULL)
+ zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
#endif /* SMP */
perf_event_init();
Patches currently in stable-queue which might be from rusty@xxxxxxxxxxxxxxx are
queue-2.6.32/sched-fix-isolcpus-boot-option.patch
queue-2.6.32/timers-init-limit-the-number-of-per-cpu-calibration-bootup-messages.patch
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at rel="nofollow" vger.kernel.org/majordomo-info.html vger.kernel.org/majordomo-info.html
|
