7a6c654782
The cpu<->node mappings under CONFIG_DEBUG_PER_CPU_MAPS=y when NUMA emulation is enabled is currently broken because it does not iterate through every emulated node and bind cpus that have affinity to it. NUMA emulation should bind each cpu to every local node to accurately represent the true NUMA topology of the underlying machine. debug_cpumask_set_cpu() needs to be fixed at the same time so that the debugging information that it emits shows the new cpumask of the node being assigned when the cpu is being added or removed. It can now take responsibility of setting or clearing the cpu itself to remove the need for duplicate code. Also change its last parameter, "enable", to have the correct bool type since it can only be true or false. -v2: Fix the return statements, by Kosaki Motohiro Acked-and-Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: Andreas Herrmann <herrmann.der.user@googlemail.com> Cc: Tejun Heo <tj@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1104201918470.12634@chino.kir.corp.google.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
58 lines
1.5 KiB
C
58 lines
1.5 KiB
C
#ifndef _ASM_X86_NUMA_H
|
|
#define _ASM_X86_NUMA_H
|
|
|
|
#include <asm/topology.h>
|
|
#include <asm/apicdef.h>
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
|
|
|
|
/*
|
|
* __apicid_to_node[] stores the raw mapping between physical apicid and
|
|
* node and is used to initialize cpu_to_node mapping.
|
|
*
|
|
* The mapping may be overridden by apic->numa_cpu_node() on 32bit and thus
|
|
* should be accessed by the accessors - set_apicid_to_node() and
|
|
* numa_cpu_node().
|
|
*/
|
|
extern s16 __apicid_to_node[MAX_LOCAL_APIC];
|
|
|
|
static inline void set_apicid_to_node(int apicid, s16 node)
|
|
{
|
|
__apicid_to_node[apicid] = node;
|
|
}
|
|
#else /* CONFIG_NUMA */
|
|
static inline void set_apicid_to_node(int apicid, s16 node)
|
|
{
|
|
}
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#ifdef CONFIG_X86_32
|
|
# include "numa_32.h"
|
|
#else
|
|
# include "numa_64.h"
|
|
#endif
|
|
|
|
#ifdef CONFIG_NUMA
|
|
extern void __cpuinit numa_set_node(int cpu, int node);
|
|
extern void __cpuinit numa_clear_node(int cpu);
|
|
extern void __init numa_init_array(void);
|
|
extern void __init init_cpu_to_node(void);
|
|
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_init_array(void) { }
|
|
static inline void init_cpu_to_node(void) { }
|
|
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
|
|
void debug_cpumask_set_cpu(int cpu, int node, bool enable);
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_NUMA_H */
|