Subject: + mem-hotplug-introduce-movablenode-boot-option-fix.patch added to -mm tree To: zhangyanfei@xxxxxxxxxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,mingo@xxxxxxxxxx,tangchen@xxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 30 Sep 2013 14:00:35 -0700 The patch titled Subject: mm, memory-hotpulg: rename movablenode boot option to movable_node has been added to the -mm tree. Its filename is mem-hotplug-introduce-movablenode-boot-option-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mem-hotplug-introduce-movablenode-boot-option-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mem-hotplug-introduce-movablenode-boot-option-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Subject: mm, memory-hotpulg: rename movablenode boot option to movable_node Since we already have config MOVABLE_NODE, and the boot option movablenode is introduced as the boot-time switch to disable the effects of CONFIG_MOVABLE_NODE=y when the system is booting. So rename boot option movablenode to movable_node to match the config MOVABLE_NODE. And also updates the description of MOVABLE_NODE in mm/Kconfig and the description of movable_node in kernel doc. Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx> Signed-off-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx> Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/kernel-parameters.txt | 16 ++-------------- mm/Kconfig | 17 ++++++++++++----- mm/memory_hotplug.c | 6 +++--- 3 files changed, 17 insertions(+), 22 deletions(-) diff -puN Documentation/kernel-parameters.txt~mem-hotplug-introduce-movablenode-boot-option-fix Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt~mem-hotplug-introduce-movablenode-boot-option-fix +++ a/Documentation/kernel-parameters.txt @@ -1773,20 +1773,8 @@ bytes respectively. Such letter suffixes that the amount of memory usable for all allocations is not too small. - movablenode [KNL,X86] This parameter enables/disables the - kernel to arrange hotpluggable memory ranges recorded - in ACPI SRAT(System Resource Affinity Table) as - ZONE_MOVABLE. And these memory can be hot-removed when - the system is up. - By specifying this option, all the hotpluggable memory - will be in ZONE_MOVABLE, which the kernel cannot use. - This will cause NUMA performance down. For users who - care about NUMA performance, just don't use it. - If all the memory ranges in the system are hotpluggable, - then the ones used by the kernel at early time, such as - kernel code and data segments, initrd file and so on, - won't be set as ZONE_MOVABLE, and won't be hotpluggable. - Otherwise the kernel won't have enough memory to boot. + movable_node [KNL,X86] Boot-time switch to disable the effects + of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details. MTD_Partition= [MTD] Format: <name>,<region-number>,<size>,<offset> diff -puN mm/Kconfig~mem-hotplug-introduce-movablenode-boot-option-fix mm/Kconfig --- a/mm/Kconfig~mem-hotplug-introduce-movablenode-boot-option-fix +++ a/mm/Kconfig @@ -153,11 +153,18 @@ config MOVABLE_NODE help Allow a node to have only movable memory. Pages used by the kernel, such as direct mapping pages cannot be migrated. So the corresponding - memory device cannot be hotplugged. This option allows users to - online all the memory of a node as movable memory so that the whole - node can be hotplugged. Users who don't use the memory hotplug - feature are fine with this option on since they don't online memory - as movable. + memory device cannot be hotplugged. This option allows the following + two things: + - When the system is booting, node full of hotpluggable memory can + be arranged to have only movable memory so that the whole node can + be hotplugged. (need movable_node boot option specified). + - After the system is up, the option allows users to online all the + memory of a node as movable memory so that the whole node can be + hotplugged. + + Users who don't use the memory hotplug feature are fine with this + option on since they don't specify movable_node boot option or they + don't online memory as movable. Say Y here if you want to hotplug a whole node. Say N here if you want kernel to use memory on all nodes evenly. diff -puN mm/memory_hotplug.c~mem-hotplug-introduce-movablenode-boot-option-fix mm/memory_hotplug.c --- a/mm/memory_hotplug.c~mem-hotplug-introduce-movablenode-boot-option-fix +++ a/mm/memory_hotplug.c @@ -1424,7 +1424,7 @@ static bool can_offline_normal(struct zo } #endif /* CONFIG_MOVABLE_NODE */ -static int __init cmdline_parse_movablenode(char *p) +static int __init cmdline_parse_movable_node(char *p) { #ifdef CONFIG_MOVABLE_NODE /* @@ -1448,11 +1448,11 @@ static int __init cmdline_parse_movablen */ memblock_set_bottom_up(true); #else - pr_warn("movablenode option not supported"); + pr_warn("movable_node option not supported"); #endif return 0; } -early_param("movablenode", cmdline_parse_movablenode); +early_param("movable_node", cmdline_parse_movable_node); /* check which state of node_states will be changed when offline memory */ static void node_states_check_changes_offline(unsigned long nr_pages, _ Patches currently in -mm which might be from zhangyanfei@xxxxxxxxxxxxxx are mm-vmalloc-dont-set-area-caller-twice.patch mm-vmalloc-fix-show-vmap_area-information-race-with-vmap_area-tear-down.patch mm-vmalloc-revert-mm-vmallocc-check-vm_uninitialized-flag-in-s_show-instead-of-show_numa_info.patch revert-mm-vmallocc-emit-the-failure-message-before-return.patch memblock-factor-out-of-top-down-allocation.patch memblock-introduce-bottom-up-allocation-mode.patch x86-mm-factor-out-of-top-down-direct-mapping-setup.patch x86-mem-hotplug-support-initialize-page-tables-in-bottom-up.patch x86-acpi-crash-kdump-do-reserve_crashkernel-after-srat-is-parsed.patch mem-hotplug-introduce-movablenode-boot-option.patch mem-hotplug-introduce-movablenode-boot-option-fix.patch memblock-factor-out-of-top-down-allocation-hack.patch x86-mm-factor-out-of-top-down-direct-mapping-setup-next-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html