Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421c7ce6 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Allocate cpu local data for all possible CPUs 



CPU hotplug fills up the possible map to NR_CPUs, but it did that after
setting up per CPU data. This lead to CPU data not getting allocated
for all possible CPUs, which lead to various side effects.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af74c3a6

arch/x86_64/kernel/setup64.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,10 @@ void __init setup_per_cpu_areas(void) 
	int i;

	int i;

	unsigned long size;

	unsigned long size;





#ifdef CONFIG_HOTPLUG_CPU

	prefill_possible_map();

#endif



	/* Copy section for each CPU (we discard the original) */

	/* Copy section for each CPU (we discard the original) */

	size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);

	size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);

#ifdef CONFIG_MODULES

#ifdef CONFIG_MODULES

arch/x86_64/kernel/smpboot.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -892,7 +892,7 @@ static __init void disable_smp(void) 
 * those NR_CPUS, hence cpu_possible_map represents entire NR_CPUS range.

 * those NR_CPUS, hence cpu_possible_map represents entire NR_CPUS range.

 * - Ashok Raj

 * - Ashok Raj

 */

 */

static void prefill_possible_map(void)

__init void prefill_possible_map(void)

{

{

	int i;

	int i;

	for (i = 0; i < NR_CPUS; i++)

	for (i = 0; i < NR_CPUS; i++)
@@ -967,10 +967,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	current_cpu_data = boot_cpu_data;

	current_cpu_data = boot_cpu_data;

	current_thread_info()->cpu = 0;  /* needed? */

	current_thread_info()->cpu = 0;  /* needed? */





#ifdef CONFIG_HOTPLUG_CPU

	prefill_possible_map();

#endif



	if (smp_sanity_check(max_cpus) < 0) {

	if (smp_sanity_check(max_cpus) < 0) {

		printk(KERN_INFO "SMP disabled\n");

		printk(KERN_INFO "SMP disabled\n");

		disable_smp();

		disable_smp();

include/asm-x86_64/smp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ static inline int hard_smp_processor_id(void) 
extern int safe_smp_processor_id(void);

extern int safe_smp_processor_id(void);

extern int __cpu_disable(void);

extern int __cpu_disable(void);

extern void __cpu_die(unsigned int cpu);

extern void __cpu_die(unsigned int cpu);

extern void prefill_possible_map(void);





#endif /* !ASSEMBLY */

#endif /* !ASSEMBLY */