Skip to content

Commit e84ded0

Browse files
Baoquan Hesmb49
authored andcommitted
mm/hotplug: fix hot remove failure in SPARSEMEM|!VMEMMAP case
BugLink: https://bugs.launchpad.net/bugs/1869061 commit d41e2f3 upstream. In section_deactivate(), pfn_to_page() doesn't work any more after ms->section_mem_map is resetting to NULL in SPARSEMEM|!VMEMMAP case. It causes a hot remove failure: kernel BUG at mm/page_alloc.c:4806! invalid opcode: 0000 [#1] SMP PTI CPU: 3 PID: 8 Comm: kworker/u16:0 Tainted: G W 5.5.0-next-20200205+ #340 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 Workqueue: kacpi_hotplug acpi_hotplug_work_fn RIP: 0010:free_pages+0x85/0xa0 Call Trace: __remove_pages+0x99/0xc0 arch_remove_memory+0x23/0x4d try_remove_memory+0xc8/0x130 __remove_memory+0xa/0x11 acpi_memory_device_remove+0x72/0x100 acpi_bus_trim+0x55/0x90 acpi_device_hotplug+0x2eb/0x3d0 acpi_hotplug_work_fn+0x1a/0x30 process_one_work+0x1a7/0x370 worker_thread+0x30/0x380 kthread+0x112/0x130 ret_from_fork+0x35/0x40 Let's move the ->section_mem_map resetting after depopulate_section_memmap() to fix it. [[email protected]: remove unneeded initialization, per David] Fixes: ba72b4c ("mm/sparsemem: support sub-section hotplug") Signed-off-by: Baoquan He <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Pankaj Gupta <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Wei Yang <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]>
1 parent 86c8665 commit e84ded0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

mm/sparse.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,7 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages,
742742
struct mem_section *ms = __pfn_to_section(pfn);
743743
bool section_is_early = early_section(ms);
744744
struct page *memmap = NULL;
745+
bool empty;
745746
unsigned long *subsection_map = ms->usage
746747
? &ms->usage->subsection_map[0] : NULL;
747748

@@ -772,7 +773,8 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages,
772773
* For 2/ and 3/ the SPARSEMEM_VMEMMAP={y,n} cases are unified
773774
*/
774775
bitmap_xor(subsection_map, map, subsection_map, SUBSECTIONS_PER_SECTION);
775-
if (bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION)) {
776+
empty = bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION);
777+
if (empty) {
776778
unsigned long section_nr = pfn_to_section_nr(pfn);
777779

778780
/*
@@ -787,13 +789,15 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages,
787789
ms->usage = NULL;
788790
}
789791
memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr);
790-
ms->section_mem_map = (unsigned long)NULL;
791792
}
792793

793794
if (section_is_early && memmap)
794795
free_map_bootmem(memmap);
795796
else
796797
depopulate_section_memmap(pfn, nr_pages, altmap);
798+
799+
if (empty)
800+
ms->section_mem_map = (unsigned long)NULL;
797801
}
798802

799803
static struct page * __meminit section_activate(int nid, unsigned long pfn,

0 commit comments

Comments
 (0)