2008-06-18 11:08:48 -04:00
|
|
|
#ifndef ASM_X86__NUMA_64_H
|
|
|
|
#define ASM_X86__NUMA_64_H
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
#include <linux/nodemask.h>
|
2007-10-17 12:04:32 -04:00
|
|
|
#include <asm/apicdef.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-03-25 10:29:12 -05:00
|
|
|
struct bootnode {
|
2008-03-23 04:02:55 -04:00
|
|
|
u64 start;
|
|
|
|
u64 end;
|
2005-04-16 18:20:36 -04:00
|
|
|
};
|
|
|
|
|
2008-03-25 13:14:35 -04:00
|
|
|
extern int compute_hash_shift(struct bootnode *nodes, int numblks,
|
|
|
|
int *nodeids);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
|
|
|
|
|
|
|
|
extern void numa_init_array(void);
|
|
|
|
extern int numa_off;
|
|
|
|
|
2006-04-07 13:49:18 -04:00
|
|
|
extern void srat_reserve_add_area(int nodeid);
|
|
|
|
extern int hotadd_percent;
|
2005-11-05 11:25:53 -05:00
|
|
|
|
2008-01-30 07:33:25 -05:00
|
|
|
extern s16 apicid_to_node[MAX_LOCAL_APIC];
|
2008-01-30 07:30:17 -05:00
|
|
|
|
|
|
|
extern unsigned long numa_free_all_bootmem(void);
|
|
|
|
extern void setup_node_bootmem(int nodeid, unsigned long start,
|
|
|
|
unsigned long end);
|
|
|
|
|
2006-01-11 16:45:36 -05:00
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
extern void __init init_cpu_to_node(void);
|
x86: cleanup early per cpu variables/accesses v4
* Introduce a new PER_CPU macro called "EARLY_PER_CPU". This is
used by some per_cpu variables that are initialized and accessed
before there are per_cpu areas allocated.
["Early" in respect to per_cpu variables is "earlier than the per_cpu
areas have been setup".]
This patchset adds these new macros:
DEFINE_EARLY_PER_CPU(_type, _name, _initvalue)
EXPORT_EARLY_PER_CPU_SYMBOL(_name)
DECLARE_EARLY_PER_CPU(_type, _name)
early_per_cpu_ptr(_name)
early_per_cpu_map(_name, _idx)
early_per_cpu(_name, _cpu)
The DEFINE macro defines the per_cpu variable as well as the early
map and pointer. It also initializes the per_cpu variable and map
elements to "_initvalue". The early_* macros provide access to
the initial map (usually setup during system init) and the early
pointer. This pointer is initialized to point to the early map
but is then NULL'ed when the actual per_cpu areas are setup. After
that the per_cpu variable is the correct access to the variable.
The early_per_cpu() macro is not very efficient but does show how to
access the variable if you have a function that can be called both
"early" and "late". It tests the early ptr to be NULL, and if not
then it's still valid. Otherwise, the per_cpu variable is used
instead:
#define early_per_cpu(_name, _cpu) \
(early_per_cpu_ptr(_name) ? \
early_per_cpu_ptr(_name)[_cpu] : \
per_cpu(_name, _cpu))
A better method is to actually check the pointer manually. In the
case below, numa_set_node can be called both "early" and "late":
void __cpuinit numa_set_node(int cpu, int node)
{
int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
if (cpu_to_node_map)
cpu_to_node_map[cpu] = node;
else
per_cpu(x86_cpu_to_node_map, cpu) = node;
}
* Add a flag "arch_provides_topology_pointers" that indicates pointers
to topology cpumask_t maps are available. Otherwise, use the function
returning the cpumask_t value. This is useful if cpumask_t set size
is very large to avoid copying data on to/off of the stack.
* The coverage of CONFIG_DEBUG_PER_CPU_MAPS has been increased while
the non-debug case has been optimized a bit.
* Remove an unreferenced compiler warning in drivers/base/topology.c
* Clean up #ifdef in setup.c
For inclusion into sched-devel/latest tree.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ sched-devel/latest .../mingo/linux-2.6-sched-devel.git
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-12 15:21:12 -04:00
|
|
|
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);
|
2006-01-11 16:45:36 -05:00
|
|
|
#else
|
x86: cleanup early per cpu variables/accesses v4
* Introduce a new PER_CPU macro called "EARLY_PER_CPU". This is
used by some per_cpu variables that are initialized and accessed
before there are per_cpu areas allocated.
["Early" in respect to per_cpu variables is "earlier than the per_cpu
areas have been setup".]
This patchset adds these new macros:
DEFINE_EARLY_PER_CPU(_type, _name, _initvalue)
EXPORT_EARLY_PER_CPU_SYMBOL(_name)
DECLARE_EARLY_PER_CPU(_type, _name)
early_per_cpu_ptr(_name)
early_per_cpu_map(_name, _idx)
early_per_cpu(_name, _cpu)
The DEFINE macro defines the per_cpu variable as well as the early
map and pointer. It also initializes the per_cpu variable and map
elements to "_initvalue". The early_* macros provide access to
the initial map (usually setup during system init) and the early
pointer. This pointer is initialized to point to the early map
but is then NULL'ed when the actual per_cpu areas are setup. After
that the per_cpu variable is the correct access to the variable.
The early_per_cpu() macro is not very efficient but does show how to
access the variable if you have a function that can be called both
"early" and "late". It tests the early ptr to be NULL, and if not
then it's still valid. Otherwise, the per_cpu variable is used
instead:
#define early_per_cpu(_name, _cpu) \
(early_per_cpu_ptr(_name) ? \
early_per_cpu_ptr(_name)[_cpu] : \
per_cpu(_name, _cpu))
A better method is to actually check the pointer manually. In the
case below, numa_set_node can be called both "early" and "late":
void __cpuinit numa_set_node(int cpu, int node)
{
int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
if (cpu_to_node_map)
cpu_to_node_map[cpu] = node;
else
per_cpu(x86_cpu_to_node_map, cpu) = node;
}
* Add a flag "arch_provides_topology_pointers" that indicates pointers
to topology cpumask_t maps are available. Otherwise, use the function
returning the cpumask_t value. This is useful if cpumask_t set size
is very large to avoid copying data on to/off of the stack.
* The coverage of CONFIG_DEBUG_PER_CPU_MAPS has been increased while
the non-debug case has been optimized a bit.
* Remove an unreferenced compiler warning in drivers/base/topology.c
* Clean up #ifdef in setup.c
For inclusion into sched-devel/latest tree.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ sched-devel/latest .../mingo/linux-2.6-sched-devel.git
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-12 15:21:12 -04:00
|
|
|
static inline void init_cpu_to_node(void) { }
|
|
|
|
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, int node) { }
|
|
|
|
static inline void numa_remove_cpu(int cpu) { }
|
2006-01-11 16:45:36 -05:00
|
|
|
#endif
|
2005-09-12 12:49:24 -04:00
|
|
|
|
2008-06-18 11:08:48 -04:00
|
|
|
#endif /* ASM_X86__NUMA_64_H */
|