From 2acdf7e14bdd709f54cc700256e36698cdfd99ce Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Fri, 9 Nov 2012 14:04:04 +1100 Subject: [PATCH] mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0. If we hot-remove memory only and leave the cpus alive, the corresponding node will not be removed. But the node_start_pfn and node_spanned_pages in pg_data will be reset to 0. In this case, when we hot-add the memory back next time, the node_start_pfn will always be 0 because no pfn is less than 0. After that, if we hot-remove the memory again, it will cause kernel panic in function find_biggest_section_pfn() when it tries to scan all the pfns. The zone will also have the same problem. This patch sets start_pfn to the start_pfn of the section being added when spanned_pages of the zone or pg_data is 0. ---How to reproduce--- 1. hot-add a container with some memory and cpus; 2. hot-remove the container's memory, and leave cpus there; 3. hot-add these memory again; 4. hot-remove them again; then, the kernel will panic. ---Call trace--- [10530.646285] BUG: unable to handle kernel paging request at 00000fff82a8cc38 [10530.729670] IP: [] find_biggest_section_pfn+0xe5/0x180 ...... [10533.064975] Call Trace: [10533.094162] [] ? __remove_zone+0x2f/0x1b0 [10533.161757] [] __remove_zone+0x184/0x1b0 [10533.228318] [] __remove_section+0x8c/0xb0 [10533.295916] [] __remove_pages+0xe7/0x120 [10533.362476] [] arch_remove_memory+0x2c/0x80 [10533.432151] [] remove_memory+0x56/0x90 [10533.496633] [] acpi_memory_device_remove_memory+0x48/0x73 [10533.580846] [] acpi_memory_device_notify+0x153/0x274 [10533.659865] [] ? acpi_bus_get_device+0x2f/0x77 [10533.732653] [] ? acpi_bus_notify+0xb5/0xec [10533.801291] [] acpi_ev_notify_dispatch+0x41/0x5f [10533.876156] [] acpi_os_execute_deferred+0x27/0x34 [10533.952062] [] process_one_work+0x219/0x680 [10534.021736] [] ? process_one_work+0x1b8/0x680 [10534.093488] [] ? acpi_os_wait_events_complete+0x23/0x23 [10534.175622] [] worker_thread+0x12e/0x320 [10534.242181] [] ? manage_workers+0x110/0x110 [10534.311855] [] kthread+0xc6/0xd0 [10534.370111] [] kernel_thread_helper+0x4/0x10 [10534.440824] [] ? retint_restore_args+0x13/0x13 [10534.513612] [] ? __init_kthread_worker+0x70/0x70 [10534.588480] [] ? gs_change+0x13/0x13 ...... [10535.045543] ---[ end trace 96d845dbf33fee11 ]--- Signed-off-by: Tang Chen Cc: Yasuaki Ishimatsu Cc: Wen Congyang Signed-off-by: Andrew Morton --- mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 85f96fb729db..6105b7bcc0ad 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -212,7 +212,7 @@ static void grow_zone_span(struct zone *zone, unsigned long start_pfn, zone_span_writelock(zone); old_zone_end_pfn = zone->zone_start_pfn + zone->spanned_pages; - if (start_pfn < zone->zone_start_pfn) + if (!zone->spanned_pages || start_pfn < zone->zone_start_pfn) zone->zone_start_pfn = start_pfn; zone->spanned_pages = max(old_zone_end_pfn, end_pfn) - @@ -227,7 +227,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, unsigned long old_pgdat_end_pfn = pgdat->node_start_pfn + pgdat->node_spanned_pages; - if (start_pfn < pgdat->node_start_pfn) + if (!pgdat->node_spanned_pages || start_pfn < pgdat->node_start_pfn) pgdat->node_start_pfn = start_pfn; pgdat->node_spanned_pages = max(old_pgdat_end_pfn, end_pfn) - -- 2.39.5