Lee Schermerhorn 9a30523066 hugetlb: add per node hstate attributes ... Add the per huge page size control/query attributes to the per node sysdevs: /sys/devices/system/node/node<ID>/hugepages/hugepages-<size>/ nr_hugepages - r/w free_huge_pages - r/o surplus_huge_pages - r/o The patch attempts to re-use/share as much of the existing global hstate attribute initialization and handling, and the "nodes_allowed" constraint processing as possible. Calling set_max_huge_pages() with no node indicates a change to global hstate parameters. In this case, any non-default task mempolicy will be used to generate the nodes_allowed mask. A valid node id indicates an update to that node's hstate parameters, and the count argument specifies the target count for the specified node. From this info, we compute the target global count for the hstate and construct a nodes_allowed node mask contain only the specified node. Setting the node specific nr_hugepages via the per node attribute effectively ignores any task mempolicy or cpuset constraints. With this patch: (me):ls /sys/devices/system/node/node0/hugepages/hugepages-2048kB ./ ../ free_hugepages nr_hugepages surplus_hugepages Starting from: Node 0 HugePages_Total: 0 Node 0 HugePages_Free: 0 Node 0 HugePages_Surp: 0 Node 1 HugePages_Total: 0 Node 1 HugePages_Free: 0 Node 1 HugePages_Surp: 0 Node 2 HugePages_Total: 0 Node 2 HugePages_Free: 0 Node 2 HugePages_Surp: 0 Node 3 HugePages_Total: 0 Node 3 HugePages_Free: 0 Node 3 HugePages_Surp: 0 vm.nr_hugepages = 0 Allocate 16 persistent huge pages on node 2: (me):echo 16 >/sys/devices/system/node/node2/hugepages/hugepages-2048kB/nr_hugepages [Note that this is equivalent to: numactl -m 2 hugeadmin --pool-pages-min 2M:+16 ] Yields: Node 0 HugePages_Total: 0 Node 0 HugePages_Free: 0 Node 0 HugePages_Surp: 0 Node 1 HugePages_Total: 0 Node 1 HugePages_Free: 0 Node 1 HugePages_Surp: 0 Node 2 HugePages_Total: 16 Node 2 HugePages_Free: 16 Node 2 HugePages_Surp: 0 Node 3 HugePages_Total: 0 Node 3 HugePages_Free: 0 Node 3 HugePages_Surp: 0 vm.nr_hugepages = 16 Global controls work as expected--reduce pool to 8 persistent huge pages: (me):echo 8 >/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages Node 0 HugePages_Total: 0 Node 0 HugePages_Free: 0 Node 0 HugePages_Surp: 0 Node 1 HugePages_Total: 0 Node 1 HugePages_Free: 0 Node 1 HugePages_Surp: 0 Node 2 HugePages_Total: 8 Node 2 HugePages_Free: 8 Node 2 HugePages_Surp: 0 Node 3 HugePages_Total: 0 Node 3 HugePages_Free: 0 Node 3 HugePages_Surp: 0 Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com> Acked-by: Mel Gorman <mel@csn.ul.ie> Reviewed-by: Andi Kleen <andi@firstfloor.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Nishanth Aravamudan <nacc@us.ibm.com> Cc: David Rientjes <rientjes@google.com> Cc: Adam Litke <agl@us.ibm.com> Cc: Andy Whitcroft <apw@canonical.com> Cc: Eric Whitney <eric.whitney@hp.com> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-12-15 08:53:12 -08:00
..
accessibility
acpi	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-12-11 15:59:23 -08:00
amba
ata	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
atm	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
auxdisplay
base	hugetlb: add per node hstate attributes	2009-12-15 08:53:12 -08:00
block	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
bluetooth	USB: remove the auto_pm flag	2009-12-11 11:55:21 -08:00
cdrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-09 19:03:16 -08:00
char	/dev/mem: remove redundant parameter from do_write_kmem()	2009-12-15 08:53:12 -08:00
clocksource
connector
cpufreq	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
cpuidle
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
edac	x86, msr: Add support for non-contiguous cpumasks	2009-12-11 10:59:21 -08:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-11 15:22:27 -08:00
firmware	firmware_class: make request_firmware_nowait more useful	2009-12-11 11:24:52 -08:00
gpio	mfd: Rename all twl4030_i2c*	2009-12-13 21:23:33 +01:00
gpu	Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-12-11 14:32:49 -08:00
hid	USB: remove the auto_pm flag	2009-12-11 11:55:21 -08:00
hwmon	i2c: Drop I2C_CLIENT_INSMOD_2 to 8	2009-12-14 21:17:27 +01:00
i2c	i2c-core: i2c bus should support PM entries in struct dev_pm_ops	2009-12-14 21:17:30 +01:00
ide	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
input	mfd: Rename all twl4030_i2c*	2009-12-13 21:23:33 +01:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-14 12:33:02 -08:00
leds	Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6	2009-12-12 15:22:22 -08:00
lguest	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
mca
md	md: add 'recovery_start' per-device sysfs attribute	2009-12-14 12:58:57 +11:00
media	V4L/DVB (13592): max2165: 32bit build patch	2009-12-10 12:45:18 -02:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mfd	mfd: Add twl6030 regulator subdevices	2009-12-14 00:26:26 +01:00
misc	i2c: Drop I2C_CLIENT_INSMOD_1	2009-12-14 21:17:26 +01:00
mmc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
mtd	Merge git://git.infradead.org/ubifs-2.6	2009-12-10 09:31:45 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-14 12:33:02 -08:00
nubus
of	Merge commit 'origin/master' into next	2009-12-09 17:14:38 +11:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
parport	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-14 12:33:02 -08:00
platform	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-09 19:57:06 -08:00
pnp	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
power	mfd: Mask and unmask wm8350 IRQs on request and free	2009-12-13 19:21:40 +01:00
pps
ps3
rapidio
regulator	regulator: Add support for twl6030 regulators	2009-12-14 00:26:20 +01:00
rtc	rtc: Add twl6030 RTC support	2009-12-14 00:26:08 +01:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2009-12-11 15:34:40 -08:00
sfi
sh
sn
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2009-12-14 10:22:11 -08:00
ssb
staging	Staging: batman: fix debug Kconfig option	2009-12-11 15:49:27 -08:00
tc
telephony	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
thermal
uio
usb	mfd: Rename all twl4030_i2c*	2009-12-13 21:23:33 +01:00
uwb
video	mfd: Rename all twl4030_i2c*	2009-12-13 21:23:33 +01:00
virtio
vlynq
w1
watchdog	mfd: Rename all twl4030_i2c*	2009-12-13 21:23:33 +01:00
xen	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
zorro
Kconfig
Makefile