Commit b2f3eebe authored by Tang Chen's avatar Tang Chen Committed by Linus Torvalds
Browse files

x86, numa, acpi, memory-hotplug: make movable_node have higher priority

If users specify the original movablecore=nn@ss boot option, the kernel
will arrange [ss, ss+nn) as ZONE_MOVABLE.  The kernelcore=nn@ss boot
option is similar except it specifies ZONE_NORMAL ranges.

Now, if users specify "movable_node" in kernel commandline, the kernel
will arrange hotpluggable memory in SRAT as ZONE_MOVABLE.  And if users
do this, all the other movablecore=nn@ss and kernelcore=nn@ss options
should be ignored.

For those who don't want this, just specify nothing.  The kernel will
act as before.

Signed-off-by: default avatarTang Chen <>
Signed-off-by: default avatarZhang Yanfei <>
Reviewed-by: default avatarWanpeng Li <>
Cc: "H. Peter Anvin" <>
Cc: "Rafael J . Wysocki" <>
Cc: Chen Tang <>
Cc: Gong Chen <>
Cc: Ingo Molnar <>
Cc: Jiang Liu <>
Cc: Johannes Weiner <>
Cc: Lai Jiangshan <>
Cc: Larry Woodman <>
Cc: Len Brown <>
Cc: Liu Jiang <>
Cc: Mel Gorman <>
Cc: Michal Nazarewicz <>
Cc: Minchan Kim <>
Cc: Prarit Bhargava <>
Cc: Rik van Riel <>
Cc: Taku Izumi <>
Cc: Tejun Heo <>
Cc: Thomas Gleixner <>
Cc: Thomas Renninger <>
Cc: Toshi Kani <>
Cc: Vasilis Liaskovitis <>
Cc: Wen Congyang <>
Cc: Yasuaki Ishimatsu <>
Cc: Yinghai Lu <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 55ac590c
......@@ -5018,9 +5018,33 @@ static void __init find_zone_movable_pfns_for_nodes(void)
nodemask_t saved_node_state = node_states[N_MEMORY];
unsigned long totalpages = early_calculate_totalpages();
int usable_nodes = nodes_weight(node_states[N_MEMORY]);
struct memblock_type *type = &memblock.memory;
/* Need to find movable_zone earlier when movable_node is specified. */
* If movable_node is specified, ignore kernelcore and movablecore
* options.
if (movable_node_is_enabled()) {
for (i = 0; i < type->cnt; i++) {
if (!memblock_is_hotpluggable(&type->regions[i]))
nid = type->regions[i].nid;
usable_startpfn = PFN_DOWN(type->regions[i].base);
zone_movable_pfn[nid] = zone_movable_pfn[nid] ?
min(usable_startpfn, zone_movable_pfn[nid]) :
goto out2;
* If movablecore was specified, calculate what size of
* If movablecore=nn[KMG] was specified, calculate what size of
* kernelcore that corresponds so that memory usable for
* any allocation type is evenly spread. If both kernelcore
* and movablecore are specified, then the value of kernelcore
......@@ -5046,7 +5070,6 @@ static void __init find_zone_movable_pfns_for_nodes(void)
goto out;
/* usable_startpfn is the lowest possible pfn ZONE_MOVABLE can be at */
usable_startpfn = arch_zone_lowest_possible_pfn[movable_zone];
......@@ -5137,6 +5160,7 @@ restart:
if (usable_nodes && required_kernelcore > usable_nodes)
goto restart;
/* Align start of ZONE_MOVABLE on all nids to MAX_ORDER_NR_PAGES */
for (nid = 0; nid < MAX_NUMNODES; nid++)
zone_movable_pfn[nid] =
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment