Written-By: Bob Picco Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ia64/Kconfig | 44 ++++++++++++++++++--------- memhotplug-dave/arch/ia64/mm/Makefile | 5 +-- memhotplug-dave/arch/ia64/mm/discontig.c | 32 +++++++++++++++++-- memhotplug-dave/arch/ia64/mm/init.c | 2 - memhotplug-dave/arch/ia64/mm/numa.c | 23 ++++++++++++++ memhotplug-dave/include/asm-ia64/meminit.h | 2 - memhotplug-dave/include/asm-ia64/mmzone.h | 6 +-- memhotplug-dave/include/asm-ia64/nodedata.h | 4 +- memhotplug-dave/include/asm-ia64/page.h | 19 +++++++---- memhotplug-dave/include/asm-ia64/sparsemem.h | 32 +++++++++++++++++++ 10 files changed, 136 insertions(+), 33 deletions(-) diff -puN arch/ia64/Kconfig~B-sparse-180-sparsemem-ia64 arch/ia64/Kconfig --- memhotplug/arch/ia64/Kconfig~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/arch/ia64/Kconfig 2005-04-13 14:20:26.000000000 -0700 @@ -54,8 +54,6 @@ config IA64_GENERIC bool "generic" select NUMA select ACPI_NUMA - select VIRTUAL_MEM_MAP - select DISCONTIGMEM help This selects the system type of your hardware. A "generic" kernel will run on any supported IA-64 system. However, if you configure @@ -177,6 +175,7 @@ config NUMA config VIRTUAL_MEM_MAP bool "Virtual mem map" + depends on !SPARSEMEM default y if !IA64_HP_SIM help Say Y to compile the kernel with support for a virtual mem map. @@ -189,16 +188,6 @@ config HOLES_IN_ZONE bool default y if VIRTUAL_MEM_MAP -config ARCH_DISCONTIGMEM_ENABLE - bool "Discontiguous memory support" - depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP - default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA - help - Say Y to support efficient handling of discontiguous physical memory, - for architectures which are either NUMA (Non-Uniform Memory Access) - or have huge holes in the physical address space for other reasons. - See for more. - config IA64_CYCLONE bool "Cyclone (EXA) Time Source support" help @@ -218,8 +207,10 @@ config IA64_SGI_SN_SIM simulator (Medusa) then say Y, otherwise say N. config FORCE_MAX_ZONEORDER - int - default "18" + int "MAX_ORDER (11 - 20)" if !HUGETLB_PAGE + range 11 20 if !HUGETLB_PAGE + default "18" if HUGETLB_PAGE + default "11" config SMP bool "Symmetric multi-processing support" @@ -275,6 +266,31 @@ config PREEMPT source "mm/Kconfig" +config SECTION_BITS + int + depends on SPARSEMEM + range 28 32 if !HUGETLB_PAGE + default "32" if HUGETLB_PAGE + default "28" + help + Size of memory section in bits. + +config PHYSICAL_MEMORY_BITS + int + depends on SPARSEMEM + range 44 50 + default 44 + help + Maximum physical memory address bits. + +config ARCH_SPARSEMEM_DEFAULT + bool + depends on NUMA + +config ARCH_DISCONTIGMEM_DISABLE + bool + depends !NUMA + config HAVE_DEC_LOCK bool depends on (SMP || PREEMPT) diff -puN arch/ia64/mm/Makefile~B-sparse-180-sparsemem-ia64 arch/ia64/mm/Makefile --- memhotplug/arch/ia64/mm/Makefile~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/arch/ia64/mm/Makefile 2005-04-13 14:20:26.000000000 -0700 @@ -7,6 +7,5 @@ obj-y := init.o fault.o tlb.o extable.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_DISCONTIGMEM) += discontig.o -ifndef CONFIG_DISCONTIGMEM -obj-y += contig.o -endif +obj-$(CONFIG_SPARSEMEM) += discontig.o +obj-$(CONFIG_FLATMEM) += contig.o diff -puN arch/ia64/mm/discontig.c~B-sparse-180-sparsemem-ia64 arch/ia64/mm/discontig.c --- memhotplug/arch/ia64/mm/discontig.c~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/arch/ia64/mm/discontig.c 2005-04-13 14:20:26.000000000 -0700 @@ -455,6 +455,21 @@ static void __init initialize_pernode_da } } +#ifdef CONFIG_SPARSEMEM +static int __init register_sparse_mem(unsigned long start, unsigned long end, + void *arg) +{ + int nid; + + start = __pa(start) >> PAGE_SHIFT; + end = __pa(end) >> PAGE_SHIFT; + nid = early_pfn_to_nid(start); + (void) memory_present(nid, start, end); + + return 0; +} +#endif + /** * find_memory - walk the EFI memory map and setup the bootmem allocator * @@ -479,6 +494,9 @@ void __init find_memory(void) reassign_cpu_only_nodes(); /* These actually end up getting called by call_pernode_memory() */ +#ifdef CONFIG_SPARSEMEM + efi_memmap_walk(register_sparse_mem, (void *) 0); +#endif efi_memmap_walk(filter_rsvd_memory, build_node_maps); efi_memmap_walk(filter_rsvd_memory, find_pernode_space); @@ -561,7 +579,9 @@ void show_mem(void) printk("Node ID: %d\n", pgdat->node_id); for(i = 0; i < pgdat->node_spanned_pages; i++) { struct page *page = pgdat_page_nr(pgdat, i); - if (!ia64_pfn_valid(pgdat->node_start_pfn+i)) + if (pfn_valid(page)) + page = pfn_to_page(page); + else continue; if (PageReserved(page)) reserved++; @@ -683,6 +703,8 @@ void __init paging_init(void) for_each_online_node(node) mem_data[node].min_pfn = ~0UL; + sparse_init(); + efi_memmap_walk(filter_rsvd_memory, count_node_pages); for_each_online_node(node) { @@ -718,6 +740,9 @@ void __init paging_init(void) mem_data[node].num_dma_physpages); } + pfn_offset = mem_data[node].min_pfn; + +#ifndef CONFIG_SPARSEMEM if (node == 0) { vmalloc_end -= PAGE_ALIGN(max_low_pfn * sizeof(struct page)); @@ -727,9 +752,10 @@ void __init paging_init(void) printk("Virtual mem_map starts at 0x%p\n", vmem_map); } - pfn_offset = mem_data[node].min_pfn; - NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset; +#endif + + free_area_init_node(node, NODE_DATA(node), zones_size, pfn_offset, zholes_size); } diff -puN arch/ia64/mm/init.c~B-sparse-180-sparsemem-ia64 arch/ia64/mm/init.c --- memhotplug/arch/ia64/mm/init.c~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/arch/ia64/mm/init.c 2005-04-13 14:20:26.000000000 -0700 @@ -537,7 +537,7 @@ mem_init (void) platform_dma_init(); #endif -#ifndef CONFIG_DISCONTIGMEM +#if !defined(CONFIG_DISCONTIGMEM) && !defined(CONFIG_SPARSEMEM) if (!mem_map) BUG(); max_mapnr = max_low_pfn; diff -puN arch/ia64/mm/numa.c~B-sparse-180-sparsemem-ia64 arch/ia64/mm/numa.c --- memhotplug/arch/ia64/mm/numa.c~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/arch/ia64/mm/numa.c 2005-04-13 14:20:26.000000000 -0700 @@ -47,3 +47,26 @@ paddr_to_nid(unsigned long paddr) return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); } + +#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA) +/* + * Because of holes evaluate on section limits. + */ +int early_pfn_to_nid(unsigned long pfn) +{ + int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec; + + for (i = 0; i < num_node_memblks; i++) { + ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT; + esec = (node_memblk[i].start_paddr + node_memblk[i].size + + ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT; + if (section >= ssec && section < esec) + break; + } + + if (i == num_node_memblks) + return 0; + else + return node_memblk[i].nid; +} +#endif diff -puN include/asm-ia64/meminit.h~B-sparse-180-sparsemem-ia64 include/asm-ia64/meminit.h --- memhotplug/include/asm-ia64/meminit.h~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/include/asm-ia64/meminit.h 2005-04-13 14:20:26.000000000 -0700 @@ -41,7 +41,7 @@ extern int filter_rsvd_memory (unsigned #define GRANULEROUNDUP(n) (((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1)) #define ORDERROUNDDOWN(n) ((n) & ~((PAGE_SIZE< #include -#ifdef CONFIG_DISCONTIGMEM +#ifdef CONFIG_NUMA #ifdef CONFIG_IA64_DIG /* DIG systems are small */ # define MAX_PHYSNODE_ID 8 @@ -25,8 +25,8 @@ # define NR_NODE_MEMBLKS (MAX_NUMNODES * 4) #endif -#else /* CONFIG_DISCONTIGMEM */ +#else /* CONFIG_NUMA */ # define NR_NODE_MEMBLKS (MAX_NUMNODES * 4) -#endif /* CONFIG_DISCONTIGMEM */ +#endif /* CONFIG_NUMA */ #endif /* _ASM_IA64_MMZONE_H */ diff -puN include/asm-ia64/nodedata.h~B-sparse-180-sparsemem-ia64 include/asm-ia64/nodedata.h --- memhotplug/include/asm-ia64/nodedata.h~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/include/asm-ia64/nodedata.h 2005-04-13 14:20:26.000000000 -0700 @@ -17,7 +17,7 @@ #include #include -#ifdef CONFIG_DISCONTIGMEM +#ifdef CONFIG_NUMA /* * Node Data. One of these structures is located on each node of a NUMA system. @@ -47,6 +47,6 @@ struct ia64_node_data { */ #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) -#endif /* CONFIG_DISCONTIGMEM */ +#endif /* CONFIG_NUMA */ #endif /* _ASM_IA64_NODEDATA_H */ diff -puN include/asm-ia64/page.h~B-sparse-180-sparsemem-ia64 include/asm-ia64/page.h --- memhotplug/include/asm-ia64/page.h~B-sparse-180-sparsemem-ia64 2005-04-13 14:20:26.000000000 -0700 +++ memhotplug-dave/include/asm-ia64/page.h 2005-04-13 14:20:26.000000000 -0700 @@ -88,17 +88,17 @@ do { \ #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) -#ifdef CONFIG_VIRTUAL_MEM_MAP +#ifdef CONFIG_VIRTUAL_MEM_MAP extern int ia64_pfn_valid (unsigned long pfn); -#else +#elif CONFIG_FLATMEM # define ia64_pfn_valid(pfn) 1 #endif -#ifndef CONFIG_DISCONTIGMEM +#ifdef CONFIG_FLATMEM # define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) # define page_to_pfn(page) ((unsigned long) (page - mem_map)) # define pfn_to_page(pfn) (mem_map + (pfn)) -#else +#elif CONFIG_DISCONTIGMEM extern struct page *vmem_map; extern unsigned long max_low_pfn; # define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) @@ -106,6 +106,10 @@ extern unsigned long max_low_pfn; # define pfn_to_page(pfn) (vmem_map + (pfn)) #endif +#if defined(CONFIG_NUMA) && defined(CONFIG_SPARSEMEM) +extern int early_pfn_to_nid(unsigned long pfn); +#endif + #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) @@ -124,8 +128,11 @@ typedef union ia64_va { * expressed in this way to ensure they result in a single "dep" * instruction. */ -#define __pa(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg = 0; _v.l;}) -#define __va(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg = -1; _v.p;}) +#define __boot_pa(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg = 0; _v.l;}) +#define __boot_va(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg = -1; _v.p;}) +#define __pa(x) __boot_pa(x) +#define __va(x) __boot_va(x) +#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) #define REGION_NUMBER(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg;}) #define REGION_OFFSET(x) ({ia64_va _v; _v.l = (long) (x); _v.f.off;}) diff -puN /dev/null include/asm-ia64/sparsemem.h --- /dev/null 2005-03-30 22:36:15.000000000 -0800 +++ memhotplug-dave/include/asm-ia64/sparsemem.h 2005-04-13 14:20:26.000000000 -0700 @@ -0,0 +1,32 @@ +#ifndef _ASM_IA64_SPARSEMEM_H +#define _ASM_IA64_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM + /* + * SECTION_SIZE_BITS 2^N: how big each section will be + * MAX_PHYSADDR_BITS 2^N: how much physical address space we have + * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space + */ + +#define SECTION_SIZE_BITS CONFIG_SECTION_BITS + +/* + * If FORCE_MAX_ORDER is used, then check and possibly enforce the boundary + * condition on SECTION_SIZE_BITS's magnitude. + */ +#ifdef CONFIG_FORCE_MAX_ZONEORDER +#if ((CONFIG_FORCE_MAX_ZONEORDER+PAGE_SHIFT) > SECTION_SIZE_BITS) +#undef SECTION_SIZE_BITS +#define SECTION_SIZE_BITS (CONFIG_FORCE_MAX_ZONEORDER+PAGE_SHIFT) +#endif +#endif + +#define MAX_PHYSADDR_BITS CONFIG_PHYSICAL_MEMORY_BITS +#define MAX_PHYSMEM_BITS CONFIG_PHYSICAL_MEMORY_BITS + +/* until we think of something better */ +#define page_is_ram(pfn) 1 + +#endif /* CONFIG_SPARSEMEM */ + +#endif /* _ASM_IA64_SPARSEMEM_H */ _