From patchwork Thu Aug 8 15:42:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 13757859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0BE6C3DA4A for ; Thu, 8 Aug 2024 15:42:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CA796B00FD; Thu, 8 Aug 2024 11:42:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 873AF6B00FE; Thu, 8 Aug 2024 11:42:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A0396B00FF; Thu, 8 Aug 2024 11:42:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3D3AD6B00FD for ; Thu, 8 Aug 2024 11:42:48 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E9DFB1214A5 for ; Thu, 8 Aug 2024 15:42:47 +0000 (UTC) X-FDA: 82429495974.09.53F2C11 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by imf26.hostedemail.com (Postfix) with ESMTP id 0D786140004 for ; Thu, 8 Aug 2024 15:42:45 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b=wMihBT5K; spf=pass (imf26.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.219.47 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=pass (policy=none) header.from=soleen.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723131700; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wVUhpkOPZqVQX3h1eHDFuE2aZCm6U3+B79UvbkAx6DA=; b=C/AAfwwk5JoI5mG+agVI/LR9GGVa29Vx0ZLz/sCBLzv3rQXCh+ms8GAa30UKJNweBXAwI6 gsp9tuJ0WVhe8/cln1MXAiNf4T1SpPcWPdxfMGESJ6aY92VHrqCKW44ohylzn/01CkScAa YVhFJFtiY0ck9ZzWhgakkiOOWlGZRGQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723131700; a=rsa-sha256; cv=none; b=xuW/ptp88JGs3YN3HxsjH0AbpfAE2uaReoHPT64LdeSLdKPD4qnmMuudFt1eOCGWRevTUH SK0STVo2Ol5SllY4ZXxzoOegsufs1CXyEqyRtZYcZRkIowr/OnqTVisYD3Ao4v49/NxPRt 0txeEVjzyyev5gBjnkO0D/xOyv2EhhA= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=soleen-com.20230601.gappssmtp.com header.s=20230601 header.b=wMihBT5K; spf=pass (imf26.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.219.47 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=pass (policy=none) header.from=soleen.com Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6b7a4668f1fso6934076d6.3 for ; Thu, 08 Aug 2024 08:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723131765; x=1723736565; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wVUhpkOPZqVQX3h1eHDFuE2aZCm6U3+B79UvbkAx6DA=; b=wMihBT5K4vKRx2qNKC4763OLZfb/UAxpw9hCaqzbJAdqwYU5qgojyB/4zip1k8CBPS gL3paAacLz0rzhCCjWMXqnUxaolPOLkF6B8Sbu/4GVa5wY3SeZdCj7zh2/UiZQehosOu kxqHtvrL1/o0wNXiZRenLoJEhrTe7BuiUjCfAAbtYGv51TnK30opAEeqxKlRfg30Yxv3 nIS828oQm2T+1h+ohvjobnSknSrnNsaxzKc5AeqROQ1xgvlrgtVgX/bDTSfwSm3OCjIH 26i45Hi0nq9ybBPOyDjBQQXl73mpB+1//HGM8DcpgRjSLRe4Hv1cTuURADFOkuPuH0Yx L09g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723131765; x=1723736565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wVUhpkOPZqVQX3h1eHDFuE2aZCm6U3+B79UvbkAx6DA=; b=iMDIiaoleyLBikC79gnYpqymkA576wjYxY0YZQ79SxvGfyXFbkSVftVdjEdOTYze1j PPQo+qWJmnFNgMWq5ua2ImTZhNx3H2rXSolsCPxE9S9mrQbl8iT6oEgSjO9TMqFTq0/F Dfd4lkMGAgyS2B1WRa7uU5/349ifNlO100bxhAOPjgmOK5PL0c9JgVwrcYPgkec+EhN1 slKS4hCjXtlqaTGQg2tUIc3+rE2OV5zc+r6FS1O1J2Wv9TmumzOrWPY8IL6Bto1C9vVh veh3lOKzvx1mFWsDJZHTEG5QHLZT1BLWVyTI+m1cobWvbzrPeVVLljc3cM04pQiyA7YK 5r9A== X-Forwarded-Encrypted: i=1; AJvYcCUg7h2MpsI/2f8cavC0qgkkdcpSjYhqVf6MxcQTe6/VFpq5UjK9zT6H4Mp2BXF+m1XQl9hO3G97QuA3x69+wdcGp8Q= X-Gm-Message-State: AOJu0Yw56GD9TTDsZSWshUE3KrgAqcXJH2ASKU4oJUY85iuW+Q0lNXGF btSpOzN0Xvj4RaGfs7w73DxSHwEVU3C/W6AMAu7/izCVdy52LMxsWNjM1UGltqg= X-Google-Smtp-Source: AGHT+IHuyPvu08+JZDwV+1cdjbraCLK1a/zBKaZNVdpIAi6OHbeRHRlv6moOdjtW9Wgi7xkF2vcdiQ== X-Received: by 2002:a05:6214:2f90:b0:6b9:5b0d:8c9b with SMTP id 6a1803df08f44-6bd6bd53e67mr31343756d6.43.1723131764981; Thu, 08 Aug 2024 08:42:44 -0700 (PDT) Received: from soleen.c.googlers.com.com (118.239.150.34.bc.googleusercontent.com. [34.150.239.118]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb9c7b72d9sm67160936d6.60.2024.08.08.08.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 08:42:44 -0700 (PDT) From: Pasha Tatashin To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-cxl@vger.kernel.org, cerasuolodomenico@gmail.com, hannes@cmpxchg.org, j.granados@samsung.com, lizhijian@fujitsu.com, muchun.song@linux.dev, nphamcs@gmail.com, pasha.tatashin@soleen.com, rientjes@google.com, rppt@kernel.org, souravpanda@google.com, vbabka@suse.cz, willy@infradead.org, dan.j.williams@intel.com, yi.zhang@redhat.com, alison.schofield@intel.com, david@redhat.com, yosryahmed@google.com Subject: [PATCH v3 4/4] mm: don't account memmap per-node Date: Thu, 8 Aug 2024 15:42:37 +0000 Message-ID: <20240808154237.220029-5-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240808154237.220029-1-pasha.tatashin@soleen.com> References: <20240808154237.220029-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-Stat-Signature: 5w8symmbnue1ttmruzzkar71z5gjthhw X-Rspamd-Queue-Id: 0D786140004 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1723131765-573260 X-HE-Meta: U2FsdGVkX1/DJ26lCcZk/YKj/xnpGbyv+japldmF2x9VhgTXk2sk1YeoxnXSPPrinq79088Z9NdAPiT6fK79YIiQs7fWkdi5KCihJEqhs3+B9cq556bV+ZizSzhyagEA72A/KbVMs0aKeP91pzxKrpsTFMwj9LFpLf8hJMcEie4Z7k1S4nJOUXu0JG9vK5BQy+mg5LMWonb90piGJbdeSFBIcLIjCF99RzRTL8Q5y+Dapraiy/NXmlb7/0x+SOvwBWCEK+5xefcRQnAODuPre16eZ2E/tc0x/l5MgybgSu2/Uo5nAdHxaYfN2EfWQfpmZRwQgL0ZyFWFy2t6M6O8Q/YF8nltRDpSMzS++IZo2Jybv+U38pbdBZJ/aHQOoe3k6Jc/jLFy1yHx/+Lm7Gn+ACZk9UqtNBYkh15+w/Miv7fNfFJw9ryAFLEdKsVJvZXD3JVG680gM8sT3Z/OaIapk0F1t7myLojPxTJ7Wuo6WRjqPL1TItAQRF1VTYmqI9zKLziDopGpQKIHBaFbZr9V2xBEalKv7M/6iE5as9q8QRRNN0fCDJeF9WBf5KkJUq+87qF3TIuXIlkgpVrEkCgzyB165T2w4mJN3Ahcyssf5dIbgwwLqz8guFpR2/Hsf7zUDFJKFVi6H97vl9LTE3qMHi8g2dkSIDCnOtgcjmDD6ZvAeIFwwYAkjreVj/i7AP59LstFGJmp8jURE838NvjZlOb5jN8zyMvLY+mTK8kQJ60/9hrb8hP+knFcCxt1c8INF9rTnbWe3goZePdqQ/MgWMn/XIxJt5fR/w69YOyqEcUrmHu8GiXRw/9BkXXfLbESHJhVH615epS7HkJIVxQDM9FugBLkTtEYgGs8CngbrLae663gtFaBfVIufYbopcrdrRfHso5CvC7FhQiF07jbgsjUeCmV4w3+CMWZKgtqYQkaCS0AHL7mylOxkUkfYFctJ3d2t+AIYVRM0A2BhnH uz/fB6bJ gf4fXV1DSNEOLffFWr0R+st2HOZStjWQUx4dA68RJ1QeTMHLz5IR0gR/LxJQmgrPdHqRLD8F46b8V75YRv9MfP+OkXecA5eBY7zUnA3SiFi8jY8gK+w407DAHIbxpkYGu/xt3/4gopcgf+O1SriVsXkArQy1SAHwry2Ug4YSM6mj2FDEJN/jSzYAw0dmNeYi2EAytspuo0XY9fbnMsW5QZf1mbvovWCvp/Vxw1plCN9PkYv8DvN8ZpNf5UE9Wogn6rw0lEaZ8e5BqCGR4KQyyFjCxmINbl1+puAZUkoIi4vpHzaZ+CtX2lVF1aK5WTRBCgqmVg1e+TbfvU5q8qLqnsKtf+GDXVtV6kHrEu7/iE/meWbk5S6ZWplmSnHw/tA88Cmp8YJqRNh1zROb9ChBcjAPufsQ8T39rSnkxsM+3ssSiwT/CN2KxVWvzmTzqC2t5AcD9fbmEa/Qb4TWUcF/P534T2C5Cp5+4rypUep3sZhU58gak2OXuP2awEA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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. Reported-by: Yi Zhang Closes: https://lore.kernel.org/linux-cxl/CAHj4cs9Ax1=CoJkgBGP_+sNu6-6=6v=_L-ZBZY0bVLD3wUWZQg@mail.gmail.com Reported-by: Alison Schofield Closes: https://lore.kernel.org/linux-mm/Zq0tPd2h6alFz8XF@aschofie-mobl2/#t Fixes: 15995a352474 ("mm: report per-page metadata information") Signed-off-by: Pasha Tatashin --- include/linux/mmzone.h | 2 -- include/linux/vmstat.h | 7 ++++--- mm/hugetlb_vmemmap.c | 8 ++++---- mm/mm_init.c | 3 +-- mm/page_alloc.c | 1 - mm/page_ext.c | 15 +++++--------- mm/sparse-vmemmap.c | 11 ++++------- mm/sparse.c | 5 ++--- mm/vmstat.c | 45 ++++++++++++++++++++---------------------- 9 files changed, 41 insertions(+), 56 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 41458892bc8a..1dc6248feb83 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -220,8 +220,6 @@ enum node_stat_item { PGDEMOTE_KSWAPD, PGDEMOTE_DIRECT, PGDEMOTE_KHUGEPAGED, - NR_MEMMAP, /* page metadata allocated through buddy allocator */ - NR_MEMMAP_BOOT, /* page metadata allocated through boot allocator */ NR_VM_NODE_STAT_ITEMS }; diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 9ab4fa5e09b5..596c050ed492 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -38,6 +38,8 @@ struct reclaim_stat { enum vm_stat_item { NR_DIRTY_THRESHOLD, NR_DIRTY_BG_THRESHOLD, + NR_MEMMAP, /* page metadata allocated through buddy allocator */ + NR_MEMMAP_BOOT, /* page metadata allocated through boot allocator */ 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)); } -void __meminit mod_node_early_perpage_metadata(int nid, long delta); -void __meminit store_early_perpage_metadata(void); - +void mod_memmap_boot(long delta); +void mod_memmap(long delta); #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 70027869d844..60a5faa1f341 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -185,10 +185,10 @@ static int vmemmap_remap_range(unsigned long start, unsigned long end, static inline void free_vmemmap_page(struct page *page) { if (PageReserved(page)) { - mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1); + mod_memmap_boot(-1); free_bootmem_page(page); } else { - mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1); + mod_memmap(-1); __free_page(page); } } @@ -341,7 +341,7 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end, copy_page(page_to_virt(walk.reuse_page), (void *)walk.reuse_addr); list_add(&walk.reuse_page->lru, vmemmap_pages); - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, 1); + mod_memmap(1); } /* @@ -396,7 +396,7 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end, goto out; list_add(&page->lru, list); } - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages); + mod_memmap(nr_pages); return 0; out: diff --git a/mm/mm_init.c b/mm/mm_init.c index 75c3bd42799b..29677274e74e 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -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", size, pgdat->node_id); pgdat->node_mem_map = map + offset; - mod_node_early_perpage_metadata(pgdat->node_id, - DIV_ROUND_UP(size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(size, PAGE_SIZE)); pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n", __func__, pgdat->node_id, (unsigned long)pgdat, (unsigned long)pgdat->node_mem_map); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 28f80daf5c04..875d76e8684a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5755,7 +5755,6 @@ void __init setup_per_cpu_pageset(void) for_each_online_pgdat(pgdat) pgdat->per_cpu_nodestats = alloc_percpu(struct per_cpu_nodestat); - store_early_perpage_metadata(); } __meminit void zone_pcp_init(struct zone *zone) diff --git a/mm/page_ext.c b/mm/page_ext.c index 962d45eee1f8..a4b485b39330 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -214,8 +214,7 @@ static int __init alloc_node_page_ext(int nid) return -ENOMEM; NODE_DATA(nid)->node_page_ext = base; total_usage += table_size; - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP_BOOT, - DIV_ROUND_UP(table_size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(table_size, PAGE_SIZE)); return 0; } @@ -275,10 +274,8 @@ static void *__meminit alloc_page_ext(size_t size, int nid) else addr = vzalloc_node(size, nid); - if (addr) { - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, - DIV_ROUND_UP(size, PAGE_SIZE)); - } + if (addr) + mod_memmap(DIV_ROUND_UP(size, PAGE_SIZE)); return addr; } @@ -330,14 +327,12 @@ static void free_page_ext(void *addr) if (is_vmalloc_addr(addr)) { page = vmalloc_to_page(addr); pgdat = page_pgdat(page); - mod_node_page_state(pgdat, NR_MEMMAP, - -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); vfree(addr); } else { page = virt_to_page(addr); pgdat = page_pgdat(page); - mod_node_page_state(pgdat, NR_MEMMAP, - -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); BUG_ON(PageReserved(page)); kmemleak_free(addr); free_pages_exact(addr, table_size); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 1dda6c53370b..307f6fe83598 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -469,13 +469,10 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn, if (r < 0) return NULL; - if (system_state == SYSTEM_BOOTING) { - mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(end - start, - PAGE_SIZE)); - } else { - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, - DIV_ROUND_UP(end - start, PAGE_SIZE)); - } + if (system_state == SYSTEM_BOOTING) + mod_memmap_boot(DIV_ROUND_UP(end - start, PAGE_SIZE)); + else + mod_memmap(DIV_ROUND_UP(end - start, PAGE_SIZE)); return pfn_to_page(pfn); } diff --git a/mm/sparse.c b/mm/sparse.c index e4b830091d13..9cc80ba1f7c1 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -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_end = sparsemap_buf + size; #ifndef CONFIG_SPARSEMEM_VMEMMAP - mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(size, PAGE_SIZE)); #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 end = start + nr_pages * sizeof(struct page); - mod_node_page_state(page_pgdat(pfn_to_page(pfn)), NR_MEMMAP, - -1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); vmemmap_free(start, end, altmap); } static void free_map_bootmem(struct page *memmap) diff --git a/mm/vmstat.c b/mm/vmstat.c index 6f8aa4766f16..896f9a2ace8a 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1033,6 +1033,23 @@ unsigned long node_page_state(struct pglist_data *pgdat, } #endif +/* + * Count number of pages "struct page" and "struct page_ext" consume. + * nr_memmap_boot: # of pages allocated by boot allocator & not part of MemTotal + * nr_memmap: # of pages that were allocated by buddy allocator + */ +static atomic_long_t nr_memmap_boot, nr_memmap; + +void mod_memmap_boot(long delta) +{ + atomic_long_add(delta, &nr_memmap_boot); +} + +void mod_memmap(long delta) +{ + atomic_long_add(delta, &nr_memmap); +} + #ifdef CONFIG_COMPACTION struct contig_page_info { @@ -1255,11 +1272,11 @@ const char * const vmstat_text[] = { "pgdemote_kswapd", "pgdemote_direct", "pgdemote_khugepaged", - "nr_memmap", - "nr_memmap_boot", /* system-wide enum vm_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold", + "nr_memmap", + "nr_memmap_boot", #if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) /* enum vm_event_item counters */ @@ -1827,6 +1844,8 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos) global_dirty_limits(v + NR_DIRTY_BG_THRESHOLD, v + NR_DIRTY_THRESHOLD); + v[NR_MEMMAP_BOOT] = atomic_long_read(&nr_memmap_boot); + v[NR_MEMMAP] = atomic_long_read(&nr_memmap); v += NR_VM_STAT_ITEMS; #ifdef CONFIG_VM_EVENT_COUNTERS @@ -2285,25 +2304,3 @@ static int __init extfrag_debug_init(void) module_init(extfrag_debug_init); #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]); - } -}