From patchwork Tue Oct 31 22:38:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sourav Panda X-Patchwork-Id: 13442342 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 31085C4167D for ; Tue, 31 Oct 2023 22:38:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4C486B0342; Tue, 31 Oct 2023 18:38:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FBFC6B0343; Tue, 31 Oct 2023 18:38:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84F436B0344; Tue, 31 Oct 2023 18:38:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6BC406B0342 for ; Tue, 31 Oct 2023 18:38:53 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 403471A032D for ; Tue, 31 Oct 2023 22:38:53 +0000 (UTC) X-FDA: 81407222946.08.93A43C2 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf14.hostedemail.com (Postfix) with ESMTP id 76820100016 for ; Tue, 31 Oct 2023 22:38:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=REKVMssJ; spf=pass (imf14.hostedemail.com: domain of 3-oFBZQsKCDUjfliRmgReURXffXcV.TfdcZelo-ddbmRTb.fiX@flex--souravpanda.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-oFBZQsKCDUjfliRmgReURXffXcV.TfdcZelo-ddbmRTb.fiX@flex--souravpanda.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698791931; a=rsa-sha256; cv=none; b=SImxvs09DYvii3WS6MfzLHe/CZIJI/IVq2faRJQnShi1eYqlBrneP38V3smvR5booUMxnt whAyHrQXIAkkOxT+aIzUDwHPNWYYS/cJzAgjveR6dN2mLaWpPLMvA+WBxACx0GQzs4ioul YWmFDaeyGPxRKO2RJDpkDQ/CZN77yro= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=REKVMssJ; spf=pass (imf14.hostedemail.com: domain of 3-oFBZQsKCDUjfliRmgReURXffXcV.TfdcZelo-ddbmRTb.fiX@flex--souravpanda.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-oFBZQsKCDUjfliRmgReURXffXcV.TfdcZelo-ddbmRTb.fiX@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=1698791931; 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=gnEX3Ipnl6U3xsx2QZl+mCo0I6dOB/z20ZQd7gIgRzQ=; b=3+0oMKvtsWl2Gn25jRGv9w2ya3B1CphnpreoHvBkOWUUkvIj6S4bPbY6kvJ7XcLqFk4+xq ZGziT15brxwLcYW0kojhnryTs91o5iitjP/kuoh1Mswgij1dxeyutuq5y/lO7o0ZUWFjZK 0LdwkeinUw3NmLHSvo5GHbIn6EwhNvk= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5a7af53bde4so66760937b3.0 for ; Tue, 31 Oct 2023 15:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698791930; x=1699396730; 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=gnEX3Ipnl6U3xsx2QZl+mCo0I6dOB/z20ZQd7gIgRzQ=; b=REKVMssJWTx2B9KYT+IZSzUsS5+a9nxlUACTEy64g/Mc++/AYpYCwuDzfJZ3EFQBZd mllTgktb6qMOTridFHoZ2U+iVOQnEPwuxeplP8f32m/RwNF31dMe2H8EWXfrCcVN5h7K kIqhC5SOMzhWq6FnAazlDoid1jL2hpSJAQp29RUV2FoYQpYWeFG0NpPwm/UAomNpyIaC ExcG5O6mlxHawwN5SopfVx2tu34wsONeovsZUe4iOgdWpGx7WcW9iVDbQB3fWFpq6cTJ FydXlYXTv999bdneIw5X6Sz9zI7NIJNzgFnWstH4NWyGXSbNF+GAsOJBvrRr8YQBc4n0 VWWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698791930; x=1699396730; 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=gnEX3Ipnl6U3xsx2QZl+mCo0I6dOB/z20ZQd7gIgRzQ=; b=lInjhMR/WawjzplnOP92yo9eSY3LlRfCfgW9npzKybZ+qNhm33O8aN/LFWMOR8Iz// IShtOLXzh41DxhHCkcimChWT0vYW5U/PI3/koqtEpgz9B0KwNd2mXy+/KIMP1lPxksZR 9v0949fuXZGrvbwwg1kZpEsysBkO2y7O6KSLDQmgGKkLs4hAISa1YzfqaO0BKfWGHwki oM3d6R76ObNQZAtJFvcLIMcjLNIkYdg3yxWsAO/nXAj29WH2UJXMTL/jD4evSm5z5tWZ 6ZNl9LnPiiyAzsJ6yB+Hgu8WDquKYHjO+/EmSeIBHLcwjf/Ypty1SLNbJugNahZhXDB9 UBXQ== X-Gm-Message-State: AOJu0YzqGcTMh5hAi8MskUqkbPQqBhLaKyMeNehu09XsB/rEMZ6ZoN8O BTNHwLPeN/vzcJoU83NU/KMepFk4cFPhKGm1tA== X-Google-Smtp-Source: AGHT+IHFyNsZ+MrJsyXfzlDZ6K4oNRulgdq3qzq5cSwz+kfiHPrH6AuLmBgt3mHyZYO8LhTrq4g2ahFlSRm+f+YQqQ== X-Received: from souravpanda.svl.corp.google.com ([2620:15c:2a3:200:84c2:bfa0:7c62:5d77]) (user=souravpanda job=sendgmr) by 2002:a25:aa47:0:b0:d9a:d272:ee58 with SMTP id s65-20020a25aa47000000b00d9ad272ee58mr254454ybi.9.1698791930521; Tue, 31 Oct 2023 15:38:50 -0700 (PDT) Date: Tue, 31 Oct 2023 15:38:46 -0700 In-Reply-To: <20231031223846.827173-1-souravpanda@google.com> Mime-Version: 1.0 References: <20231031223846.827173-1-souravpanda@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231031223846.827173-2-souravpanda@google.com> Subject: [PATCH v4 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-Server: rspam08 X-Rspamd-Queue-Id: 76820100016 X-Stat-Signature: 4pn8uunw4ebys9kdmarwq7xyna5a6mz3 X-Rspam-User: X-HE-Tag: 1698791931-335537 X-HE-Meta: U2FsdGVkX18reqiki/odZu1oUwBCuED9d74j5SzZqqEol+umEoUZoD+gkZ9Xy/hT4pJZZ3Kpyc8eO068N2OYl8TyBOAVkR19OB9Y6Ww2MAUnxGw88T6JsPaFNEenxYSb0s6NINzn023tq+w7Pyy9uZHdLU2prSPCylKIHFBdLtlNAf4/FNg7Xvzk1VU8ynVK9JZZDlhOKeCF/+sxkrknBvYxbJAtg8RFMl4oAIVVax9dwv2Y+2HOM4nhu9iz/yfn/sw61feIzx85uSxCnRIogk1s4pYe3FGifpKi7ZoAWq/C7luH7dqPuUmWpsEx7UC+PUl0IOk2U/CynAb2Ni+6e02v0NbATeZgCIitu2lna+3rgIyrloLPcPPM3F69ramPAVYRNmxeeRUS3GoEfuZovS+GnzpSn3mC+tUrOYN21up6RTvQvNVgkwsB54AYsU+Tf7FNAxYZbreEaL65JAXbVBqYQgd89AgFVjjEBlaJprxY2+aPHsdER1RtKWDXCjQojqsh1kB6OYJi/B2NaS3y1PIqYoQq0yQhoWWAjyovPpCmtiAR76d/73NbuaWHkz1Pu73bQ5gZBDtCcogo36wK3oDBSdg2It4cBFt67iextrZZh7z6HkfA/KDdZpl3L5U/NsuvUGzxrP//BPKvMOyor1UdxVO/0UepF+4MIf7W2m419pSBqT8lplcsTZje70lbsYSJoAen06++N1OA6xkohRAY/zGuY9sKY6WW3RsqMsw6Y5qFsQQ+2KrwNiy0SCWzJc6rbOQtWG+aPWzMJcHe2oXckMjnyvkiS5ul5MkehdvsVgPnw2VLMhPorplN/O3HkU2Cj7laFOXGZfFBCByvVJExSXEnvs/WSKNvFFy5hsV/OmgVXGzUIw9IRiGWhogzcuLLJ0FBGpVQ5VQsK2oI51vYwslq5hsTPuTTyoaaAFxIg4QYT0VOeGPt4+LNstGqk/B7XZEwwP/2/lBoxT9 Oq4VouL0 jEbL1Xg9Xl2wRQarPlgjCl0QlKPSHK1Vt4lvsDuKKLvhxzSI6y4khqIIx8IxUl03rV0nVBS+dhJxaM1Vywwy4G1U3S7KyAQCTpLOqsRBJHCQroLlK2K9dlGsm4/cexwJNP9TmX1GO6mUxoGWZ0Irf1U/I0DPfNpHlYcsGdTE3T7nN0K1usgf6062acdqRPVUBbpZ371mAZO0g73CtB25ndrzzqlx+G98/IMuL5r8MjjEUPmZfcSCNmftb2sF2/v3l0OaOMgTKnCQ2QjltOvfn80Wu4I/3OBAv6krl3v+8KVgwLn+Y/dfBn+Kdu2o/ufB3BqT0TL3UJqlIVGBPOWETZH0XjdFlwKxSDImnlaUWn5PxOMdNyWf38VRgXAR6/Pl/2ViL/hdtTO2evLRST8tzywO3Jh1j42HC5NpTJU1bEdK28GtvI9Idda8xf9AqzaP3sEqWepCz1OUS36uzf7cmEzTQzaodeFnnazNpEcP2SN3nV0YuKThsAP1f3PNARVrNQVu2RySuAGOSn3OTIx+T4OqlDJb4ReaPWft1h966Y2pWbnltmhT1aed5lT+A7GU3nI/BKWjWgu+XZDlcMoxC1JojTAdFpdSGBcGftFy/v2c0MWfDpot+ksRKJRpYglIHjDQVcPYjotzvP0TOVghM96oSlMDudGCTmiGeIEflAfno4U6VtQgzMd9wkkIEoqSafb0usceY6dizP9A6KPe1yhB0g7MxWM7iXrA2c4RpN7vNa2d1kJFC0/rcojLE2p5iA9NtbYOsxdP/zhg= 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 a new per-node PageMetadata field to /sys/devices/system/node/nodeN/meminfo and a global PageMetadata 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. While on the other hand, per-page metadata would include both memblock and buddy allocations. 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. Suggested-by: Pasha Tatashin Signed-off-by: Sourav Panda --- Documentation/filesystems/proc.rst | 3 +++ drivers/base/node.c | 2 ++ fs/proc/meminfo.c | 7 +++++++ include/linux/mmzone.h | 3 +++ include/linux/vmstat.h | 4 ++++ mm/hugetlb.c | 11 ++++++++-- mm/hugetlb_vmemmap.c | 8 ++++++-- mm/mm_init.c | 3 +++ mm/page_alloc.c | 1 + mm/page_ext.c | 32 +++++++++++++++++++++--------- mm/sparse-vmemmap.c | 3 +++ mm/sparse.c | 7 ++++++- mm/vmstat.c | 24 ++++++++++++++++++++++ 13 files changed, 94 insertions(+), 14 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 2b59cff8be17..c121f2ef9432 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -987,6 +987,7 @@ Example output. You may not have all of these fields. AnonPages: 4654780 kB Mapped: 266244 kB Shmem: 9976 kB + PageMetadata: 513419 kB KReclaimable: 517708 kB Slab: 660044 kB SReclaimable: 517708 kB @@ -1089,6 +1090,8 @@ Mapped files which have been mmapped, such as libraries Shmem Total memory used by shared memory (shmem) and tmpfs +PageMetadata + 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/drivers/base/node.c b/drivers/base/node.c index 493d533f8375..da728542265f 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -428,6 +428,7 @@ static ssize_t node_read_meminfo(struct device *dev, "Node %d Mapped: %8lu kB\n" "Node %d AnonPages: %8lu kB\n" "Node %d Shmem: %8lu kB\n" + "Node %d PageMetadata: %8lu kB\n" "Node %d KernelStack: %8lu kB\n" #ifdef CONFIG_SHADOW_CALL_STACK "Node %d ShadowCallStack:%8lu kB\n" @@ -458,6 +459,7 @@ static ssize_t node_read_meminfo(struct device *dev, nid, K(node_page_state(pgdat, NR_FILE_MAPPED)), nid, K(node_page_state(pgdat, NR_ANON_MAPPED)), nid, K(i.sharedram), + nid, K(node_page_state(pgdat, NR_PAGE_METADATA)), nid, node_page_state(pgdat, NR_KERNEL_STACK_KB), #ifdef CONFIG_SHADOW_CALL_STACK nid, node_page_state(pgdat, NR_KERNEL_SCS_KB), diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 45af9a989d40..f141bb2a550d 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -39,7 +39,9 @@ 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_page_metadata; int lru; + int nid; si_meminfo(&i); si_swapinfo(&i); @@ -57,6 +59,10 @@ 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_page_metadata = 0; + for_each_online_node(nid) + nr_page_metadata += node_page_state(NODE_DATA(nid), NR_PAGE_METADATA); + show_val_kb(m, "MemTotal: ", i.totalram); show_val_kb(m, "MemFree: ", i.freeram); show_val_kb(m, "MemAvailable: ", available); @@ -104,6 +110,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, "PageMetadata: ", nr_page_metadata); 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 4106fbc5b4b3..dda1ad522324 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -207,6 +207,9 @@ enum node_stat_item { PGPROMOTE_SUCCESS, /* promote successfully */ PGPROMOTE_CANDIDATE, /* candidate pages to promote */ #endif + NR_PAGE_METADATA, /* Page metadata size (struct page and page_ext) + * in pages + */ NR_VM_NODE_STAT_ITEMS }; diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index fed855bae6d8..af096a881f03 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -656,4 +656,8 @@ static inline void lruvec_stat_sub_folio(struct folio *folio, { lruvec_stat_mod_folio(folio, idx, -folio_nr_pages(folio)); } + +void __init mod_node_early_perpage_metadata(int nid, long delta); +void __init store_early_perpage_metadata(void); + #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1301ba7b2c9a..cd3158a9c7f3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1790,6 +1790,9 @@ static void __update_and_free_hugetlb_folio(struct hstate *h, destroy_compound_gigantic_folio(folio, huge_page_order(h)); free_gigantic_folio(folio, huge_page_order(h)); } else { +#ifndef CONFIG_SPARSEMEM_VMEMMAP + __node_stat_sub_folio(folio, NR_PAGE_METADATA); +#endif __free_pages(&folio->page, huge_page_order(h)); } } @@ -2125,6 +2128,7 @@ static struct folio *alloc_buddy_hugetlb_folio(struct hstate *h, struct page *page; bool alloc_try_hard = true; bool retry = true; + struct folio *folio; /* * By default we always try hard to allocate the page with @@ -2175,9 +2179,12 @@ static struct folio *alloc_buddy_hugetlb_folio(struct hstate *h, __count_vm_event(HTLB_BUDDY_PGALLOC_FAIL); return NULL; } - + folio = page_folio(page); +#ifndef CONFIG_SPARSEMEM_VMEMMAP + __node_stat_add_folio(folio, NR_PAGE_METADATA) +#endif __count_vm_event(HTLB_BUDDY_PGALLOC); - return page_folio(page); + return folio; } /* diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 4b9734777f69..804a93d18cab 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -214,6 +214,7 @@ static inline void free_vmemmap_page(struct page *page) free_bootmem_page(page); else __free_page(page); + __mod_node_page_state(page_pgdat(page), NR_PAGE_METADATA, -1); } /* Free a list of the vmemmap pages */ @@ -336,6 +337,7 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end, (void *)walk.reuse_addr); list_add(&walk.reuse_page->lru, &vmemmap_pages); } + __mod_node_page_state(NODE_DATA(nid), NR_PAGE_METADATA, 1); /* * In order to make remapping routine most efficient for the huge pages, @@ -381,14 +383,16 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end, struct list_head *list) { gfp_t gfp_mask = GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_THISNODE; - unsigned long nr_pages = (end - start) >> PAGE_SHIFT; + unsigned long nr_pages = DIV_ROUND_UP(end - start, PAGE_SIZE); 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) goto out; + __mod_node_page_state(page_pgdat(page), NR_PAGE_METADATA, 1); list_add_tail(&page->lru, list); } diff --git a/mm/mm_init.c b/mm/mm_init.c index 50f2f34745af..6997bf00945b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -26,6 +26,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, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 85741403948f..522dc0c52610 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5443,6 +5443,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..d8d6db9c3d75 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_PAGE_METADATA, + 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_PAGE_METADATA, + 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_PAGE_METADATA, + -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..2bc67b2c2aa2 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -469,5 +469,8 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn, if (r < 0) return NULL; + __mod_node_page_state(NODE_DATA(nid), NR_PAGE_METADATA, + DIV_ROUND_UP(end - start, PAGE_SIZE)); + return pfn_to_page(pfn); } diff --git a/mm/sparse.c b/mm/sparse.c index 77d91e565045..7f67b5486cd1 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_PAGE_METADATA, + -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 00e81e99c6ee..070d2b3d2bcc 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1245,6 +1245,7 @@ const char * const vmstat_text[] = { "pgpromote_success", "pgpromote_candidate", #endif + "nr_page_metadata", /* enum writeback_stat_item counters */ "nr_dirty_threshold", @@ -2274,4 +2275,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] __initdata; + +void __init mod_node_early_perpage_metadata(int nid, long delta) +{ + early_perpage_metadata[nid] += delta; +} + +void __init 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_PAGE_METADATA, + early_perpage_metadata[nid]); + } +}