mm/memory_hotplug: shrink zones when offlining memory
We currently try to shrink a single zone when removing memory. We use the zone of the first page of the memory we are removing. If that memmap was never initialized (e.g., memory was never onlined), we will read garbage and can trigger kernel BUGs (due to a stale pointer): BUG: unable to handle page fault for address: 000000000000353d #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 0 P4D 0 Oops: 0002 [#1] SMP PTI CPU: 1 PID: 7 Comm: kworker/u8:0 Not tainted 5.3.0-rc5-next-20190820+ #317 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.4 Workqueue: kacpi_hotplug acpi_hotplug_work_fn RIP: 0010:clear_zone_contiguous+0x5/0x10 Code: 48 89 c6 48 89 c3 e8 2a fe ff ff 48 85 c0 75 cf 5b 5d c3 c6 85 fd 05 00 00 01 5b 5d c3 0f 1f 840 RSP: 0018:ffffad2400043c98 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000200000000 RCX: 0000000000000000 RDX: 0000000000200000 RSI: 0000000000140000 RDI: 0000000000002f40 RBP: 0000000140000000 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000140000 R13: 0000000000140000 R14: 0000000000002f40 R15: ffff9e3e7aff3680 FS: 0000000000000000(0000) GS:ffff9e3e7bb00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000353d CR3: 0000000058610000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __remove_pages+0x4b/0x640 arch_remove_memory+0x63/0x8d try_remove_memory+0xdb/0x130 __remove_memory+0xa/0x11 acpi_memory_device_remove+0x70/0x100 acpi_bus_trim+0x55/0x90 acpi_device_hotplug+0x227/0x3a0 acpi_hotplug_work_fn+0x1a/0x30 process_one_work+0x221/0x550 worker_thread+0x50/0x3b0 kthread+0x105/0x140 ret_from_fork+0x3a/0x50 Modules linked in: CR2: 000000000000353d Instead, shrink the zones when offlining memory or when onlining failed. Introduce and use remove_pfn_range_from_zone(() for that. We now properly shrink the zones, even if we have DIMMs whereby - Some memory blocks fall into no zone (never onlined) - Some memory blocks fall into multiple zones (offlined+re-onlined) - Multiple memory blocks that fall into different zones Drop the zone parameter (with a potential dubious value) from __remove_pages() and __remove_section(). Link: http://lkml.kernel.org/r/20191006085646.5768-6-david@redhat.com Fixes:f1dd2cd13c
("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible afterd0dc12e86b
] Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> Cc: Michal Hocko <mhocko@suse.com> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: Pavel Tatashin <pasha.tatashin@soleen.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Logan Gunthorpe <logang@deltatee.com> Cc: <stable@vger.kernel.org> [5.0+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5613970af3
commit
feee6b2989
|
@ -1070,7 +1070,6 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct zone *zone;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIXME: Cleanup page tables (also in arch_add_memory() in case
|
* FIXME: Cleanup page tables (also in arch_add_memory() in case
|
||||||
|
@ -1079,7 +1078,6 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
* unplug. ARCH_ENABLE_MEMORY_HOTREMOVE must not be
|
* unplug. ARCH_ENABLE_MEMORY_HOTREMOVE must not be
|
||||||
* unlocked yet.
|
* unlocked yet.
|
||||||
*/
|
*/
|
||||||
zone = page_zone(pfn_to_page(start_pfn));
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -689,9 +689,7 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct zone *zone;
|
|
||||||
|
|
||||||
zone = page_zone(pfn_to_page(start_pfn));
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -151,10 +151,9 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap);
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
__remove_pages(page_zone(page), start_pfn, nr_pages, altmap);
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
|
|
||||||
/* Remove htab bolted mappings for this section of memory */
|
/* Remove htab bolted mappings for this section of memory */
|
||||||
start = (unsigned long)__va(start);
|
start = (unsigned long)__va(start);
|
||||||
|
|
|
@ -292,10 +292,8 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct zone *zone;
|
|
||||||
|
|
||||||
zone = page_zone(pfn_to_page(start_pfn));
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
|
||||||
vmem_remove_mapping(start, size);
|
vmem_remove_mapping(start, size);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_MEMORY_HOTPLUG */
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|
||||||
|
|
|
@ -434,9 +434,7 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = PFN_DOWN(start);
|
unsigned long start_pfn = PFN_DOWN(start);
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct zone *zone;
|
|
||||||
|
|
||||||
zone = page_zone(pfn_to_page(start_pfn));
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_MEMORY_HOTPLUG */
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|
||||||
|
|
|
@ -865,10 +865,8 @@ void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct zone *zone;
|
|
||||||
|
|
||||||
zone = page_zone(pfn_to_page(start_pfn));
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1212,10 +1212,8 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
{
|
{
|
||||||
unsigned long start_pfn = start >> PAGE_SHIFT;
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
||||||
unsigned long nr_pages = size >> PAGE_SHIFT;
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
||||||
struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap);
|
|
||||||
struct zone *zone = page_zone(page);
|
|
||||||
|
|
||||||
__remove_pages(zone, start_pfn, nr_pages, altmap);
|
__remove_pages(start_pfn, nr_pages, altmap);
|
||||||
kernel_physical_mapping_remove(start, start + size);
|
kernel_physical_mapping_remove(start, start + size);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_MEMORY_HOTPLUG */
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|
||||||
|
|
|
@ -122,8 +122,8 @@ static inline bool movable_node_is_enabled(void)
|
||||||
|
|
||||||
extern void arch_remove_memory(int nid, u64 start, u64 size,
|
extern void arch_remove_memory(int nid, u64 start, u64 size,
|
||||||
struct vmem_altmap *altmap);
|
struct vmem_altmap *altmap);
|
||||||
extern void __remove_pages(struct zone *zone, unsigned long start_pfn,
|
extern void __remove_pages(unsigned long start_pfn, unsigned long nr_pages,
|
||||||
unsigned long nr_pages, struct vmem_altmap *altmap);
|
struct vmem_altmap *altmap);
|
||||||
|
|
||||||
/* reasonably generic interface to expand the physical pages */
|
/* reasonably generic interface to expand the physical pages */
|
||||||
extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
|
extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
|
||||||
|
@ -342,6 +342,9 @@ extern int add_memory(int nid, u64 start, u64 size);
|
||||||
extern int add_memory_resource(int nid, struct resource *resource);
|
extern int add_memory_resource(int nid, struct resource *resource);
|
||||||
extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
|
extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
|
||||||
unsigned long nr_pages, struct vmem_altmap *altmap);
|
unsigned long nr_pages, struct vmem_altmap *altmap);
|
||||||
|
extern void remove_pfn_range_from_zone(struct zone *zone,
|
||||||
|
unsigned long start_pfn,
|
||||||
|
unsigned long nr_pages);
|
||||||
extern bool is_memblock_offlined(struct memory_block *mem);
|
extern bool is_memblock_offlined(struct memory_block *mem);
|
||||||
extern int sparse_add_section(int nid, unsigned long pfn,
|
extern int sparse_add_section(int nid, unsigned long pfn,
|
||||||
unsigned long nr_pages, struct vmem_altmap *altmap);
|
unsigned long nr_pages, struct vmem_altmap *altmap);
|
||||||
|
|
|
@ -483,8 +483,9 @@ static void update_pgdat_span(struct pglist_data *pgdat)
|
||||||
pgdat->node_spanned_pages = node_end_pfn - node_start_pfn;
|
pgdat->node_spanned_pages = node_end_pfn - node_start_pfn;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __remove_zone(struct zone *zone, unsigned long start_pfn,
|
void __ref remove_pfn_range_from_zone(struct zone *zone,
|
||||||
unsigned long nr_pages)
|
unsigned long start_pfn,
|
||||||
|
unsigned long nr_pages)
|
||||||
{
|
{
|
||||||
struct pglist_data *pgdat = zone->zone_pgdat;
|
struct pglist_data *pgdat = zone->zone_pgdat;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -499,28 +500,30 @@ static void __remove_zone(struct zone *zone, unsigned long start_pfn,
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
clear_zone_contiguous(zone);
|
||||||
|
|
||||||
pgdat_resize_lock(zone->zone_pgdat, &flags);
|
pgdat_resize_lock(zone->zone_pgdat, &flags);
|
||||||
shrink_zone_span(zone, start_pfn, start_pfn + nr_pages);
|
shrink_zone_span(zone, start_pfn, start_pfn + nr_pages);
|
||||||
update_pgdat_span(pgdat);
|
update_pgdat_span(pgdat);
|
||||||
pgdat_resize_unlock(zone->zone_pgdat, &flags);
|
pgdat_resize_unlock(zone->zone_pgdat, &flags);
|
||||||
|
|
||||||
|
set_zone_contiguous(zone);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __remove_section(struct zone *zone, unsigned long pfn,
|
static void __remove_section(unsigned long pfn, unsigned long nr_pages,
|
||||||
unsigned long nr_pages, unsigned long map_offset,
|
unsigned long map_offset,
|
||||||
struct vmem_altmap *altmap)
|
struct vmem_altmap *altmap)
|
||||||
{
|
{
|
||||||
struct mem_section *ms = __nr_to_section(pfn_to_section_nr(pfn));
|
struct mem_section *ms = __nr_to_section(pfn_to_section_nr(pfn));
|
||||||
|
|
||||||
if (WARN_ON_ONCE(!valid_section(ms)))
|
if (WARN_ON_ONCE(!valid_section(ms)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
__remove_zone(zone, pfn, nr_pages);
|
|
||||||
sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap);
|
sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* __remove_pages() - remove sections of pages from a zone
|
* __remove_pages() - remove sections of pages
|
||||||
* @zone: zone from which pages need to be removed
|
|
||||||
* @pfn: starting pageframe (must be aligned to start of a section)
|
* @pfn: starting pageframe (must be aligned to start of a section)
|
||||||
* @nr_pages: number of pages to remove (must be multiple of section size)
|
* @nr_pages: number of pages to remove (must be multiple of section size)
|
||||||
* @altmap: alternative device page map or %NULL if default memmap is used
|
* @altmap: alternative device page map or %NULL if default memmap is used
|
||||||
|
@ -530,16 +533,14 @@ static void __remove_section(struct zone *zone, unsigned long pfn,
|
||||||
* sure that pages are marked reserved and zones are adjust properly by
|
* sure that pages are marked reserved and zones are adjust properly by
|
||||||
* calling offline_pages().
|
* calling offline_pages().
|
||||||
*/
|
*/
|
||||||
void __remove_pages(struct zone *zone, unsigned long pfn,
|
void __remove_pages(unsigned long pfn, unsigned long nr_pages,
|
||||||
unsigned long nr_pages, struct vmem_altmap *altmap)
|
struct vmem_altmap *altmap)
|
||||||
{
|
{
|
||||||
unsigned long map_offset = 0;
|
unsigned long map_offset = 0;
|
||||||
unsigned long nr, start_sec, end_sec;
|
unsigned long nr, start_sec, end_sec;
|
||||||
|
|
||||||
map_offset = vmem_altmap_offset(altmap);
|
map_offset = vmem_altmap_offset(altmap);
|
||||||
|
|
||||||
clear_zone_contiguous(zone);
|
|
||||||
|
|
||||||
if (check_pfn_span(pfn, nr_pages, "remove"))
|
if (check_pfn_span(pfn, nr_pages, "remove"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -551,13 +552,11 @@ void __remove_pages(struct zone *zone, unsigned long pfn,
|
||||||
cond_resched();
|
cond_resched();
|
||||||
pfns = min(nr_pages, PAGES_PER_SECTION
|
pfns = min(nr_pages, PAGES_PER_SECTION
|
||||||
- (pfn & ~PAGE_SECTION_MASK));
|
- (pfn & ~PAGE_SECTION_MASK));
|
||||||
__remove_section(zone, pfn, pfns, map_offset, altmap);
|
__remove_section(pfn, pfns, map_offset, altmap);
|
||||||
pfn += pfns;
|
pfn += pfns;
|
||||||
nr_pages -= pfns;
|
nr_pages -= pfns;
|
||||||
map_offset = 0;
|
map_offset = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
set_zone_contiguous(zone);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int set_online_page_callback(online_page_callback_t callback)
|
int set_online_page_callback(online_page_callback_t callback)
|
||||||
|
@ -869,6 +868,7 @@ failed_addition:
|
||||||
(unsigned long long) pfn << PAGE_SHIFT,
|
(unsigned long long) pfn << PAGE_SHIFT,
|
||||||
(((unsigned long long) pfn + nr_pages) << PAGE_SHIFT) - 1);
|
(((unsigned long long) pfn + nr_pages) << PAGE_SHIFT) - 1);
|
||||||
memory_notify(MEM_CANCEL_ONLINE, &arg);
|
memory_notify(MEM_CANCEL_ONLINE, &arg);
|
||||||
|
remove_pfn_range_from_zone(zone, pfn, nr_pages);
|
||||||
mem_hotplug_done();
|
mem_hotplug_done();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1628,6 +1628,7 @@ static int __ref __offline_pages(unsigned long start_pfn,
|
||||||
writeback_set_ratelimit();
|
writeback_set_ratelimit();
|
||||||
|
|
||||||
memory_notify(MEM_OFFLINE, &arg);
|
memory_notify(MEM_OFFLINE, &arg);
|
||||||
|
remove_pfn_range_from_zone(zone, start_pfn, nr_pages);
|
||||||
mem_hotplug_done();
|
mem_hotplug_done();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ void memunmap_pages(struct dev_pagemap *pgmap)
|
||||||
|
|
||||||
mem_hotplug_begin();
|
mem_hotplug_begin();
|
||||||
if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
|
if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
|
||||||
__remove_pages(page_zone(first_page), PHYS_PFN(res->start),
|
__remove_pages(PHYS_PFN(res->start),
|
||||||
PHYS_PFN(resource_size(res)), NULL);
|
PHYS_PFN(resource_size(res)), NULL);
|
||||||
} else {
|
} else {
|
||||||
arch_remove_memory(nid, res->start, resource_size(res),
|
arch_remove_memory(nid, res->start, resource_size(res),
|
||||||
|
|
Loading…
Reference in New Issue