Commit 9fd61bc9 authored by Masayoshi Mizuma's avatar Masayoshi Mizuma Committed by Linus Torvalds

Revert "x86/e820: put !E820_TYPE_RAM regions into memblock.reserved"

commit 124049de ("x86/e820: put !E820_TYPE_RAM regions into
memblock.reserved") breaks movable_node kernel option because it changed
the memory gap range to reserved memblock.  So, the node is marked as
Normal zone even if the SRAT has Hot pluggable affinity.

    kernel: BIOS-e820: [mem 0x0000180000000000-0x0000180fffffffff] usable
    kernel: BIOS-e820: [mem 0x00001c0000000000-0x00001c0fffffffff] usable
    kernel: reserved[0x12]#011[0x0000181000000000-0x00001bffffffffff], 0x000003f000000000 bytes flags: 0x0
    kernel: ACPI: SRAT: Node 2 PXM 6 [mem 0x180000000000-0x1bffffffffff] hotplug
    kernel: ACPI: SRAT: Node 3 PXM 7 [mem 0x1c0000000000-0x1fffffffffff] hotplug
    kernel: Movable zone start for each node
    kernel:  Node 3: 0x00001c0000000000
    kernel: Early memory node ranges

The original issue is fixed by the former patches, so let's revert commit
124049de ("x86/e820: put !E820_TYPE_RAM regions into

Link: default avatarMasayoshi Mizuma <>
Reviewed-by: default avatarPavel Tatashin <>
Acked-by: Ingo Molnar's avatarIngo Molnar <>
Cc: Naoya Horiguchi <>
Cc: Michal Hocko <>
Cc: Thomas Gleixner <>
Cc: Oscar Salvador <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent ec393a0f
......@@ -1248,7 +1248,6 @@ void __init e820__memblock_setup(void)
int i;
u64 end;
u64 addr = 0;
* The bootstrap memblock region count maximum is 128 entries
......@@ -1265,21 +1264,13 @@ void __init e820__memblock_setup(void)
struct e820_entry *entry = &e820_table->entries[i];
end = entry->addr + entry->size;
if (addr < entry->addr)
memblock_reserve(addr, entry->addr - addr);
addr = end;
if (end != (resource_size_t)end)
* all !E820_TYPE_RAM ranges (including gap ranges) are put
* into memblock.reserved to make sure that struct pages in
* such regions are not left uninitialized after bootup.
if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN)
memblock_reserve(entry->addr, entry->size);
memblock_add(entry->addr, entry->size);
memblock_add(entry->addr, entry->size);
/* Throw away partial pages: */
Markdown is supported
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