From patchwork Tue Feb 20 21:45:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sourav Panda X-Patchwork-Id: 13564580 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 C1FFCC48BC3 for ; Tue, 20 Feb 2024 21:46:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 04EB06B0071; Tue, 20 Feb 2024 16:46:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F40CD6B0072; Tue, 20 Feb 2024 16:46:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0ACD6B0074; Tue, 20 Feb 2024 16:46:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CFB446B0071 for ; Tue, 20 Feb 2024 16:46:04 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8BA7A1C094C for ; Tue, 20 Feb 2024 21:46:04 +0000 (UTC) X-FDA: 81813515448.20.A224E88 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf12.hostedemail.com (Postfix) with ESMTP id B8EFA40011 for ; Tue, 20 Feb 2024 21:46:02 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Aih03as0; spf=pass (imf12.hostedemail.com: domain of 3mR3VZQsKCF4OKQN6RL6J96CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--souravpanda.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3mR3VZQsKCF4OKQN6RL6J96CKKCHA.8KIHEJQT-IIGR68G.KNC@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=1708465562; 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=fTBaee3kRXG/xwKvFFrJAOSf+DqDG0Uv/oFuCC7+uXQ=; b=CJZIdiSLt8I4weVaGEPE+l0AI8HrvD75ApRexxL/OElkUkogrQGc/+TGBPJitmrG2K3eIS BL63i5JY1RnP2y3LmqIWczcEmh028ObWtddjRPbV416WisO6fXpNp7FH1972VjqSY7YXVc xaGDEsM0mT0OtggUVZN5FWyu7/UzJIE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708465562; a=rsa-sha256; cv=none; b=p5ujxSlVpwzO1Yj8ul4XD0U7woifBnpGMK7GW5LXrWLZpxZBVCNZ3KqCXaWCQZALGQWcwv nn4Vh1URZnQCHWqjeeA2OUQdDAUBIUKxTQftan/YsHfjrhB/xYckegxBSkMB+H75hP8Axa Pj2rwiwfVZ4XELDoQxXK1s18eTqnFjk= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Aih03as0; spf=pass (imf12.hostedemail.com: domain of 3mR3VZQsKCF4OKQN6RL6J96CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--souravpanda.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3mR3VZQsKCF4OKQN6RL6J96CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b26783b4so5224644276.0 for ; Tue, 20 Feb 2024 13:46:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708465562; x=1709070362; 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=fTBaee3kRXG/xwKvFFrJAOSf+DqDG0Uv/oFuCC7+uXQ=; b=Aih03as04nl9meWRGJ2jfzX+5YGvugiySKtwAJDTCTc3cDdIXvlG+qQb1hbg6DNR5D WugFgk/a2ofuHLCFkR1E5ss246dkIaKBoGLTyNa0+eWeH0s2TO3tL+7tSQb/dNvIg2Mr Cvg4re0rJC9EUPcZrcdyjkGaiLyeGQ6eDPoHYmy98pFL0EaU8Z9kjuqjyCzyV2cXE/gv eDcnf/IgvH2pDMt8OwGHSJg7qpR1El2+n49gUZR02eQeR/oGUy+PMWx/P60pEkJhX5Pu TdcY8sDgwkeCrO3kcE0c+7pRNOOL0kWPHcv4BRDhAtvnenegWFPPCl/grzcDG8cz2t+T 2JAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708465562; x=1709070362; 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=fTBaee3kRXG/xwKvFFrJAOSf+DqDG0Uv/oFuCC7+uXQ=; b=WDdvItEeIx1KYh064mmN6I54x5037TZ5nycJH21ku/gDOUfVg2YwlcfwTU2fImt76Q lwE8E4y7uolR6F72O65I9u6sqSO5WfOKx9IwCFQvGPsxkt7QE6NUCQUWtiZZawSyU6o8 t+bpt1bCNZ8eu6+pAxzPjktU8S1BUBjAPnx/4gOc5am2AYRpeei4pTfvQB2uHYV3B6Ke YkVZkBavEgpBT7NnTZsa7ENSaxCwKS9jDTkNNMSadE5MByebO1YmAYDRdPWklH5zfhhg ev0dc2TZhUTbgOagw/6HrL+CiQkO6qHnGoyGmQ+PTttGOD2ylprdRtOKVzaubUWgTDSW GiWA== X-Forwarded-Encrypted: i=1; AJvYcCX22qp0gcyyLoBh6eMFZ7JQGAXJx9pBEju50gjiz+2vqFOeQ9jw5K8cWbAuYuwnmn3Uyg95GWNm3QULM1dFIai5Kak= X-Gm-Message-State: AOJu0Yx7w8l2b2vq6kI29alqSYrEsdnntkzHZe4aoRYQF0DmVzCzeyaW WOCu8CmtLYB0n5cWdkZpcTWK9g7FlhoS+LTrc6E7VRiywGz8cSIJXkEjhjhDXuQi8JM+8zkH17J YBl0HtcebDSIpsGCHYIPmug== X-Google-Smtp-Source: AGHT+IEyoszEVA/vd5AcUdb0RBpMtRmKdaRACmSU9zWa31O55I0SzdG57nZEa0+AcMnEIsHptSVv6r/mSPVrTTytpA== X-Received: from souravpanda.svl.corp.google.com ([2620:15c:2a3:200:908a:1ef7:e79e:3cf5]) (user=souravpanda job=sendgmr) by 2002:a25:ef07:0:b0:dcd:2f3e:4d18 with SMTP id g7-20020a25ef07000000b00dcd2f3e4d18mr631977ybd.12.1708465561908; Tue, 20 Feb 2024 13:46:01 -0800 (PST) Date: Tue, 20 Feb 2024 13:45:58 -0800 In-Reply-To: <20240220214558.3377482-1-souravpanda@google.com> Mime-Version: 1.0 References: <20240220214558.3377482-1-souravpanda@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240220214558.3377482-2-souravpanda@google.com> Subject: [PATCH v9 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-Stat-Signature: j6rhtabfwzj4pzd1wgd5zmaa64kf3bfh X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B8EFA40011 X-Rspam-User: X-HE-Tag: 1708465562-135788 X-HE-Meta: U2FsdGVkX188TUfURMaiWTjpxrONWRZnybxgWidgXjyWhf2AgYYgrLbHi7y6hKyfJ+nxTiGg/enfy7gzAFYFLqAlGhJG/s3ZeQ0bwzHuUp4E6pNTHK80XZKDozAa4CHnXb4hsBUntSeFF2Z6eNmaQe+8ZQ3cgfp5SdtiZS6zsf6+981tspOe0mKUugK9oThq4yt2sHGhjfoUyLjb7XiE9LnDKXuu1fDsN/y9C5kAe/9LjgtgOrlZ5GSfK/1+fnqjAsklh4pHg7lKa2svzlxiBIZdP/8JwTWv077qEOKFttg0ThFVVeUlmvbExquecmbvPvLS/ea5u/OucrD7bORSJFlvCmFgwC6UNUsa5MBbJcC7j9su/9zE1NGV65ZGFtOu3ZRWmB8IhO/qv6M0pEX11AmSqsw6tbWvlbGtkTtX+HT8CX7FV6n2IgKUXH/BfeDQVrIAdF+15YHn3QinBYNesQ95sv5cNaf8Cotx40pVb5m8Pm3lu2caPrW68xuRme20IcR6dg9hUXizVBewn0LJfs4bvbbLzAKLOIDJDia/cpWvs6XQqIaH9Nvfw7sUY3bs6smWnn/8dkbuqkUcBWj1SXCl0iQiErikwwgwBYCcV0kErGh585Laon3FT4Gahp51shOveeWEVE0BMAmlN2GQo3kMU0xmmSGyClwoATv4Z6nrLkzbQ2fuY3kuCzbtCawk7N4wfajCzOVHmZKyIl4Y/Oc6Mob7WpepfKzloSvvD8FDsOVGvfc+faIczQWVAadTh1gheTLw7h295XztTf+HOeEJ+mjQo79DRmjCQGv7a44rHH+FRZqmfFSJfbew8+531w1cg8lhDE0CHNRazkTnR8y7pvWk/HyMO8qG5b17bEeRBTxlJNl8RC6oPoLLV/xiexv/PltnqSupxVmozMmRiG8L/9v4LkebAQ4ECPO8YGxMwudtG+M74NKRULnSWiLI9+z2ZrateSy/LpJVnDi 1m9Bk1xb KS9B9usZSpx55ypYL2BgZaiZkTJiljT2jUI4tmELTyDp7X+GLtY2VIkCpB3QQD14ovxJIkTulTQTsue+8YRKfHGkJWMybOG5NJ7+vL+9wY14Emv0VheoXV4QsOhPm9MRSBkO3m3xAfSlc0NXpeStixKhgMbgd6KrBNDZkTVl3abCr25GJ52TCOzLpkw9rLv1fP5D75cj5ahGt3+/FShW65XVokf7H88zenZl2DZea0PVanOUoj/p/qmNxVuFFPyNaSzYmRnBA++K6WR8Yn39QgFUrbjfmnLwAfUIZM29gOmbNWAkhVq8kKlHwO7qg/MW13cT0MeXGbV2KpNfJUae6SoiAGelqS/9qFobTbf3AAqMO/hP9DYN7iiTDMPSnRqBVc55a98Wkw84mhFvdOVMRgpEVdR32FINqi8PZ1HyrHZSC8qUr1i0x4QiXQYIeis/e/d0wJAGlMvi5H/S2gz7hoOhMJA0ANgP9RCDNRx8jkRFsfn0KX9ttxgyZKTvAWekL8HOR0tJV6adV7YnXMK6FUgFPkCgEEUjAEJqlUj/cTdIcIAM5d9XjtbRxvduZxxOD4NaQvusqQ2/sbZzYNSJTMzLpfLi/ciU4lLzcS47io4WdDVpR5GXG37bTjERqdYacbPPFHYUo9IrIigZZmKnlJFwSv3qeOAci0fqJJa5zCe//jsReO029KjDheAtK+07IefvaV49LQ7p5lnwNcClJS3Uub7QwvIhyj2ahmfALFuPn0nHULgLIRlvu8efn/d0PHI1puY7x2Wuz60g7g5JUtBOpeg== 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 Reviewed-by: Pasha Tatashin --- 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..3d3db55cfeab 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]); + } +}