408fde81c1
This patch effectively eliminates direct use of pgdat->node_mem_map outside of the DISCONTIG code. On a flat memory system, these fields aren't currently used, neither are they on a sparsemem system. There was also a node_mem_map(nid) macro on many architectures. Its use along with the use of ->node_mem_map itself was not consistent. It has been removed in favor of two new, more explicit, arch-independent macros: pgdat_page_nr(pgdat, pagenr) nid_page_nr(nid, pagenr) I called them "pgdat" and "nid" because we overload the term "node" to mean "NUMA node", "DISCONTIG node" or "pg_data_t" in very confusing ways. I believe the newer names are much clearer. These macros can be overridden in the sparsemem case with a theoretically slower operation using node_start_pfn and pfn_to_page(), instead. We could make this the only behavior if people want, but I don't want to change too much at once. One thing at a time. This patch removes more code than it adds. Compile tested on alpha, alpha discontig, arm, arm-discontig, i386, i386 generic, NUMAQ, Summit, ppc64, ppc64 discontig, and x86_64. Full list here: http://sr71.net/patches/2.6.12/2.6.12-rc1-mhp2/configs/ Boot tested on NUMAQ, x86 SMP and ppc64 power4/5 LPARs. Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Martin J. Bligh <mbligh@aracnet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/* K8 NUMA support */
|
|
/* Copyright 2002,2003 by Andi Kleen, SuSE Labs */
|
|
/* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */
|
|
#ifndef _ASM_X86_64_MMZONE_H
|
|
#define _ASM_X86_64_MMZONE_H 1
|
|
|
|
#include <linux/config.h>
|
|
|
|
#ifdef CONFIG_DISCONTIGMEM
|
|
|
|
#define VIRTUAL_BUG_ON(x)
|
|
|
|
#include <asm/smp.h>
|
|
|
|
#define NODEMAPSIZE 0xff
|
|
|
|
/* Simple perfect hash to map physical addresses to node numbers */
|
|
extern int memnode_shift;
|
|
extern u8 memnodemap[NODEMAPSIZE];
|
|
extern int maxnode;
|
|
|
|
extern struct pglist_data *node_data[];
|
|
|
|
static inline __attribute__((pure)) int phys_to_nid(unsigned long addr)
|
|
{
|
|
int nid;
|
|
VIRTUAL_BUG_ON((addr >> memnode_shift) >= NODEMAPSIZE);
|
|
nid = memnodemap[addr >> memnode_shift];
|
|
VIRTUAL_BUG_ON(nid > maxnode);
|
|
return nid;
|
|
}
|
|
|
|
#define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT)
|
|
|
|
#define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr))
|
|
#define NODE_DATA(nid) (node_data[nid])
|
|
|
|
#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
|
|
#define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \
|
|
NODE_DATA(nid)->node_spanned_pages)
|
|
|
|
#define local_mapnr(kvaddr) \
|
|
( (__pa(kvaddr) >> PAGE_SHIFT) - node_start_pfn(kvaddr_to_nid(kvaddr)) )
|
|
|
|
/* AK: this currently doesn't deal with invalid addresses. We'll see
|
|
if the 2.5 kernel doesn't pass them
|
|
(2.4 used to). */
|
|
#define pfn_to_page(pfn) ({ \
|
|
int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); \
|
|
((pfn) - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map; \
|
|
})
|
|
|
|
#define page_to_pfn(page) \
|
|
(long)(((page) - page_zone(page)->zone_mem_map) + page_zone(page)->zone_start_pfn)
|
|
|
|
#define pfn_valid(pfn) ((pfn) >= num_physpages ? 0 : \
|
|
({ u8 nid__ = pfn_to_nid(pfn); \
|
|
nid__ != 0xff && (pfn) >= node_start_pfn(nid__) && (pfn) <= node_end_pfn(nid__); }))
|
|
#endif
|
|
#endif
|