Configureable NODES_SHIFT
Subsystems (6)
Hello.
This patch set is to make configurable node's number.
Current implementation defines NODES_SHIFT at include/asm-xxx/numnodes.h for each arch. Its definition is sometimes plural.
Indeed, ia64 defines 5 NODES_SHIFT at newest git tree.
But it looks a bit messy.
SGI-SN2(ia64) system requires 1024 nodes,
and the number of nodes already has been changeable by config. Suitable node's number may be changed in the future even if it is other architecture. So, I wrote configurable node's number.
This patch set defines just default value for each arch which needs multi nodes except ia64.
But, it is easy to change to configurable if necessary.
This patch is for 2.6.16-git16.
See also:
http://marc.theaimsgroup.com/?l=linux-kernel&m=114358010523896&w=2
Thanks.
P.S. I divided this patch from pxm to node id mapping.
It will be posted later...
Signature · 1 line
Yasunori Goto
[Patch:002/011] Configureable NODES_SHIFT (for ia64)
This is for ia64.
The number of nodes can be already configured in generic ia64 and SN2 config. But, NODES_SHIFT is defined for DIG64 and HP'S machine too.
So, I changed that all platform can be configured by CONFIG_NODES_SHIFT. It would be simpler.
include/asm-ia64/numnodes.h | 20 -------------------- arch/ia64/Kconfig | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 29 deletions(-)
arch/ia64/Kconfig +10 -9
@@ -260,15 +260,6 @@ config NR_CPUS than 64 will cause the use of a CPU mask array, causing a small performance hit. -config IA64_NR_NODES - int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC) - range 256 1024 - depends on IA64_SGI_SN2 || IA64_GENERIC - default "256" - help - This option specifies the maximum number of nodes in your SSI system. - If in doubt, use the default. - config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && EXPERIMENTAL
@@ -352,6 +343,16 @@ config NUMA Access). This option is for configuring high-end multiprocessor server systems. If in doubt, say N. +config NODES_SHIFT + int "Max num nodes shift(3-10)" + range 3 10 + default "8" + depends on NEED_MULTIPLE_NODES + help + This option specifies the maximum number of nodes in your SSI system. + MAX_NUMNODES will be 2^(This value). + If in doubt, use the default. + # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent. # VIRTUAL_MEM_MAP has been retained for historical reasons. config VIRTUAL_MEM_MAP
include/asm-ia64/numnodes.h deleted +0 -20
@@ -1,20 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -#ifdef CONFIG_IA64_DIG -/* Max 8 Nodes */ -# define NODES_SHIFT 3 -#elif defined(CONFIG_IA64_HP_ZX1 ) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB ) -/* Max 32 Nodes */ -# define NODES_SHIFT 5 -#elif defined(CONFIG_IA64_SGI_SN2 ) || defined(CONFIG_IA64_GENERIC ) -# if CONFIG_IA64_NR_NODES ==256 -# define NODES_SHIFT 8 -# elif CONFIG_IA64_NR_NODES <=512 -# define NODES_SHIFT 9 -# elif CONFIG_IA64_NR_NODES <=1024 -# define NODES_SHIFT 10 -# endif -#endif - -#endif /* _ASM_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto
[Patch:001/011] Configureable NODES_SHIFT (Generic part)
In reply to Yasunori GotoThis is generic part.include/asm-xxx/numnodes.h becomes not necessary.
include/linux/numa.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
include/linux/numa.h +3 -5
@@ -3,11 +3,9 @@#include <linux/config.h> -#ifndef CONFIG_FLATMEM -#include <asm/numnodes.h> -#endif - -#ifndef NODES_SHIFT +#ifdef CONFIG_NODES_SHIFT +#define NODES_SHIFT CONFIG_NODES_SHIFT +#else #define NODES_SHIFT 0#endif
Signature · 1 line
Yasunori Goto
Re: [Patch:001/011] Configureable NODES_SHIFT (Generic part)
Quoted 5 lines · Yasunori Goto
This is generic part.
include/asm-xxx/numnodes.hbecomes not necessary.
One thing which we aim to do where practical is to ensure that the kernel compiles and builds at each step of a patch series. Mainly because it is very painful when git-bisect hits a won't-compile point.
Quoted 9 lines
Index:
pxm_ver4/include/linux/numa.h
===================================================================include/linux/numa.h +0
-0@@ -3,11 +3,9 @@#include <linux/config.h>
include/linux/numa.h line 10
Quoted 10 lines
include/linux/numa.h +3
-5-#ifndef CONFIG_FLATMEM -#include <asm/numnodes.h> -#endif - -#ifndef NODES_SHIFT +#ifdef CONFIG_NODES_SHIFT +#define NODES_SHIFT CONFIG_NODES_SHIFT +#else #define NODES_SHIFT 0#endif
So I think this is in fact [patch 11/11/]?
Re: [Patch:001/011] Configureable NODES_SHIFT (Generic part)
Quoted 4 lines · Andrew Morton
Quoted 2 lines · Yasunori Goto
Quoted 8 lines
Quoted 3 lines
This is generic part.
include/asm-xxx/numnodes.hbecomes not necessary.One thing which we aim to do where practical is to ensure that the kernel compiles and builds at each step of a patch series. Mainly because it is very painful when git-bisect hits a won't-compile point.
Of course the easy solution is to make it all a single patch. I'll do that.
Re: [Patch:001/011] Configureable NODES_SHIFT (Generic part)
Quoted 5 lines
Quoted 4 lines · Andrew Morton
Quoted 2 lines · Yasunori Goto
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
This is generic part.
include/asm-xxx/numnodes.hbecomes not necessary.One thing which we aim to do where practical is to ensure that the kernel compiles and builds at each step of a patch series. Mainly because it is very painful when git-bisect hits a won't-compile point.
Ah. Sorry.
I worried they should be divided or not a bit.
It might be messy at this patch set.
Quoted 1 line
Of course the easy solution is to make it all a single patch. I'll do that.
Do it please. :-)
Signature · 1 line
Yasunori Goto
[Patch:003/011] Configureable NODES_SHIFT (for i386)
In reply to Yasunori GotoThis is for i386.
include/asm-i386/numnodes.h | 18 ------------------ arch/i386/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 18 deletions(-)
include/asm-i386/numnodes.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -#include <linux/config.h> - -#ifdef CONFIG_X86_NUMAQ - -/* Max 16 Nodes */ -#define NODES_SHIFT 4 - -#elif defined(CONFIG_ACPI_SRAT ) - -/* Max 8 Nodes */ -#define NODES_SHIFT 3 - -#endif /* CONFIG_X86_NUMAQ */ - -#endif /* _ASM_MAX_NUMNODES_H */
arch/i386/Kconfig +6 -0
@@ -522,6 +522,12 @@ config NUMA comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) +config NODES_SHIFT + int + default "4" if X86_NUMAQ + default "3" + depends on NEED_MULTIPLE_NODES + config HAVE_ARCH_BOOTMEM_NODE bool depends on NUMA
Signature · 1 line
Yasunori Goto
[Patch:004/011] Configureable NODES_SHIFT (for x86-64)
In reply to Yasunori GotoThis is for x86-64.
include/asm-x86_64/numnodes.h | 12 ------------ arch/x86_64/Kconfig | 5 +++++ include/asm-x86_64/numa.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)
arch/x86_64/Kconfig +5 -0
@@ -283,6 +283,11 @@ config K8_NUMA Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA instead, which also takes priority if both are compiled in. +config NODES_SHIFT + int + default "6" + depends on NEED_MULTIPLE_NODES + # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig. config X86_64_ACPI_NUMA
include/asm-x86_64/numnodes.h deleted +0 -12
@@ -1,12 +0,0 @@ -#ifndef _ASM_X8664_NUMNODES_H -#define _ASM_X8664_NUMNODES_H 1 - -#include <linux/config.h> - -#ifdef CONFIG_NUMA -#define NODES_SHIFT 6 -#else -#define NODES_SHIFT 0 -#endif - -#endif
include/asm-x86_64/numa.h +0 -1
@@ -2,7 +2,6 @@#define _ASM_X8664_NUMA_H 1#include <linux/nodemask.h> -#include <asm/numnodes.h> struct bootnode {u64 start,end;
Signature · 1 line
Yasunori Goto
[Patch:005/011] Configureable NODES_SHIFT (for powerpc)
In reply to Yasunori GotoThis is for powerpc.
include/asm-powerpc/numnodes.h | 9 --------- arch/powerpc/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-)
arch/powerpc/Kconfig +5 -0
@@ -649,6 +649,11 @@ config NUMA depends on PPC64 default y if SMP && PPC_PSERIES +config NODES_SHIFT + int + default "4" + depens on NEED_MULTIPLE_NODES + config ARCH_SELECT_MEMORY_MODEL def_bool y depends on PPC64
include/asm-powerpc/numnodes.h deleted +0 -9
@@ -1,9 +0,0 @@ -#ifndef _ASM_POWERPC_MAX_NUMNODES_H -#define _ASM_POWERPC_MAX_NUMNODES_H -#ifdef __KERNEL__ - -/* Max 16 Nodes */ -#define NODES_SHIFT 4 - -#endif /* __KERNEL__ */ -#endif /* _ASM_POWERPC_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto
[Patch:006/011] Configureable NODES_SHIFT (for alpha)
In reply to Yasunori GotoThis is for alpha.
include/asm-alpha/numnodes.h | 7 ------- arch/alpha/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/alpha/Kconfig +5 -0
@@ -549,6 +549,11 @@ config NUMA Access). This option is for configuring high-end multiprocessor server machines. If in doubt, say N. +config NODES_SHIFT + int + default "7" + depends on NEED_MULTIPLE_NODES + # LARGE_VMALLOC is racy, if you *really* need it then fix it first config ALPHA_LARGE_VMALLOC bool
include/asm-alpha/numnodes.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -/* Max 128 Nodes - Marvel */ -#define NODES_SHIFT 7 - -#endif /* _ASM_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto
[Patch:007/011] Configureable NODES_SHIFT (for parisc)
In reply to Yasunori GotoThis is for parisc.
include/asm-parisc/numnodes.h | 7 ------- arch/parisc/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/parisc/Kconfig +5 -0
@@ -177,6 +177,11 @@ config ARCH_DISCONTIGMEM_DEFAULT def_bool y depends on ARCH_DISCONTIGMEM_ENABLE +config NODES_SHIFT + int + default "3" + depens on NEED_MULTIPLE_NODES + source "kernel/Kconfig.hz" source "mm/Kconfig"
include/asm-parisc/numnodes.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -/* Max 8 Nodes */ -#define NODES_SHIFT 3 - -#endif /* _ASM_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto
[Patch:010/011] Configureable NODES_SHIFT (for mips)
In reply to Yasunori GotoThis is for mips.
include/asm-mips/numnodes.h | 7 ------- arch/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/mips/Kconfig +5 -0
@@ -1587,6 +1587,11 @@ config ARCH_FLATMEM_ENABLE def_bool y depends on !NUMA +config NODES_SHIFT + int + default "6" + depends on NEED_MULTIPLE_NODES + source "mm/Kconfig" config SMP
include/asm-mips/numnodes.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -/* Max 128 Nodes */ -#define NODES_SHIFT 6 - -#endif /* _ASM_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto
[Patch:009/011] Configureable NODES_SHIFT (for m32r)
In reply to Yasunori GotoThis is to m32r.
include/asm-m32r/numnodes.h | 15 --------------- arch/m32r/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 15 deletions(-)
arch/m32r/Kconfig +5 -0
@@ -285,6 +285,11 @@ config NUMA depends on SMP && BROKEN default n +config NODES_SHIFT + int + default "1" + depends on NEED_MULTIPLE_NODES + # turning this on wastes a bunch of space. # Summit needs it only when NUMA is on config BOOT_IOREMAP
include/asm-m32r/numnodes.h deleted +0 -15
@@ -1,15 +0,0 @@ -#ifndef _ASM_NUMNODES_H_ -#define _ASM_NUMNODES_H_ - -#include <linux/config.h> - -#ifdef CONFIG_DISCONTIGMEM - -#if defined(CONFIG_CHIP_M32700 ) -#define NODES_SHIFT 1/* Max 2 Nodes */ -#endif /* CONFIG_CHIP_M32700 */ - -#endif /* CONFIG_DISCONTIGMEM */ - -#endif /* _ASM_NUMNODES_H_ */ -
Signature · 1 line
Yasunori Goto
[Patch:008/011] Configureable NODES_SHIFT (for arm)
In reply to Yasunori GotoThis is form arm.
include/asm-arm/numnodes.h | 26 -------------------------- arch/arm/Kconfig | 6 ++++++ include/asm-arm/arch-lh7a40x/memory.h | 2 -- 3 files changed, 6 insertions(+), 28 deletions(-)
arch/arm/Kconfig +6 -0
@@ -496,6 +496,12 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See <file:Documentation/vm/numa> for more. +config NODES_SHIFT + int + default "4" if ARCH_LH7A40X + default "2" + depends on NEED_MULTIPLE_NODES + source "mm/Kconfig" config LEDS
include/asm-arm/arch-lh7a40x/memory.h +0 -2
@@ -31,8 +31,6 @@#ifdef CONFIG_DISCONTIGMEM -#define NODES_SHIFT 4/* Up to 16 nodes */ -/* * Given a kernel address, find the home node of the underlying memory. */
include/asm-arm/numnodes.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* linux/include/asm-arm/numnodes.h -* -* Copyright (C) 2002 Russell King -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -/* This declaration for the size of the NUMA (CONFIG_DISCONTIGMEM) -* memory node table is the default. -* -* A good place to override this value is include/asm/arch/memory.h. -*/ - -#ifndef __ASM_ARM_NUMNODES_H -#define __ASM_ARM_NUMNODES_H - -#include <asm/memory.h> - -#ifndef NODES_SHIFT -# define NODES_SHIFT 2/* Normally, Max 4 Nodes */ -#endif - -#endif
Signature · 1 line
Yasunori Goto
[Patch:011/011] Configureable NODES_SHIFT (for sh)
In reply to Yasunori GotoThis is for sh.
include/asm-sh/numnodes.h | 7 ------- arch/sh/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-)
arch/sh/Kconfig +5 -0
@@ -527,6 +527,11 @@ config CPU_HAS_SR_RB See <file:Documentation/sh/register-banks.txt> for further information on SR.RB and register banking in the kernel in general. +config NODES_SHIFT + int + default "1" + depends on NEED_MULTIPLE_NODES + endmenu menu "Boot options"
include/asm-sh/numnodes.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -/* Max 2 Nodes */ -#define NODES_SHIFT 1 - -#endif /* _ASM_MAX_NUMNODES_H */
Signature · 1 line
Yasunori Goto