Skip to content

Commit

Permalink
mm/init: cpu_hotplug_init() must be initialized before SLAB
Browse files Browse the repository at this point in the history
SLAB uses get/put_online_cpus() which use a mutex which is itself only
initialized when cpu_hotplug_init() is called.  Currently we hang suring
boot in SLAB due to doing that too late.

Reported by James Bottomley and Sachin Sant (and possibly others).
Debugged by Benjamin Herrenschmidt.

This just removes the dynamic initialization of the data structures, and
replaces it with a static one, avoiding this dependency entirely, and
removing one unnecessary special initcall.

Tested-by: Sachin Sant <[email protected]>
Tested-by: James Bottomley <[email protected]>
Tested-by: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
torvalds committed Jun 23, 2009
1 parent ac1b7c3 commit 31950eb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
5 changes: 0 additions & 5 deletions include/linux/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb)

int cpu_up(unsigned int cpu);
void notify_cpu_starting(unsigned int cpu);
extern void cpu_hotplug_init(void);
extern void cpu_maps_update_begin(void);
extern void cpu_maps_update_done(void);

Expand All @@ -84,10 +83,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}

static inline void cpu_hotplug_init(void)
{
}

static inline void cpu_maps_update_begin(void)
{
}
Expand Down
1 change: 0 additions & 1 deletion init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,6 @@ asmlinkage void __init start_kernel(void)
#endif
page_cgroup_init();
enable_debug_pagealloc();
cpu_hotplug_init();
kmemtrace_init();
kmemleak_init();
debug_objects_mem_init();
Expand Down
13 changes: 5 additions & 8 deletions kernel/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,11 @@ static struct {
* an ongoing cpu hotplug operation.
*/
int refcount;
} cpu_hotplug;

void __init cpu_hotplug_init(void)
{
cpu_hotplug.active_writer = NULL;
mutex_init(&cpu_hotplug.lock);
cpu_hotplug.refcount = 0;
}
} cpu_hotplug = {
.active_writer = NULL,
.lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
.refcount = 0,
};

#ifdef CONFIG_HOTPLUG_CPU

Expand Down

0 comments on commit 31950eb

Please sign in to comment.