From c83f070819735df97a37588caef6ca4df73fa864 Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Thu, 7 Feb 2013 12:26:25 +1100 Subject: [PATCH] memory-hotplug: move pgdat_resize_lock into sparse_remove_one_section() In __remove_section(), we locked pgdat_resize_lock when calling sparse_remove_one_section(). This lock will disable irq. But we don't need to lock the whole function. If we do some work to free pagetables in free_section_usemap(), we need to call flush_tlb_all(), which need irq enabled. Otherwise the WARN_ON_ONCE() in smp_call_function_many() will be triggered. If we lock the whole sparse_remove_one_section(), then we come to this call trace: [ 454.796248] ------------[ cut here ]------------ [ 454.851408] WARNING: at kernel/smp.c:461 smp_call_function_many+0xbd/0x260() [ 454.935620] Hardware name: PRIMEQUEST 1800E ...... [ 455.652201] Call Trace: [ 455.681391] [] warn_slowpath_common+0x7f/0xc0 [ 455.753151] [] ? leave_mm+0x50/0x50 [ 455.814527] [] warn_slowpath_null+0x1a/0x20 [ 455.884208] [] smp_call_function_many+0xbd/0x260 [ 455.959082] [] smp_call_function+0x3b/0x50 [ 456.027722] [] ? leave_mm+0x50/0x50 [ 456.089098] [] on_each_cpu+0x3b/0xc0 [ 456.151512] [] flush_tlb_all+0x1c/0x20 [ 456.216004] [] remove_pagetable+0x14e/0x1d0 [ 456.285683] [] vmemmap_free+0x18/0x20 [ 456.349139] [] sparse_remove_one_section+0xf7/0x100 [ 456.427126] [] __remove_section+0xa2/0xb0 [ 456.494726] [] __remove_pages+0xa0/0xd0 [ 456.560258] [] arch_remove_memory+0x6b/0xc0 [ 456.629937] [] remove_memory+0xb8/0xf0 [ 456.694431] [] acpi_memory_device_remove+0x53/0x96 [ 456.771379] [] acpi_device_remove+0x90/0xb2 [ 456.841059] [] __device_release_driver+0x7c/0xf0 [ 456.915928] [] device_release_driver+0x2f/0x50 [ 456.988719] [] acpi_bus_remove+0x32/0x6d [ 457.055285] [] acpi_bus_trim+0x91/0x102 [ 457.120814] [] acpi_bus_hot_remove_device+0x88/0x16b [ 457.199840] [] acpi_os_execute_deferred+0x27/0x34 [ 457.275756] [] process_one_work+0x20e/0x5c0 [ 457.345434] [] ? process_one_work+0x19f/0x5c0 [ 457.417190] [] ? acpi_os_wait_events_complete+0x23/0x23 [ 457.499332] [] worker_thread+0x12e/0x370 [ 457.565896] [] ? manage_workers+0x180/0x180 [ 457.635574] [] kthread+0xee/0x100 [ 457.694871] [] ? __lock_release+0x129/0x190 [ 457.764552] [] ? __init_kthread_worker+0x70/0x70 [ 457.839427] [] ret_from_fork+0x7c/0xb0 [ 457.903914] [] ? __init_kthread_worker+0x70/0x70 [ 457.978784] ---[ end trace 25e85300f542aa01 ]--- Signed-off-by: Tang Chen Signed-off-by: Lai Jiangshan Signed-off-by: Wen Congyang Acked-by: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Cc: Jiang Liu Cc: Jianguo Wu Cc: Wu Jianguo Cc: Yasuaki Ishimatsu Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton --- mm/memory_hotplug.c | 4 ---- mm/sparse.c | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a15f082668a2..05f5773afa1c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -444,8 +444,6 @@ static int __remove_section(struct zone *zone, struct mem_section *ms) #else static int __remove_section(struct zone *zone, struct mem_section *ms) { - unsigned long flags; - struct pglist_data *pgdat = zone->zone_pgdat; int ret = -EINVAL; if (!valid_section(ms)) @@ -455,9 +453,7 @@ static int __remove_section(struct zone *zone, struct mem_section *ms) if (ret) return ret; - pgdat_resize_lock(pgdat, &flags); sparse_remove_one_section(zone, ms); - pgdat_resize_unlock(pgdat, &flags); return 0; } #endif diff --git a/mm/sparse.c b/mm/sparse.c index 6b5fb762e2ca..66f0fd9d7964 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -796,8 +796,10 @@ static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) void sparse_remove_one_section(struct zone *zone, struct mem_section *ms) { struct page *memmap = NULL; - unsigned long *usemap = NULL; + unsigned long *usemap = NULL, flags; + struct pglist_data *pgdat = zone->zone_pgdat; + pgdat_resize_lock(pgdat, &flags); if (ms->section_mem_map) { usemap = ms->pageblock_flags; memmap = sparse_decode_mem_map(ms->section_mem_map, @@ -805,6 +807,7 @@ void sparse_remove_one_section(struct zone *zone, struct mem_section *ms) ms->section_mem_map = 0; ms->pageblock_flags = NULL; } + pgdat_resize_unlock(pgdat, &flags); clear_hwpoisoned_pages(memmap, PAGES_PER_SECTION); free_section_usemap(memmap, usemap); -- 2.39.5