From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail138.messagelabs.com (mail138.messagelabs.com [216.82.249.35]) by kanga.kvack.org (Postfix) with SMTP id E0D0E6B021A for ; Thu, 13 May 2010 08:04:35 -0400 (EDT) Date: Thu, 13 May 2010 20:00:16 +0800 From: Shaohui Zheng Subject: [RFC, 6/7] NUMA hotplug emulator Message-ID: <20100513120016.GG2169@shaohui> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="z+pzSjdB7cqptWpS" Content-Disposition: inline Sender: owner-linux-mm@kvack.org To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Andi Kleen , Hidetoshi Seto , Greg Kroah-Hartman , Wu Fengguang , Heiko Carstens , linux-kernel@vger.kernel.org, haicheng.li@linux.intel.com, shaohui.zheng@linux.intel.com List-ID: --z+pzSjdB7cqptWpS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline hotplug emulator:extend memory probe interface to support NUMA Extend memory probe interface to support an extra paramter nid, the reserved memory can be added into this node if node exists. Add a memory section(128M) to node 3(boots with mem=1024m) echo 0x40000000,3 > memory/probe And more we make it friendly, it is possible to add memory to do echo 3g > memory/probe echo 1024m,3 > memory/probe It maintains backwards compatibility. Signed-off-by: Shaohui Zheng Signed-off-by: Haicheng Li Signed-off-by: Wu Fengguang --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 54ccb0d..787024f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1239,6 +1239,17 @@ config ARCH_CPU_PROBE_RELEASE is for cpu hot-add/hot-remove to specified node in software method. This is for debuging and testing purpose +config ARCH_MEMORY_PROBE + def_bool y + bool "Memory hotplug emulation" + depends on NUMA_HOTPLUG_EMU + ---help--- + Enable memory hotplug emulation. Reserve memory with grub parameter + "mem=N"(such as mem=1024M), where N is the initial memory size, the + rest physical memory will be removed from e820 table; the memory probe + interface is for memory hot-add to specified node in software method. + This is for debuging and testing purpose + config NODES_SHIFT int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP range 1 10 diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 933442f..1c2d83d 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -329,6 +329,8 @@ static int block_size_init(void) * will not need to do it from userspace. The fake hot-add code * as well as ppc64 will do all of their discovery in userspace * and will require this interface. + * + * Parameter format: start_addr, nid */ #ifdef CONFIG_ARCH_MEMORY_PROBE static ssize_t @@ -339,10 +341,26 @@ memory_probe_store(struct class *class, struct class_attribute *attr, int nid; int ret; - phys_addr = simple_strtoull(buf, NULL, 0); + char *p = strchr(buf, ','); + + if (p != NULL && strlen(p+1) > 0) { + /* nid specified */ + *p++ = '\0'; + nid = simple_strtoul(p, NULL, 0); + phys_addr = memparse(buf, NULL); + } else { + phys_addr = memparse(buf, NULL); + nid = memory_add_physaddr_to_nid(phys_addr); + } - nid = memory_add_physaddr_to_nid(phys_addr); - ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT); + if (nid < 0 || nid > nr_node_ids - 1) { + printk(KERN_ERR "Invalid node id %d(0<=nid<%d).\n", nid, nr_node_ids); + } else { + printk(KERN_INFO "Add a memory section to node: %d.\n", nid); + ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT); + if (ret) + count = ret; + } if (ret) count = ret; -- Thanks & Regards, Shaohui --z+pzSjdB7cqptWpS Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="006-hotplug-emulator-extend-memory-probe-interface-to-support-numa.patch" hotplug emulator:extend memory probe interface to support NUMA Extend memory probe interface to support an extra paramter nid, the reserved memory can be added into this node if node exists. Add a memory section(128M) to node 3(boots with mem=1024m) echo 0x40000000,3 > memory/probe And more we make it friendly, it is possible to add memory to do echo 3g > memory/probe echo 1024m,3 > memory/probe It maintains backwards compatibility. Signed-off-by: Shaohui Zheng Signed-off-by: Haicheng Li Signed-off-by: Wu Fengguang --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 54ccb0d..787024f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1239,6 +1239,17 @@ config ARCH_CPU_PROBE_RELEASE is for cpu hot-add/hot-remove to specified node in software method. This is for debuging and testing purpose +config ARCH_MEMORY_PROBE + def_bool y + bool "Memory hotplug emulation" + depends on NUMA_HOTPLUG_EMU + ---help--- + Enable memory hotplug emulation. Reserve memory with grub parameter + "mem=N"(such as mem=1024M), where N is the initial memory size, the + rest physical memory will be removed from e820 table; the memory probe + interface is for memory hot-add to specified node in software method. + This is for debuging and testing purpose + config NODES_SHIFT int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP range 1 10 diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 933442f..1c2d83d 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -329,6 +329,8 @@ static int block_size_init(void) * will not need to do it from userspace. The fake hot-add code * as well as ppc64 will do all of their discovery in userspace * and will require this interface. + * + * Parameter format: start_addr, nid */ #ifdef CONFIG_ARCH_MEMORY_PROBE static ssize_t @@ -339,10 +341,26 @@ memory_probe_store(struct class *class, struct class_attribute *attr, int nid; int ret; - phys_addr = simple_strtoull(buf, NULL, 0); + char *p = strchr(buf, ','); + + if (p != NULL && strlen(p+1) > 0) { + /* nid specified */ + *p++ = '\0'; + nid = simple_strtoul(p, NULL, 0); + phys_addr = memparse(buf, NULL); + } else { + phys_addr = memparse(buf, NULL); + nid = memory_add_physaddr_to_nid(phys_addr); + } - nid = memory_add_physaddr_to_nid(phys_addr); - ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT); + if (nid < 0 || nid > nr_node_ids - 1) { + printk(KERN_ERR "Invalid node id %d(0<=nid<%d).\n", nid, nr_node_ids); + } else { + printk(KERN_INFO "Add a memory section to node: %d.\n", nid); + ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT); + if (ret) + count = ret; + } if (ret) count = ret; --z+pzSjdB7cqptWpS-- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org