History

mm/hotplug: fix hot remove failure in SPARSEMEM|!VMEMMAP case

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. [akpm@linux-foundation.org: remove unneeded initialization, per David] Fixes: ba72b4c8cf60 ("mm/sparsemem: support sub-section hotplug") Signed-off-by: Baoquan He <bhe@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Wei Yang <richardw.yang@linux.intel.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Mike Rapoport <rppt@linux.ibm.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200307084229.28251-2-bhe@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Baoquan He committed 6 years ago

Commit d41e2f31 parent 7d366651 file · +6 −2Browse files

Unified · Split

mm/sparse.c+6−2
@@ -734,6 +734,7 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, · 733 unmodified lines
734734 struct mem_section *ms = __pfn_to_section(pfn);
735735 bool section_is_early = early_section(ms);
736736 struct page *memmap = NULL;
737+ bool empty;
737738 unsigned long *subsection_map = ms->usage
738739 ? &ms->usage->subsection_map[0] : NULL;
739740
@@ -764,7 +765,8 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, · 24 unmodified lines
764765 * For 2/ and 3/ the SPARSEMEM_VMEMMAP={y,n} cases are unified
765766 */
766767 bitmap_xor(subsection_map, map, subsection_map, SUBSECTIONS_PER_SECTION);
767− if (bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION)) {
768+ empty = bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION);
769+ if (empty) {
768770 unsigned long section_nr = pfn_to_section_nr(pfn);
769771
770772 /*
@@ -779,13 +781,15 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, · 8 unmodified lines
779781 ms->usage = NULL;
780782 }
781783 memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr);
782− ms->section_mem_map = (unsigned long)NULL;
783784 }
784785
785786 if (section_is_early && memmap)
786787 free_map_bootmem(memmap);
787788 else
788789 depopulate_section_memmap(pfn, nr_pages, altmap);
790+
791+ if (empty)
792+ ms->section_mem_map = (unsigned long)NULL;
789793 }
790794
791795 static struct page * __meminit section_activate(int nid, unsigned long pfn,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t