From patchwork Wed Feb 14 22:57:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sourav Panda X-Patchwork-Id: 13557160 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 2BF7AC48BEB for ; Wed, 14 Feb 2024 22:57:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA0A18D001A; Wed, 14 Feb 2024 17:57:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B1E68D000E; Wed, 14 Feb 2024 17:57:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7DE778D001A; Wed, 14 Feb 2024 17:57:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 616F48D000E for ; Wed, 14 Feb 2024 17:57:47 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 34842A195B for ; Wed, 14 Feb 2024 22:57:47 +0000 (UTC) X-FDA: 81791923374.07.048FB54 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf13.hostedemail.com (Postfix) with ESMTP id 98DFD2000F for ; Wed, 14 Feb 2024 22:57:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qiu3HBu3; spf=pass (imf13.hostedemail.com: domain of 3aEXNZQsKCF0NJPM5QK5I85BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--souravpanda.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3aEXNZQsKCF0NJPM5QK5I85BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707951465; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q5tuMVa23w+EN0Z93Q/a58TxZA4V65w3/v12kr+XirU=; b=Rie1lnrmcFWdchBVTgcLWrrFSopxdk4xO9rufrqjCjaJClRlbum9HlvsJPz7SAKvNDMFvU JSHua0rHrMqgfBvrMLo0AL7GoLGWkbmacvBibtpWMEE3DAv4nj9xi9ddNXSa4oBp3AwtO+ Mo7QwrwDON/3asuF5d6Q+9rJKwYeEk0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707951465; a=rsa-sha256; cv=none; b=sggSGBScP8MaFgAHzCp1ODvo+ikz94eTPYm0ZvqM99Mn/xh8iMQFw+fJq6sKyI4SmjUtye LIQse5Qy7xUlb4DwBcpnR8cmSe++Doo8wTr3g89513fFcmN1f6jo5EAP3iO8QtYKfA+TW7 Jo/qmRlSmeDi8dXrpYSQ6TqEl5EoRbg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qiu3HBu3; spf=pass (imf13.hostedemail.com: domain of 3aEXNZQsKCF0NJPM5QK5I85BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--souravpanda.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3aEXNZQsKCF0NJPM5QK5I85BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-607d0f1860cso9647b3.0 for ; Wed, 14 Feb 2024 14:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707951465; x=1708556265; darn=kvack.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=q5tuMVa23w+EN0Z93Q/a58TxZA4V65w3/v12kr+XirU=; b=qiu3HBu3bgy6V2w0/MgsFxBv/qxvTe73js30dQSQAdKSKJqnYn8oqu/qwn1oWFjB8e LKQRa88ZCD89d5L7Q64c+poDPXg+ismrq6My6z5LVDXxZSNoxob5cLWDIS1pUkGFxbL7 sQyj124ytMTQ6pjyz4ISYHWaggax2KdQ44IQPgzO1pWmzJedipqbXePTEzlhg6f83LjK uK88sb5rL6P8drX+XDh0taI8GvE1NF14t96AhKYLUXNMbHgsYmF7g9pTPSNkyn0yxudH wb6afCbbsueENru0l+DOf6gglIWuGYPdkMo1eHsxccZipmM/HAY5DvnyL3k85k5k35wU C0FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707951465; x=1708556265; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q5tuMVa23w+EN0Z93Q/a58TxZA4V65w3/v12kr+XirU=; b=OFeVD0DZqkzltZANDH/i3nuY+U5n5CN89hl6JYnufr8Bw3g0GV1DYET8a11q5Z9zdh Tr+oldsznv/SgtR8cKVSr7CjNPwwJ9Jh6oX0DMNXBOrT5/f2izGbDJvCtZRRK4sjZ8MD b+MTbyNY7MSwKNSWnKv81390xgt2+RAmshPKn6DaC6fus+/jrMx5UJ7axuAOdis66wgf kiSmtgR9MXkIFTjct/T4L9x5MjObhTjhWHY2HeGOmRWApzsfUpopRSQquqJJPayqxxoS w/Roumdd4SMU/e0d97mTNZw0vf71j2yTlEAc8WuYMKOgUxHUBHqQNg4MxzyD/lTNYWAn KQBA== X-Forwarded-Encrypted: i=1; AJvYcCUHAlXOfIoDD2Q9BHZAbJ+wfxiE5bzYW4zqJVpprl5mCRX0GmelFPes6w+AymY6HwZn8C5fHGI3uKOPAQqrnBVnCgM= X-Gm-Message-State: AOJu0YzuyPLXgJOcYPn2hJ1Zb0Gb4vEFV19ev8NBnY4odNuRg1+Dm9g8 UJB9FJRu3ViksyuUWuImuUayMKqPcTEd9RPzGfZlvXuoxzbqiqs0PmDo4EB3a7ARHgvkOopesZg OJ8LXwsGdeIaCY+fHt4NWlQ== X-Google-Smtp-Source: AGHT+IEe5ab+3yqvyznupIwZkYyYXYgMVwwLCB3zCk2/lLKCBQL54ziix1gXQB1B5slIsWyY0E20Q5+wvSGqRTa3kw== X-Received: from souravpanda.svl.corp.google.com ([2620:15c:2a3:200:b4ba:86fe:7d36:2fb0]) (user=souravpanda job=sendgmr) by 2002:a25:cec3:0:b0:dc7:48ce:d17f with SMTP id x186-20020a25cec3000000b00dc748ced17fmr843388ybe.10.1707951464722; Wed, 14 Feb 2024 14:57:44 -0800 (PST) Date: Wed, 14 Feb 2024 14:57:40 -0800 In-Reply-To: <20240214225741.403783-1-souravpanda@google.com> Mime-Version: 1.0 References: <20240214225741.403783-1-souravpanda@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240214225741.403783-2-souravpanda@google.com> Subject: [PATCH v8 1/1] mm: report per-page metadata information From: Sourav Panda To: corbet@lwn.net, gregkh@linuxfoundation.org, rafael@kernel.org, akpm@linux-foundation.org, mike.kravetz@oracle.com, muchun.song@linux.dev, rppt@kernel.org, david@redhat.com, rdunlap@infradead.org, chenlinxuan@uniontech.com, yang.yang29@zte.com.cn, souravpanda@google.com, tomas.mudrunka@gmail.com, bhelgaas@google.com, ivan@cloudflare.com, pasha.tatashin@soleen.com, yosryahmed@google.com, hannes@cmpxchg.org, shakeelb@google.com, kirill.shutemov@linux.intel.com, wangkefeng.wang@huawei.com, adobriyan@gmail.com, vbabka@suse.cz, Liam.Howlett@Oracle.com, surenb@google.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, weixugc@google.com X-Rspamd-Queue-Id: 98DFD2000F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: dqgz74cf48ze3wzoxjfyduhpamunagct X-HE-Tag: 1707951465-308743 X-HE-Meta: U2FsdGVkX191BuI5bN0Hokyw2QNbGB5EQl/WSFgXlioyMLEiU4VErJUpQLL4pe9mFDze78LKIzicIlnImEn3/QCJ5k84E6az/HyfwXSNrF5mvAFQhO4UjLyBFQbYWZjgJCLqRZm54yzC00z4YbY1hUQpc8tF0mD2didQw7LOF2OSU4vCltAEflzibG8sKMXWuu6ca6LjIoy9KUrRWCuKY7O+Vr2gc1W9sgGygt2L1L4Ki2OFzRjwjCZKXjCIKVclJikFRzwhdEnzqBTUQxCq91dqlKN7xL+GB0PgeGN43VcgyI0PhO/x5MgScraqFa1xVQ/RmXgZcdtmmAhvEO17QVe869y9zUnFO/2KCQbmeW5x1B1pFvvP76JRTG2Iz0TCJOnurmSMXiC9EaoZkgO72FpyeULyk7gpgR4+5jHvklZdphAYaaLcQmVaZw3Xq+BqWJf3NxiFqsqp0AJKSRLapGe5+/zApwOBiDXmtqoPM2cuYA9nR6yHSxrHBdqUW+QtsBckYltKGMR5QixTnvH/fdKVvYYzD9TyCONja4XYUrVbX+2y1ftOHrCEdRNAJ9b8m3317fdqYbFXz5akWdbRThhZsxTltkgn4ZcyZX0qG7hGsd6hKZmQn630QmPs2U27y9MUaHZX0AIiJvb8y8OsX+Q9HPrk4+zHYX+TTrcyaelPj9N5ZyygEdtjnZACnp08hDNGJnzVYyR3hendv+sggRrPQZQ/mdAoVtr1dKRci0qWF2WJqu35TDYvbmelkiwHz6iyDi5zpX/IaXZpLl6KOE4IDuuH8Z2bVBizE4FH0SCT9xkOlk0ApLAVcJLg9YpmVK+3N8Gc6a6IqCOy0DtpAG3kVLpJGrbZMQQ6BQKTU5fCYwy2HxqvWtSXpej3wSCgY2iQLSVI2FKbsRC75t3hWmnWYT2znfn8ific88ynB/y9r8fk8YziguAqWPqT9SeXwoR1dMIHr3ytUbSQ0PB tcUnwmvC ldJbBV7FPc+lBbLyUepkSxgxwTXos7WvBxhF29SoqLD9d01Whv02erPSAu1jSShweWx+mbhPDGH7i/r1iq0J9tIkw8YlQ65Bivv0zof7Ect241F9ZtO+/wB0sTbPOeEWttYrTbJ9A58Ud2HKRS/L+PRNo1JFE+9RNLliJyDg+zXP0DRVYOTjDOm/qLgzha7WIzuZcz2nybD05zna5D9o9V9bTeRayUiKb9j9Utp+RpzJKyAd+jZkn63NvcpM2+aS4E46JXco72zKHS/zEVPLXICOzCpozsK298ULoaeQk8KYR2d5Nh7eP8JezM3bex+O3xCpS6B2UCo2+JRvNrw2spBk6yul9aaIyybF3t9hZwwADvs59uup2DGfAUgeJtVKTyw2+ud27UpOBR7eU5k7ucjnH9rQarOC1p0MkpqqsR//4RxsYf1fnYQjbzioKzjb9DkXbUzXS/A0KVkI= 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: Adds two new per-node fields, namely nr_memmap and nr_memmap_boot, to /sys/devices/system/node/nodeN/vmstat and a global Memmap field to /proc/meminfo. This information can be used by users to see how much memory is being used by per-page metadata, which can vary depending on build configuration, machine architecture, and system use. Per-page metadata is the amount of memory that Linux needs in order to manage memory at the page granularity. The majority of such memory is used by "struct page" and "page_ext" data structures. In contrast to most other memory consumption statistics, per-page metadata might not be included in MemTotal. For example, MemTotal does not include memblock allocations but includes buddy allocations. In this patch, exported field nr_memmap in /sys/devices/system/node/nodeN/vmstat would exclusively track buddy allocations while nr_memmap_boot would exclusively track memblock allocations. Furthermore, Memmap in /proc/meminfo would exclusively track buddy allocations allowing it to be compared against MemTotal. This memory depends on build configurations, machine architectures, and the way system is used: Build configuration may include extra fields into "struct page", and enable / disable "page_ext" Machine architecture defines base page sizes. For example 4K x86, 8K SPARC, 64K ARM64 (optionally), etc. The per-page metadata overhead is smaller on machines with larger page sizes. System use can change per-page overhead by using vmemmap optimizations with hugetlb pages, and emulated pmem devdax pages. Also, boot parameters can determine whether page_ext is needed to be allocated. This memory can be part of MemTotal or be outside MemTotal depending on whether the memory was hot-plugged, booted with, or hugetlb memory was returned back to the system. Utility for userspace: Application Optimization: Depending on the kernel version and command line options, the kernel would relinquish a different number of pages (that contain struct pages) when a hugetlb page is reserved (e.g., 0, 6 or 7 for a 2MB hugepage). The userspace application would want to know the exact savings achieved through page metadata deallocation without dealing with the intricacies of the kernel. Observability: Struct page overhead can only be calculated on-paper at boot time (e.g., 1.5% machine capacity). Beyond boot once hugepages are reserved or memory is hotplugged, the computation becomes complex. Per-page metrics will help explain part of the system memory overhead, which shall help guide memory optimizations and memory cgroup sizing. Debugging: Tracking the changes or absolute value in struct pages can help detect anomalies as they can be correlated with other metrics in the machine (e.g., memtotal, number of huge pages, etc). page_ext overheads: Some kernel features such as page_owner page_table_check that use page_ext can be optionally enabled via kernel parameters. Having the total per-page metadata information helps users precisely measure impact. Suggested-by: Pasha Tatashin Signed-off-by: Sourav Panda --- Documentation/filesystems/proc.rst | 3 +++ fs/proc/meminfo.c | 4 ++++ include/linux/mmzone.h | 4 ++++ include/linux/vmstat.h | 4 ++++ mm/hugetlb_vmemmap.c | 17 ++++++++++++---- mm/mm_init.c | 3 +++ mm/page_alloc.c | 1 + mm/page_ext.c | 32 +++++++++++++++++++++--------- mm/sparse-vmemmap.c | 8 ++++++++ mm/sparse.c | 7 ++++++- mm/vmstat.c | 26 +++++++++++++++++++++++- 11 files changed, 94 insertions(+), 15 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 104c6d047d9b..c9b4de65f162 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -993,6 +993,7 @@ Example output. You may not have all of these fields. AnonPages: 4654780 kB Mapped: 266244 kB Shmem: 9976 kB + Memmap: 513419 kB KReclaimable: 517708 kB Slab: 660044 kB SReclaimable: 517708 kB @@ -1095,6 +1096,8 @@ Mapped files which have been mmapped, such as libraries Shmem Total memory used by shared memory (shmem) and tmpfs +Memmap + Memory used for per-page metadata KReclaimable Kernel allocations that the kernel will attempt to reclaim under memory pressure. Includes SReclaimable (below), and other diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 45af9a989d40..b81103527f1e 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -39,6 +39,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) long available; unsigned long pages[NR_LRU_LISTS]; unsigned long sreclaimable, sunreclaim; + unsigned long nr_memmap; int lru; si_meminfo(&i); @@ -57,6 +58,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B); sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B); + nr_memmap = global_node_page_state_pages(NR_MEMMAP); + show_val_kb(m, "MemTotal: ", i.totalram); show_val_kb(m, "MemFree: ", i.freeram); show_val_kb(m, "MemAvailable: ", available); @@ -104,6 +107,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "Mapped: ", global_node_page_state(NR_FILE_MAPPED)); show_val_kb(m, "Shmem: ", i.sharedram); + show_val_kb(m, "Memmap: ", nr_memmap); show_val_kb(m, "KReclaimable: ", sreclaimable + global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE)); show_val_kb(m, "Slab: ", sreclaimable + sunreclaim); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index a497f189d988..59b244092325 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -214,6 +214,10 @@ enum node_stat_item { PGDEMOTE_KSWAPD, PGDEMOTE_DIRECT, PGDEMOTE_KHUGEPAGED, + NR_MEMMAP, /* Page metadata size (struct page and page_ext) + * in pages + */ + NR_MEMMAP_BOOT, /* NR_MEMMAP for bootmem */ NR_VM_NODE_STAT_ITEMS }; diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 343906a98d6e..c3785fdd3668 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -632,4 +632,8 @@ 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); + #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index da177e49d956..2da8689aeb93 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -184,10 +184,13 @@ static int vmemmap_remap_range(unsigned long start, unsigned long end, */ static inline void free_vmemmap_page(struct page *page) { - if (PageReserved(page)) + if (PageReserved(page)) { free_bootmem_page(page); - else + mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1); + } else { __free_page(page); + mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1); + } } /* Free a list of the vmemmap pages */ @@ -338,6 +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); } /* @@ -384,14 +388,19 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end, unsigned long nr_pages = (end - start) >> PAGE_SHIFT; int nid = page_to_nid((struct page *)start); struct page *page, *next; + int i; - while (nr_pages--) { + for (i = 0; i < nr_pages; i++) { page = alloc_pages_node(nid, gfp_mask, 0); - if (!page) + if (!page) { + mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, i); goto out; + } list_add(&page->lru, list); } + mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages); + return 0; out: list_for_each_entry_safe(page, next, list, lru) diff --git a/mm/mm_init.c b/mm/mm_init.c index 2c19f5515e36..b61372431b7d 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "internal.h" #include "slab.h" #include "shuffle.h" @@ -1656,6 +1657,8 @@ 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)); 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 150d4f23b010..236cfdf5a8fa 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5635,6 +5635,7 @@ 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 4548fcc66d74..c1e324a1427e 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -201,6 +201,8 @@ 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)); return 0; } @@ -255,12 +257,15 @@ static void *__meminit alloc_page_ext(size_t size, int nid) void *addr = NULL; addr = alloc_pages_exact_nid(nid, size, flags); - if (addr) { + if (addr) kmemleak_alloc(addr, size, 1, flags); - return addr; - } + else + addr = vzalloc_node(size, nid); - addr = vzalloc_node(size, nid); + if (addr) { + mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, + DIV_ROUND_UP(size, PAGE_SIZE)); + } return addr; } @@ -303,18 +308,27 @@ static int __meminit init_section_page_ext(unsigned long pfn, int nid) static void free_page_ext(void *addr) { + size_t table_size; + struct page *page; + struct pglist_data *pgdat; + + table_size = page_ext_size * PAGES_PER_SECTION; + if (is_vmalloc_addr(addr)) { + page = vmalloc_to_page(addr); + pgdat = page_pgdat(page); vfree(addr); } else { - struct page *page = virt_to_page(addr); - size_t table_size; - - table_size = page_ext_size * PAGES_PER_SECTION; - + page = virt_to_page(addr); + pgdat = page_pgdat(page); BUG_ON(PageReserved(page)); kmemleak_free(addr); 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) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index a2cbe44c48e1..1dda6c53370b 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -469,5 +469,13 @@ 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)); + } + return pfn_to_page(pfn); } diff --git a/mm/sparse.c b/mm/sparse.c index 338cf946dee8..eb2aeb4e226b 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -14,7 +14,7 @@ #include #include #include - +#include #include "internal.h" #include @@ -465,6 +465,9 @@ 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)); +#endif } static void __init sparse_buffer_fini(void) @@ -641,6 +644,8 @@ 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))); vmemmap_free(start, end, altmap); } static void free_map_bootmem(struct page *memmap) diff --git a/mm/vmstat.c b/mm/vmstat.c index db79935e4a54..79466450040e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1252,7 +1252,8 @@ const char * const vmstat_text[] = { "pgdemote_kswapd", "pgdemote_direct", "pgdemote_khugepaged", - + "nr_memmap", + "nr_memmap_boot", /* enum writeback_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold", @@ -2279,4 +2280,27 @@ 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]); + } +}