From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965037AbWGEV0V (ORCPT ); Wed, 5 Jul 2006 17:26:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965038AbWGEV0V (ORCPT ); Wed, 5 Jul 2006 17:26:21 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:5853 "EHLO e31.co.us.ibm.com") by vger.kernel.org with ESMTP id S965037AbWGEV0U (ORCPT ); Wed, 5 Jul 2006 17:26:20 -0400 Subject: [Patch] convert i386 NUMA KVA space to bootmem From: keith mannthey Reply-To: kmannth@us.ibm.com To: lkml Cc: linux-mm , mbligh@mbligh.org, akpm@osdl.org Content-Type: multipart/mixed; boundary="=-vMTKZZIeLktl5sJPBQI6" Organization: Linux Technology Center IBM Date: Wed, 05 Jul 2006 14:26:13 -0700 Message-Id: <1152134773.5799.34.camel@keithlap> Mime-Version: 1.0 X-Mailer: Evolution 2.0.4 (2.0.4-4) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --=-vMTKZZIeLktl5sJPBQI6 Content-Type: text/plain Content-Transfer-Encoding: 7bit Hello Andrew, I posted this patch a while ago but I didn't get any feedback. I would like to submit this patch to your tree. The patch itself addresses a long standing issue of booting with an initrd on an i386 numa system. Currently (and always) the numa kva area is mapped into low memory by finding the end of low memory and moving that mark down (thus creating space for the kva). The issue with this is that Grub loads initrds into this similar space so when the kernel check the initrd it finds it outside max_low_pfn and disables it (it thinks the initrd is not mapped into usable memory) thus initrd enabled kernels can't boot i386 numa :( My solution to the problem just converts the numa kva area to use the bootmem allocator to save it's area (instead of moving the end of low memory). Using bootmem allows the kva area to be mapped into more diverse addresses (not just the end of low memory) and enables the kva area to be mapped below the initrd if present. I have tested this patch on numaq(no initrd) and summit(initrd) i386 numa based systems. It was diffed on 2.6.17-git26 but should apply to just about any recent kernel. Signed-off-by: Keith Mannthey --=-vMTKZZIeLktl5sJPBQI6 Content-Disposition: attachment; filename=patch-2.6.17-numa-kva-v3 Content-Type: text/x-patch; name=patch-2.6.17-numa-kva-v3; charset=UTF-8 Content-Transfer-Encoding: 7bit diff -urN linux-2.6.17/arch/i386/kernel/setup.c linux-2.6.17-git24/arch/i386/kernel/setup.c --- linux-2.6.17/arch/i386/kernel/setup.c 2006-07-04 22:35:20.000000000 -0700 +++ linux-2.6.17-git24/arch/i386/kernel/setup.c 2006-07-04 22:27:31.000000000 -0700 @@ -1203,6 +1203,9 @@ extern void zone_sizes_init(void); #endif /* !CONFIG_NEED_MULTIPLE_NODES */ +#ifdef CONFIG_NUMA +extern void numa_kva_reserve(void); +#endif void __init setup_bootmem_allocator(void) { unsigned long bootmap_size; @@ -1258,7 +1261,9 @@ */ find_smp_config(); #endif - +#ifdef CONFIG_NUMA + numa_kva_reserve(); +#endif #ifdef CONFIG_BLK_DEV_INITRD if (LOADER_TYPE && INITRD_START) { if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { diff -urN linux-2.6.17/arch/i386/mm/discontig.c linux-2.6.17-git24/arch/i386/mm/discontig.c --- linux-2.6.17/arch/i386/mm/discontig.c 2006-07-04 22:35:20.000000000 -0700 +++ linux-2.6.17-git24/arch/i386/mm/discontig.c 2006-07-04 22:27:31.000000000 -0700 @@ -117,7 +117,8 @@ void *node_remap_end_vaddr[MAX_NUMNODES]; void *node_remap_alloc_vaddr[MAX_NUMNODES]; - +static unsigned long kva_start_pfn; +static unsigned long kva_pages; /* * FLAT - support for basic PC memory model with discontig enabled, essentially * a single node with all available processors in it with a flat @@ -286,7 +287,6 @@ { int nid; unsigned long system_start_pfn, system_max_low_pfn; - unsigned long reserve_pages; /* * When mapping a NUMA machine we allocate the node_mem_map arrays @@ -298,14 +298,23 @@ find_max_pfn(); get_memcfg_numa(); - reserve_pages = calculate_numa_remap_pages(); + kva_pages = calculate_numa_remap_pages(); /* partially used pages are not usable - thus round upwards */ system_start_pfn = min_low_pfn = PFN_UP(init_pg_tables_end); - system_max_low_pfn = max_low_pfn = find_max_low_pfn() - reserve_pages; - printk("reserve_pages = %ld find_max_low_pfn() ~ %ld\n", - reserve_pages, max_low_pfn + reserve_pages); + kva_start_pfn = find_max_low_pfn() - kva_pages; + +#ifdef CONFIG_BLK_DEV_INITRD + /* Numa kva area is below the initrd */ + if (LOADER_TYPE && INITRD_START) + kva_start_pfn = PFN_DOWN(INITRD_START) - kva_pages; +#endif + kva_start_pfn -= kva_start_pfn & (PTRS_PER_PTE-1); + + system_max_low_pfn = max_low_pfn = find_max_low_pfn(); + printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", + kva_start_pfn, max_low_pfn); printk("max_pfn = %ld\n", max_pfn); #ifdef CONFIG_HIGHMEM highstart_pfn = highend_pfn = max_pfn; @@ -323,7 +332,7 @@ (ulong) pfn_to_kaddr(max_low_pfn)); for_each_online_node(nid) { node_remap_start_vaddr[nid] = pfn_to_kaddr( - highstart_pfn + node_remap_offset[nid]); + kva_start_pfn + node_remap_offset[nid]); /* Init the node remap allocator */ node_remap_end_vaddr[nid] = node_remap_start_vaddr[nid] + (node_remap_size[nid] * PAGE_SIZE); @@ -338,7 +347,6 @@ } printk("High memory starts at vaddr %08lx\n", (ulong) pfn_to_kaddr(highstart_pfn)); - vmalloc_earlyreserve = reserve_pages * PAGE_SIZE; for_each_online_node(nid) find_max_pfn_node(nid); @@ -348,6 +356,12 @@ return max_low_pfn; } +void __init numa_kva_reserve (void) +{ + reserve_bootmem(PFN_PHYS(kva_start_pfn),PFN_PHYS(kva_pages)); + +} + void __init zone_sizes_init(void) { int nid; --=-vMTKZZIeLktl5sJPBQI6--