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: 203824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp682378dyc; Tue, 20 Feb 2024 13:46:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV7WsawzChS4chWR77p4WTVnuLXYSar0m9pluN751eGsdSoBS/3nh0nXnGAXWEzVyegTgrmfw2+zehUUkmwVVt78FSD8g== X-Google-Smtp-Source: AGHT+IGKuJ7OhbojAanCCrJt+rNNyFyv0G8x/rOf0PV2r6Q7ouBwPeGiAlc9s6sz08Y3JEWQVh7S X-Received: by 2002:ac8:5215:0:b0:42d:d3d1:64b8 with SMTP id r21-20020ac85215000000b0042dd3d164b8mr14879851qtn.19.1708465604035; Tue, 20 Feb 2024 13:46:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708465604; cv=pass; d=google.com; s=arc-20160816; b=t9baTCv0h8JE+MlCjLS8GtR1qkNMw76mpYVIixMWiCPKaOEy5IK9a3EM29he2Zq3JM OUC2rWSjm3guSs/54k632NmnYc3k7rQPwL5a8OKk7hViyyKU68LiJRapTaIcBJN1UNj9 7irThZIbYbyyyrWmu2lheRLayWcqK0oVe65mPQoezwWmmabd7xG57Brq9LpEaADrqeW4 1tcbPNCRQEmaZTbi6lhpsBLVLRHKEHcd7MXg7KcagjwXi4mkASvaAsdtZZWL55n8KsrA zfXno/EoxkOE7PLuir4TMNGkzUGsgw++C9iRX1D1ymWstIuIjjNc61ezCSHJhdEvm96R DgLQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:message-id:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:in-reply-to:date:dkim-signature; bh=fTBaee3kRXG/xwKvFFrJAOSf+DqDG0Uv/oFuCC7+uXQ=; fh=b+vSCgDKAZ9Xwz2gP1LxRKtj5Rng7fW1qvVoMwvI3gs=; b=jof+y6hZQkNb4ycBqCjX6870qH5DC+BhXKE9bh1/v9ndsKLT4xxfT2zdRh9DTSyEJe uWqPSe1dfH6tSJg6qFdqdVb3BjZRe+DeCvFwEjpXOvfEzjU0MnwaHwND399znCJqZaxS dvkTCTu53nrfN7kfyaS1T9aQ7K3pHYtmrs4Ja46Dc8JAD9mYq7EWJ/JRm33+KoDLyWVH gEP3oKJOYm4Tl1iVDfKc2E7QRMXEjtMN+ABupJm7goN02/Yx+/7UfFgxJhr/2SPgZ2NF zu3K5hYar7zf/uEXHxLoPuBPQfrLAc2wJQD5Y6o/DQS9JgeZz8iGlNihQPhqQu+Ub6j/ 9qrg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=i3ahZg0F; arc=pass (i=1 spf=pass spfdomain=flex--souravpanda.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-73736-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73736-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h11-20020ac8744b000000b0042da9184e83si9108815qtr.268.2024.02.20.13.46.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 13:46:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73736-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=i3ahZg0F; arc=pass (i=1 spf=pass spfdomain=flex--souravpanda.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-73736-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73736-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C21D81C21CC0 for ; Tue, 20 Feb 2024 21:46:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 936B8151CED; Tue, 20 Feb 2024 21:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="i3ahZg0F" Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1593151CFD for ; Tue, 20 Feb 2024 21:46:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465564; cv=none; b=GH3VfiSh3+9cJpQJBkzCHRsy2ziQfLu8FEM6GZX3LEXFW+c+IfEqjf2ra6RE9Ru3eKLhbUb7d5+bVzNQ2H5kJghzqbVyGXSKt034b/V2XG45ZpRiuoByi/8RmziPxpZryEw2Ub9QbF/5iTyYBtOticlOahmxBjJIRbzicjkjEgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465564; c=relaxed/simple; bh=bfUBLAvoYdmc0KHBkkFF6Hr4cVrl7586ho5QD5NptCE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=PxGIbtD5deKzDsb+iE6e3b/dePfJWWkp+3Ewef8EHL126eorjrOERbJQT/Bz2Eq/l2eBHnILI35NYMGUQzhGM8GwwQ2tdY8LaLoGfONdzXeqQfgjut7bAc/CCoJd95MoLKyp0+W5RHaGlx3osfeiWwUdNuBMNn2mWGtpNvkJFO8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=i3ahZg0F; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcc05887ee9so6692290276.1 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=vger.kernel.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=i3ahZg0FinBycb4FWkdC/541B85Op4xufivL4vLxSvPs+MHfce9yqnPV1S4XHrG9a3 TNa7R7wvW4WsTMAxBfQV2sMUgt2fajoADq1CbgF9ZH0u9H3IpMxYaoyqj4Vy+9rGTXZu l11P4/+UN/76ntSKl+ngHOkY+nDLau8iOCwk+mPMh4iLW8R6ZX5/Xfy9RVj7uHkCGAqg i6p7v2sD/bXN6z3TYQuq8H6E/Xpenfk0TEpcXK4kF2SUyw/sZo3e8tFfgydF8fwBmrDC 20PvtyRx6QE82n07qXPh9CL+tUGVWDeYJzx6nw40wkmGjydoD95qIyemhdD6H98DTgzc 1opw== 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=OrbhrET3ZQ1R6kqAVFmzcdbwJ7Y5CzSNrXbDB/duFRUv/tsW2Pwx62oJn5cB5BM7QN 93rn3RwT8McekqbTL29TZ8R7bGspdqAJJwx6zIDchvPbsSXO/V7utfOcjnXtQvBbwZPh V31QETzdIDuWzIVFkKvqp9FjimtMZey5ot6uS2MRqdnSovTjJYbF1So7hadJ3JRmQbk0 8NEgWr2ELxC5YjWBrT365X2BZU8QHKnaXe3s7M8LYRIQDqPrWBWSbwyAYLL376//1aUx M4BH/2aqmnUq5J7qNnVaPTSAlweQ9p+ZXUjnleTXPyTfJ2U7bq/qiHJAPIXxIBKqotP/ 24Ug== X-Forwarded-Encrypted: i=1; AJvYcCWo90TEZ4S1Vk5MFCvA9J9K6Gc9XDC/D5/1hE9pvPELimDhV3dZOu+LAe57erEX9gxURuZlYzWZKM/BIKFWDZw7s06eDn22JIR9C+24 X-Gm-Message-State: AOJu0Yy2ctxhgXrZUKSnut28n5LkbGFv756ZNF8cPSCLNMYvtZF4BJGy lVxy6NTsELIsZpECnrtAmasANCXOjU+9iE/AFyEa+JD32dUggdP6J/Y9naBgK0MR8T7gK3TLfqG DCpki57p+yzmjcE3vC4oGcg== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791456029001641532 X-GMAIL-MSGID: 1791456029001641532 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..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]); + } +}