Commit de2d9445 authored by Tejun Heo's avatar Tejun Heo Committed by Ingo Molnar
Browse files

x86: Unify node_to_cpumask_map handling between 32 and 64bit 



x86_32 has been managing node_to_cpumask_map explicitly from
map_cpu_to_node() and friends in a rather ugly way.  With
previous changes, it's now possible to share the code with
64bit.

* When CONFIG_NUMA_EMU is disabled, numa_add/remove_cpu() are
  implemented in numa.c and shared by 32 and 64bit.  CONFIG_NUMA_EMU
  versions still live in numa_64.c.

  NUMA_EMU's dependency on 64bit is planned to be removed and the
  above should go away together.

* identify_cpu() now calls numa_add_cpu() for 32bit too.  This
  makes the explicit mask management from map_cpu_to_node() unnecessary.

* The whole x86_32 specific map_cpu_to_node() chunk is no longer
  necessary.  Dropped.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-16-git-send-email-tj@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: David Rientjes <rientjes@google.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
parent 645a7919

arch/x86/include/asm/numa.h

+9 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_NUMA_H

#define _ASM_X86_NUMA_H



#include <asm/topology.h>

#include <asm/apicdef.h>



#ifdef CONFIG_NUMA
@@ -33,9 +34,17 @@ static inline void set_apicid_to_node(int apicid, s16 node) 
#ifdef CONFIG_NUMA

extern void __cpuinit numa_set_node(int cpu, int node);

extern void __cpuinit numa_clear_node(int cpu);

extern void __cpuinit numa_add_cpu(int cpu);

extern void __cpuinit numa_remove_cpu(int cpu);

#else	/* CONFIG_NUMA */

static inline void numa_set_node(int cpu, int node)	{ }

static inline void numa_clear_node(int cpu)		{ }

static inline void numa_add_cpu(int cpu)		{ }

static inline void numa_remove_cpu(int cpu)		{ }

#endif	/* CONFIG_NUMA */



#ifdef CONFIG_DEBUG_PER_CPU_MAPS

struct cpumask __cpuinit *debug_cpumask_set_cpu(int cpu, int enable);

#endif



#endif	/* _ASM_X86_NUMA_H */

arch/x86/include/asm/numa_32.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
extern int numa_off;



extern int pxm_to_nid(int pxm);

extern void numa_remove_cpu(int cpu);



#ifdef CONFIG_NUMA

extern int __cpuinit numa_cpu_node(int apicid);

arch/x86/include/asm/numa_64.h

+0 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ extern void setup_node_bootmem(int nodeid, unsigned long start, 


extern void __init init_cpu_to_node(void);

extern int __cpuinit numa_cpu_node(int cpu);

extern void __cpuinit numa_add_cpu(int cpu);

extern void __cpuinit numa_remove_cpu(int cpu);



#ifdef CONFIG_NUMA_EMU

#define FAKE_NODE_MIN_SIZE	((u64)32 << 20)
@@ -41,8 +39,6 @@ void numa_emu_cmdline(char *); 
#else

static inline void init_cpu_to_node(void)		{ }

static inline int numa_cpu_node(int cpu)		{ return NUMA_NO_NODE; }

static inline void numa_add_cpu(int cpu, int node)	{ }

static inline void numa_remove_cpu(int cpu)		{ }

#endif



#endif /* _ASM_X86_NUMA_64_H */

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) 


	select_idle_routine(c);



#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)

#ifdef CONFIG_NUMA

	numa_add_cpu(smp_processor_id());

#endif

}

arch/x86/kernel/smpboot.c

+0 −47
Original line number Diff line number Diff line
@@ -132,49 +132,6 @@ EXPORT_PER_CPU_SYMBOL(cpu_info); 


atomic_t init_deasserted;



#if defined(CONFIG_NUMA) && defined(CONFIG_X86_32)

/* set up a mapping between cpu and node. */

static void map_cpu_to_node(int cpu, int node)

{

	printk(KERN_INFO "Mapping cpu %d to node %d\n", cpu, node);

	cpumask_set_cpu(cpu, node_to_cpumask_map[node]);

}



/* undo a mapping between cpu and node. */

static void unmap_cpu_to_node(int cpu)

{

	int node;



	printk(KERN_INFO "Unmapping cpu %d from all nodes\n", cpu);

	for (node = 0; node < MAX_NUMNODES; node++)

		cpumask_clear_cpu(cpu, node_to_cpumask_map[node]);

}

#else /* !(CONFIG_NUMA && CONFIG_X86_32) */

#define map_cpu_to_node(cpu, node)	({})

#define unmap_cpu_to_node(cpu)	({})

#endif



#ifdef CONFIG_X86_32

static void map_cpu_to_logical_apicid(void)

{

	int cpu = smp_processor_id();

	int node;



	node = numa_cpu_node(cpu);

	if (!node_online(node))

		node = first_online_node;



	map_cpu_to_node(cpu, node);

}



void numa_remove_cpu(int cpu)

{

	unmap_cpu_to_node(cpu);

}

#else

#define map_cpu_to_logical_apicid()  do {} while (0)

#endif



/*

 * Report back to the Boot Processor.

 * Running on AP.
@@ -242,7 +199,6 @@ static void __cpuinit smp_callin(void) 
		apic->smp_callin_clear_local_apic();

	setup_local_APIC();

	end_local_APIC_setup();

	map_cpu_to_logical_apicid();



	/*

	 * Need to setup vector mappings before we enable interrupts.
@@ -943,7 +899,6 @@ static __init void disable_smp(void) 
		physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

	else

		physid_set_mask_of_physid(0, &phys_cpu_present_map);

	map_cpu_to_logical_apicid();

	cpumask_set_cpu(0, cpu_sibling_mask(0));

	cpumask_set_cpu(0, cpu_core_mask(0));

}
@@ -1120,8 +1075,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 


	end_local_APIC_setup();



	map_cpu_to_logical_apicid();



	if (apic->setup_portio_remap)

		apic->setup_portio_remap();

CRA Git | Maintained and supported by SUSTech CRA and CCSE