mm/init: cpu_hotplug_init() must be initialized before SLAB (31950eb6) · Commits · 戴 / test

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 <sachinp@in.ibm.com> Tested-by:

James Bottomley <James.Bottomley@HansenPartnership.com> Tested-by:

Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/cpu.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -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);

		@@ -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)
		{
		}

init/main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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();

kernel/cpu.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -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

Admin message