From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 3F60F313E15 for ; Fri, 24 Apr 2026 02:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776999388; cv=none; b=MmlO4nJ6CHh2HAJaS/OTgoLc8gez5GlJBl1P+bVdj2ABXAcfqZlaPXvE9xVKBY+VEFWwouklFhpZzjwKTRR7DrMV5mLOJkmnjaZvy9SkpabBjw97PnCiroN2KQ/NZ/gF6nGuKoRMr+7OUcfTIXkUMpJ66mH/3uAivg+1iMm56Ig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776999388; c=relaxed/simple; bh=HT5HO5ge7v5LFgL/4ymoxiP5/EbwXc4rA7DseyRJ/CM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d4pXergl1ZKElQoTJBZ1+qT08ctAvub+mQKBKM97h6mzbE3rA2mlWMm21qK6cPJLV3RTcR8uBs7FTuI+L+TGRSD+1KDTe2DnSGqb2IIVSaDsZypQTBd6W9fUMKrLYdglkOZ5vOno1T/+hRJhKC42KCmt/jnce5gesFVY08piQEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=LEMnwZbK; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="LEMnwZbK" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c6e2355739dso2972344a12.2 for ; Thu, 23 Apr 2026 19:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1776999377; x=1777604177; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C94hv/3Q9yeZJL9WguueLZ0Nxmqh1CO+hZjQa23mqmc=; b=LEMnwZbKF9H0RwaBZjEXXUIdLpODVMTtXBAYvYMQK4Tt1OkjfWonlOyJZqcQzz+Lhz 8ufwYEOpNGnBcoUfcYZs+vnEkCFPDacgyexHFo3g3QIhn2krglQP74PECC+3nv/40X+4 K1ZUwj13CRPBYNKkuIJbDkXlluWePeEGpWZyhWcXybNUX2rTm8PROlrzM3QYwdaEPyLf MSk0DSU/x7mqTG39aUVJrkhHxF7vuzZu6rhCBvLMrwDsJE7gol2E1NDMurSynQgXRkgw nsZQ3Koz8fZPu7BCrZY3Lu6NPIWwAqGY/ZR5qc2giVT+WZPgfE2ZguUydDgpqWyYFlLQ jJ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776999377; x=1777604177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C94hv/3Q9yeZJL9WguueLZ0Nxmqh1CO+hZjQa23mqmc=; b=idIB/zrWtbd1STeZYRwLxU6TRGbkK9fAQvQN+gpAtuUmSskzbqkVsFc3aavlnDAVfJ LlaarGz8uT1IZaTEBes/Qdl4Lz/AYTeAAMamkpzwSGoI7pGCBF+zsaI5PQ6dbBXBZg2X CETB4Y1vVUcXuxk4mbEvjBeeYg1flNGvVFeCYuiwFxEq/cKiwRS2G2ckqVAJt6Bl7aAk tr6zZSMkRFbmkNvJSMPmQkih2YYpxZtM3wjKItKCUdOa56L5oO38fV061flyDv4dQgZ4 cdw0qA6vCi5kGrTJgjc6FdQqRLZRxtIALs3arwmjksjxeKFXdgF373hJbqaBOidLLw0U p8AQ== X-Forwarded-Encrypted: i=1; AFNElJ9GExuKbOF/dGqMD6sCTNWZ8uHjWw2MFUTXxpLYiw2ogqb+CI7KJ4K6unDF1re9xnYtzTEQDlXjjuzpYyY=@vger.kernel.org X-Gm-Message-State: AOJu0YzQtzaXFR1wN6GOhLaTNKU4Q0rSViLsFVmTPxrLajSN4W8Vx2q4 pKBoLsGpoRzcPnv/0eJTyrRSb9i/onryi8T82gseDjIokbSjnaOg6tgcgZhkoFYLpTH/4bPL92F uCY4Arws= X-Gm-Gg: AeBDies1ncnv1TCK0uOxrVXfCYfFbV/+cX7oNXNID0qbGnkhog2tMgqhHUNzp0Qzt0d CoYCIIlawfSN22q9b8gvR0GNW6pX5HJEA0yPuQR3n+auWLnvPwonNgeQxPd3b3kMoPCtxZ1jiW/ ESNCG38INobjMoEG6ZegsDm6urIJ+hA3JDsc3kRNz45/Jwjc2B8YWD0Z3MdPV9Fi1ZkqPJYHn+N xFqSoR3ezyqek7dBd5kXakhqy+uUKE0ClnkDHh4Hncz13vJ+AFpM37l7Ip2F3ExpdDgNvx4cp4D ozwq9rfwEXc5JKluN/CMQqhqu2R5N4BXTGwm4X7K/lwvVWLIyE3dBVhMZy2hmtcwT8lhzDnBn9f EWAnqWq7Y91oxP0lxQVNWrU6SRU/57LG0k9oRwvYrtAYGxwZpkxvZ02Sg78oPWBDPu1hVTJsLIb OX0J9vmePU7aV+Qp6kRtxIC9pdzILDY1TYxCLl69fCS7tsyrHgaS5+7P0= X-Received: by 2002:a17:903:28f:b0:2b4:5309:2c14 with SMTP id d9443c01a7336-2b5f9f3ad64mr324239485ad.31.1776999376914; Thu, 23 Apr 2026 19:56:16 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.102]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab20d33sm221668325ad.63.2026.04.23.19.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 19:56:16 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Muchun Song , Oscar Salvador , Michael Ellerman , Madhavan Srinivasan Cc: Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nicholas Piggin , Christophe Leroy , aneesh.kumar@linux.ibm.com, joao.m.martins@oracle.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Muchun Song , stable@vger.kernel.org Subject: [PATCH v6 4/7] mm/sparse-vmemmap: Fix DAX vmemmap accounting with optimization Date: Fri, 24 Apr 2026 10:55:44 +0800 Message-Id: <20260424025547.3806072-5-songmuchun@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20260424025547.3806072-1-songmuchun@bytedance.com> References: <20260424025547.3806072-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When vmemmap optimization is enabled for DAX, the nr_memmap_pages counter in /proc/vmstat is incorrect. The current code always accounts for the full, non-optimized vmemmap size, but vmemmap optimization reduces the actual number of vmemmap pages by reusing tail pages. This causes the system to overcount vmemmap usage, leading to inaccurate page statistics in /proc/vmstat. Fix this by introducing section_vmemmap_pages(), which returns the exact vmemmap page count for a given pfn range based on whether optimization is in effect. Fixes: 15995a352474 ("mm: report per-page metadata information") Cc: stable@vger.kernel.org Signed-off-by: Muchun Song Acked-by: Mike Rapoport (Microsoft) Acked-by: Oscar Salvador --- mm/sparse-vmemmap.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 3340f6d30b01..2e642c5ff3f2 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -652,6 +652,28 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) } } +static int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages, + struct vmem_altmap *altmap, struct dev_pagemap *pgmap) +{ + const unsigned int order = pgmap ? pgmap->vmemmap_shift : 0; + const unsigned long pages_per_compound = 1UL << order; + + VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, + min(pages_per_compound, PAGES_PER_SECTION))); + VM_WARN_ON_ONCE(pfn_to_section_nr(pfn) != pfn_to_section_nr(pfn + nr_pages - 1)); + + if (!vmemmap_can_optimize(altmap, pgmap)) + return DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE); + + if (order < PFN_SECTION_SHIFT) + return VMEMMAP_RESERVE_NR * nr_pages / pages_per_compound; + + if (IS_ALIGNED(pfn, pages_per_compound)) + return VMEMMAP_RESERVE_NR; + + return 0; +} + static struct page * __meminit populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap) @@ -659,7 +681,7 @@ static struct page * __meminit populate_section_memmap(unsigned long pfn, struct page *page = __populate_section_memmap(pfn, nr_pages, nid, altmap, pgmap); - memmap_pages_add(DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE)); + memmap_pages_add(section_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap)); return page; } @@ -670,7 +692,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); - memmap_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE))); + memmap_pages_add(-section_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap)); vmemmap_free(start, end, altmap); } @@ -678,9 +700,10 @@ static void free_map_bootmem(struct page *memmap) { unsigned long start = (unsigned long)memmap; unsigned long end = (unsigned long)(memmap + PAGES_PER_SECTION); + unsigned long pfn = page_to_pfn(memmap); - memmap_boot_pages_add(-1L * (DIV_ROUND_UP(PAGES_PER_SECTION * sizeof(struct page), - PAGE_SIZE))); + memmap_boot_pages_add(-section_nr_vmemmap_pages(pfn, PAGES_PER_SECTION, + NULL, NULL)); vmemmap_free(start, end, NULL); } -- 2.20.1