mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 21:54:11 +08:00
mm: don't account memmap per-node
Fix invalid access to pgdat during hot-remove operation:
ndctl users reported a GPF when trying to destroy a namespace:
$ ndctl destroy-namespace all -r all -f
Segmentation fault
dmesg:
Oops: general protection fault, probably for
non-canonical address 0xdffffc0000005650: 0000 [#1] PREEMPT SMP KASAN
PTI
KASAN: probably user-memory-access in range
[0x000000000002b280-0x000000000002b287]
CPU: 26 UID: 0 PID: 1868 Comm: ndctl Not tainted 6.11.0-rc1 #1
Hardware name: Dell Inc. PowerEdge R640/08HT8T, BIOS
2.20.1 09/13/2023
RIP: 0010:mod_node_page_state+0x2a/0x110
cxl-test users report a GPF when trying to unload the test module:
$ modrpobe -r cxl-test
dmesg
BUG: unable to handle page fault for address: 0000000000004200
#PF: supervisor read access in kernel mode
#PF: error_code(0x0000) - not-present page
PGD 0 P4D 0
Oops: Oops: 0000 [#1] PREEMPT SMP PTI
CPU: 0 UID: 0 PID: 1076 Comm: modprobe Tainted: G O N 6.11.0-rc1 #197
Tainted: [O]=OOT_MODULE, [N]=TEST
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/15
RIP: 0010:mod_node_page_state+0x6/0x90
Currently, when memory is hot-plugged or hot-removed the accounting is
done based on the assumption that memmap is allocated from the same node
as the hot-plugged/hot-removed memory, which is not always the case.
In addition, there are challenges with keeping the node id of the memory
that is being remove to the time when memmap accounting is actually
performed: since this is done after remove_pfn_range_from_zone(), and
also after remove_memory_block_devices(). Meaning that we cannot use
pgdat nor walking though memblocks to get the nid.
Given all of that, account the memmap overhead system wide instead.
For this we are going to be using global atomic counters, but given that
memmap size is rarely modified, and normally is only modified either
during early boot when there is only one CPU, or under a hotplug global
mutex lock, therefore there is no need for per-cpu optimizations.
Also, while we are here rename nr_memmap to nr_memmap_pages, and
nr_memmap_boot to nr_memmap_boot_pages to be self explanatory that the
units are in page count.
[pasha.tatashin@soleen.com: address a few nits from David Hildenbrand]
Link: https://lkml.kernel.org/r/20240809191020.1142142-4-pasha.tatashin@soleen.com
Link: https://lkml.kernel.org/r/20240809191020.1142142-4-pasha.tatashin@soleen.com
Link: https://lkml.kernel.org/r/20240808213437.682006-4-pasha.tatashin@soleen.com
Fixes: 15995a3524
("mm: report per-page metadata information")
Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Closes: https://lore.kernel.org/linux-cxl/CAHj4cs9Ax1=CoJkgBGP_+sNu6-6=6v=_L-ZBZY0bVLD3wUWZQg@mail.gmail.com
Reported-by: Alison Schofield <alison.schofield@intel.com>
Closes: https://lore.kernel.org/linux-mm/Zq0tPd2h6alFz8XF@aschofie-mobl2/#t
Tested-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Alison Schofield <alison.schofield@intel.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Fan Ni <fan.ni@samsung.com>
Cc: Joel Granados <j.granados@samsung.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Li Zhijian <lizhijian@fujitsu.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Sourav Panda <souravpanda@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
f4cb78af91
commit
9d85731110
@ -220,8 +220,6 @@ enum node_stat_item {
|
|||||||
PGDEMOTE_KSWAPD,
|
PGDEMOTE_KSWAPD,
|
||||||
PGDEMOTE_DIRECT,
|
PGDEMOTE_DIRECT,
|
||||||
PGDEMOTE_KHUGEPAGED,
|
PGDEMOTE_KHUGEPAGED,
|
||||||
NR_MEMMAP, /* page metadata allocated through buddy allocator */
|
|
||||||
NR_MEMMAP_BOOT, /* page metadata allocated through boot allocator */
|
|
||||||
NR_VM_NODE_STAT_ITEMS
|
NR_VM_NODE_STAT_ITEMS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,6 +38,8 @@ struct reclaim_stat {
|
|||||||
enum vm_stat_item {
|
enum vm_stat_item {
|
||||||
NR_DIRTY_THRESHOLD,
|
NR_DIRTY_THRESHOLD,
|
||||||
NR_DIRTY_BG_THRESHOLD,
|
NR_DIRTY_BG_THRESHOLD,
|
||||||
|
NR_MEMMAP_PAGES, /* page metadata allocated through buddy allocator */
|
||||||
|
NR_MEMMAP_BOOT_PAGES, /* page metadata allocated through boot allocator */
|
||||||
NR_VM_STAT_ITEMS,
|
NR_VM_STAT_ITEMS,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -618,7 +620,6 @@ static inline void lruvec_stat_sub_folio(struct folio *folio,
|
|||||||
lruvec_stat_mod_folio(folio, idx, -folio_nr_pages(folio));
|
lruvec_stat_mod_folio(folio, idx, -folio_nr_pages(folio));
|
||||||
}
|
}
|
||||||
|
|
||||||
void __meminit mod_node_early_perpage_metadata(int nid, long delta);
|
void memmap_boot_pages_add(long delta);
|
||||||
void __meminit store_early_perpage_metadata(void);
|
void memmap_pages_add(long delta);
|
||||||
|
|
||||||
#endif /* _LINUX_VMSTAT_H */
|
#endif /* _LINUX_VMSTAT_H */
|
||||||
|
@ -185,11 +185,11 @@ static int vmemmap_remap_range(unsigned long start, unsigned long end,
|
|||||||
static inline void free_vmemmap_page(struct page *page)
|
static inline void free_vmemmap_page(struct page *page)
|
||||||
{
|
{
|
||||||
if (PageReserved(page)) {
|
if (PageReserved(page)) {
|
||||||
|
memmap_boot_pages_add(-1);
|
||||||
free_bootmem_page(page);
|
free_bootmem_page(page);
|
||||||
mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1);
|
|
||||||
} else {
|
} else {
|
||||||
|
memmap_pages_add(-1);
|
||||||
__free_page(page);
|
__free_page(page);
|
||||||
mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -341,7 +341,7 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end,
|
|||||||
copy_page(page_to_virt(walk.reuse_page),
|
copy_page(page_to_virt(walk.reuse_page),
|
||||||
(void *)walk.reuse_addr);
|
(void *)walk.reuse_addr);
|
||||||
list_add(&walk.reuse_page->lru, vmemmap_pages);
|
list_add(&walk.reuse_page->lru, vmemmap_pages);
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, 1);
|
memmap_pages_add(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -396,7 +396,7 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end,
|
|||||||
goto out;
|
goto out;
|
||||||
list_add(&page->lru, list);
|
list_add(&page->lru, list);
|
||||||
}
|
}
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages);
|
memmap_pages_add(nr_pages);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
out:
|
out:
|
||||||
|
@ -1623,8 +1623,7 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat)
|
|||||||
panic("Failed to allocate %ld bytes for node %d memory map\n",
|
panic("Failed to allocate %ld bytes for node %d memory map\n",
|
||||||
size, pgdat->node_id);
|
size, pgdat->node_id);
|
||||||
pgdat->node_mem_map = map + offset;
|
pgdat->node_mem_map = map + offset;
|
||||||
mod_node_early_perpage_metadata(pgdat->node_id,
|
memmap_boot_pages_add(DIV_ROUND_UP(size, PAGE_SIZE));
|
||||||
DIV_ROUND_UP(size, PAGE_SIZE));
|
|
||||||
pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n",
|
pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n",
|
||||||
__func__, pgdat->node_id, (unsigned long)pgdat,
|
__func__, pgdat->node_id, (unsigned long)pgdat,
|
||||||
(unsigned long)pgdat->node_mem_map);
|
(unsigned long)pgdat->node_mem_map);
|
||||||
|
@ -5755,7 +5755,6 @@ void __init setup_per_cpu_pageset(void)
|
|||||||
for_each_online_pgdat(pgdat)
|
for_each_online_pgdat(pgdat)
|
||||||
pgdat->per_cpu_nodestats =
|
pgdat->per_cpu_nodestats =
|
||||||
alloc_percpu(struct per_cpu_nodestat);
|
alloc_percpu(struct per_cpu_nodestat);
|
||||||
store_early_perpage_metadata();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__meminit void zone_pcp_init(struct zone *zone)
|
__meminit void zone_pcp_init(struct zone *zone)
|
||||||
|
@ -214,8 +214,7 @@ static int __init alloc_node_page_ext(int nid)
|
|||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
NODE_DATA(nid)->node_page_ext = base;
|
NODE_DATA(nid)->node_page_ext = base;
|
||||||
total_usage += table_size;
|
total_usage += table_size;
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP_BOOT,
|
memmap_boot_pages_add(DIV_ROUND_UP(table_size, PAGE_SIZE));
|
||||||
DIV_ROUND_UP(table_size, PAGE_SIZE));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -275,10 +274,8 @@ static void *__meminit alloc_page_ext(size_t size, int nid)
|
|||||||
else
|
else
|
||||||
addr = vzalloc_node(size, nid);
|
addr = vzalloc_node(size, nid);
|
||||||
|
|
||||||
if (addr) {
|
if (addr)
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP,
|
memmap_pages_add(DIV_ROUND_UP(size, PAGE_SIZE));
|
||||||
DIV_ROUND_UP(size, PAGE_SIZE));
|
|
||||||
}
|
|
||||||
|
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
@ -323,25 +320,18 @@ static void free_page_ext(void *addr)
|
|||||||
{
|
{
|
||||||
size_t table_size;
|
size_t table_size;
|
||||||
struct page *page;
|
struct page *page;
|
||||||
struct pglist_data *pgdat;
|
|
||||||
|
|
||||||
table_size = page_ext_size * PAGES_PER_SECTION;
|
table_size = page_ext_size * PAGES_PER_SECTION;
|
||||||
|
memmap_pages_add(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE)));
|
||||||
|
|
||||||
if (is_vmalloc_addr(addr)) {
|
if (is_vmalloc_addr(addr)) {
|
||||||
page = vmalloc_to_page(addr);
|
|
||||||
pgdat = page_pgdat(page);
|
|
||||||
vfree(addr);
|
vfree(addr);
|
||||||
} else {
|
} else {
|
||||||
page = virt_to_page(addr);
|
page = virt_to_page(addr);
|
||||||
pgdat = page_pgdat(page);
|
|
||||||
BUG_ON(PageReserved(page));
|
BUG_ON(PageReserved(page));
|
||||||
kmemleak_free(addr);
|
kmemleak_free(addr);
|
||||||
free_pages_exact(addr, table_size);
|
free_pages_exact(addr, table_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
mod_node_page_state(pgdat, NR_MEMMAP,
|
|
||||||
-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE)));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __free_page_ext(unsigned long pfn)
|
static void __free_page_ext(unsigned long pfn)
|
||||||
|
@ -469,13 +469,10 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,
|
|||||||
if (r < 0)
|
if (r < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (system_state == SYSTEM_BOOTING) {
|
if (system_state == SYSTEM_BOOTING)
|
||||||
mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(end - start,
|
memmap_boot_pages_add(DIV_ROUND_UP(end - start, PAGE_SIZE));
|
||||||
PAGE_SIZE));
|
else
|
||||||
} else {
|
memmap_pages_add(DIV_ROUND_UP(end - start, PAGE_SIZE));
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP,
|
|
||||||
DIV_ROUND_UP(end - start, PAGE_SIZE));
|
|
||||||
}
|
|
||||||
|
|
||||||
return pfn_to_page(pfn);
|
return pfn_to_page(pfn);
|
||||||
}
|
}
|
||||||
|
@ -463,7 +463,7 @@ static void __init sparse_buffer_init(unsigned long size, int nid)
|
|||||||
sparsemap_buf = memmap_alloc(size, section_map_size(), addr, nid, true);
|
sparsemap_buf = memmap_alloc(size, section_map_size(), addr, nid, true);
|
||||||
sparsemap_buf_end = sparsemap_buf + size;
|
sparsemap_buf_end = sparsemap_buf + size;
|
||||||
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
||||||
mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(size, PAGE_SIZE));
|
memmap_boot_pages_add(DIV_ROUND_UP(size, PAGE_SIZE));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -643,8 +643,7 @@ static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages,
|
|||||||
unsigned long start = (unsigned long) pfn_to_page(pfn);
|
unsigned long start = (unsigned long) pfn_to_page(pfn);
|
||||||
unsigned long end = start + nr_pages * sizeof(struct page);
|
unsigned long end = start + nr_pages * sizeof(struct page);
|
||||||
|
|
||||||
mod_node_page_state(page_pgdat(pfn_to_page(pfn)), NR_MEMMAP,
|
memmap_pages_add(-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE)));
|
||||||
-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE)));
|
|
||||||
vmemmap_free(start, end, altmap);
|
vmemmap_free(start, end, altmap);
|
||||||
}
|
}
|
||||||
static void free_map_bootmem(struct page *memmap)
|
static void free_map_bootmem(struct page *memmap)
|
||||||
|
46
mm/vmstat.c
46
mm/vmstat.c
@ -1033,6 +1033,24 @@ unsigned long node_page_state(struct pglist_data *pgdat,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Count number of pages "struct page" and "struct page_ext" consume.
|
||||||
|
* nr_memmap_boot_pages: # of pages allocated by boot allocator
|
||||||
|
* nr_memmap_pages: # of pages that were allocated by buddy allocator
|
||||||
|
*/
|
||||||
|
static atomic_long_t nr_memmap_boot_pages = ATOMIC_LONG_INIT(0);
|
||||||
|
static atomic_long_t nr_memmap_pages = ATOMIC_LONG_INIT(0);
|
||||||
|
|
||||||
|
void memmap_boot_pages_add(long delta)
|
||||||
|
{
|
||||||
|
atomic_long_add(delta, &nr_memmap_boot_pages);
|
||||||
|
}
|
||||||
|
|
||||||
|
void memmap_pages_add(long delta)
|
||||||
|
{
|
||||||
|
atomic_long_add(delta, &nr_memmap_pages);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_COMPACTION
|
#ifdef CONFIG_COMPACTION
|
||||||
|
|
||||||
struct contig_page_info {
|
struct contig_page_info {
|
||||||
@ -1255,11 +1273,11 @@ const char * const vmstat_text[] = {
|
|||||||
"pgdemote_kswapd",
|
"pgdemote_kswapd",
|
||||||
"pgdemote_direct",
|
"pgdemote_direct",
|
||||||
"pgdemote_khugepaged",
|
"pgdemote_khugepaged",
|
||||||
"nr_memmap",
|
|
||||||
"nr_memmap_boot",
|
|
||||||
/* system-wide enum vm_stat_item counters */
|
/* system-wide enum vm_stat_item counters */
|
||||||
"nr_dirty_threshold",
|
"nr_dirty_threshold",
|
||||||
"nr_dirty_background_threshold",
|
"nr_dirty_background_threshold",
|
||||||
|
"nr_memmap_pages",
|
||||||
|
"nr_memmap_boot_pages",
|
||||||
|
|
||||||
#if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG)
|
#if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG)
|
||||||
/* enum vm_event_item counters */
|
/* enum vm_event_item counters */
|
||||||
@ -1827,6 +1845,8 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
|
|||||||
|
|
||||||
global_dirty_limits(v + NR_DIRTY_BG_THRESHOLD,
|
global_dirty_limits(v + NR_DIRTY_BG_THRESHOLD,
|
||||||
v + NR_DIRTY_THRESHOLD);
|
v + NR_DIRTY_THRESHOLD);
|
||||||
|
v[NR_MEMMAP_PAGES] = atomic_long_read(&nr_memmap_pages);
|
||||||
|
v[NR_MEMMAP_BOOT_PAGES] = atomic_long_read(&nr_memmap_boot_pages);
|
||||||
v += NR_VM_STAT_ITEMS;
|
v += NR_VM_STAT_ITEMS;
|
||||||
|
|
||||||
#ifdef CONFIG_VM_EVENT_COUNTERS
|
#ifdef CONFIG_VM_EVENT_COUNTERS
|
||||||
@ -2285,25 +2305,3 @@ static int __init extfrag_debug_init(void)
|
|||||||
module_init(extfrag_debug_init);
|
module_init(extfrag_debug_init);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* Page metadata size (struct page and page_ext) in pages
|
|
||||||
*/
|
|
||||||
static unsigned long early_perpage_metadata[MAX_NUMNODES] __meminitdata;
|
|
||||||
|
|
||||||
void __meminit mod_node_early_perpage_metadata(int nid, long delta)
|
|
||||||
{
|
|
||||||
early_perpage_metadata[nid] += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __meminit store_early_perpage_metadata(void)
|
|
||||||
{
|
|
||||||
int nid;
|
|
||||||
struct pglist_data *pgdat;
|
|
||||||
|
|
||||||
for_each_online_pgdat(pgdat) {
|
|
||||||
nid = pgdat->node_id;
|
|
||||||
mod_node_page_state(NODE_DATA(nid), NR_MEMMAP_BOOT,
|
|
||||||
early_perpage_metadata[nid]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user