{"id":2223480,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2223480/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260415111412.1003526-4-songmuchun@bytedance.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<20260415111412.1003526-4-songmuchun@bytedance.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260415111412.1003526-4-songmuchun@bytedance.com/","date":"2026-04-15T11:14:09","name":"[v2,3/6] mm/sparse-vmemmap: Fix DAX vmemmap accounting with optimization","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"174c4eeb4a02ae8e4323adb4cf056d6c17c95c62","submitter":{"id":78930,"url":"http://patchwork.ozlabs.org/api/1.2/people/78930/?format=json","name":"Muchun Song","email":"songmuchun@bytedance.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260415111412.1003526-4-songmuchun@bytedance.com/mbox/","series":[{"id":499970,"url":"http://patchwork.ozlabs.org/api/1.2/series/499970/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=499970","date":"2026-04-15T11:14:06","name":"mm: Fix vmemmap optimization accounting and initialization","version":2,"mbox":"http://patchwork.ozlabs.org/series/499970/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223480/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223480/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=bytedance.com header.i=@bytedance.com\n header.a=rsa-sha256 header.s=google header.b=MeUirYDk;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-19766-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=\"2607:f8b0:4864:20::1031\"","lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=bytedance.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=bytedance.com header.i=@bytedance.com\n header.a=rsa-sha256 header.s=google header.b=MeUirYDk;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com\n (client-ip=2607:f8b0:4864:20::1031; helo=mail-pj1-x1031.google.com;\n envelope-from=songmuchun@bytedance.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fwdpK3T29z1yHM\n\tfor ; Wed, 15 Apr 2026 21:14:49 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fwdp95d2zz2yvY;\n\tWed, 15 Apr 2026 21:14:41 +1000 (AEST)","from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com\n [IPv6:2607:f8b0:4864:20::1031])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fwdp86pr4z2yvG\n\tfor ; Wed, 15 Apr 2026 21:14:40 +1000 (AEST)","by mail-pj1-x1031.google.com with SMTP id\n 98e67ed59e1d1-3591cc98871so3109501a91.3\n for ;\n Wed, 15 Apr 2026 04:14:40 -0700 (PDT)","from n232-176-004.byted.org ([36.110.163.96])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b477fd3724sm19509485ad.0.2026.04.15.04.14.32\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 15 Apr 2026 04:14:38 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776251681;\n\tcv=none;\n b=fWg+Q999jW388++79FTca/BfdxfG049dJrlzfuuZnmshBsgoMKUHf2Ygpxj3d6WgiwpNLY6f1MD94y6/YnzjfBUZXHV0BRLmqpfcM6mSEYr8/5pYY/GclhDGy514i2jnEDKn5jyH4Deq2S/bf8hVIpJ18E4hM0O3bhL9xtDP7jfcRTKXTCRyzUZHYCd+JcIjJZrmraTF1CYWj9/mS3r7zpy0m5LeaYGh8CaxXOmZIQGyYDRAsI3jddEXL1KkUq2yfTEE7cJJ+/4xE52xkxJP38oIKatdNMdgwvnaQBVwDlZmOeh9Fk9thinrcNi4DaGCxCDl0ULPd5QavYhyMjtWbg==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1776251681; c=relaxed/relaxed;\n\tbh=vC2b62MaZVNGL0bmie++eHoqVNtyAoC7qXucopPxUdw=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=T+u6jzbUh3IgJI2XXXo9qrYvjFFni9rP2dTaX0s0m7SdNqlQ4au0DaHlbBNrOoax3PjU8tW8SgQa5MNfjvVfMq+CZsrkHyBrTmXUJa5uaGfpkou1n5Ps1jTRv3K4tGNYzZoAEfp7+AYDYSvGf1Qlj2ArGo0oDnilhNKChgc2CNEzEkkwgAQ/H8bAMmUAJMk0uqBknv4jAiiuTvHnUp2mXDxP8r4dSJtImaFp//FNY2F9Cxnlvav3lBSwrNRnNPbXsJuWP0Zlj6b+kOLW12ZRqRA678tgKOoHtAj2LP2Yz3ZeFkB6retPnBqV6jXpw0SwQkbRTnOvPE8scucXFx05bw==","ARC-Authentication-Results":"i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=bytedance.com;\n dkim=pass (2048-bit key;\n unprotected) header.d=bytedance.com header.i=@bytedance.com\n header.a=rsa-sha256 header.s=google header.b=MeUirYDk; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::1031; helo=mail-pj1-x1031.google.com;\n envelope-from=songmuchun@bytedance.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=bytedance.com","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=bytedance.com; s=google; t=1776251679; x=1776856479;\n darn=lists.ozlabs.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=vC2b62MaZVNGL0bmie++eHoqVNtyAoC7qXucopPxUdw=;\n b=MeUirYDkVw+1c2oaidKVz6WKJgSPfhlKxXXxBsmaHnmh1z+LebqeD8+f8Ce09zD+Dy\n fy++3g5reEVomqDgGSmrOm0DQM2nfn1/liI79dqaEcchl/UAjyS67svjGR3HxdR1dNlQ\n yfR5Wy1k3DdxInA/5goUCj6x3Rizlv/LPNu++R3eOVn67VWLy7MJOSHE5Wkd6i2OfnXv\n QzpFw1jHtXphlHMFovtxgTN5rFMIz/TIPDG0X0/PIHK0whzYf+O1yb5nLC9B84PTbWkR\n /HMPnnexCUptiLDfj2pFG9WEu9a1FV93FCLinQ1L9HpG7WW/Ykqz+7P4L9tm6UEK+N/y\n Bb/Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776251679; x=1776856479;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=vC2b62MaZVNGL0bmie++eHoqVNtyAoC7qXucopPxUdw=;\n b=O5BXTh/3iI7HauA31hLNUq5e4OGkcrMZG1ZmwLFokxP5wnrOzhKAhrTp3LWk8p0sqP\n uHQRW6Wr6qwrSEJj+cNKG/hgSiFQP6nsfJuUz8AjTWZX74xkawg5DcDk2qYVhJuhKzA+\n 6ueEbJyyX9XScUHskGmqPTKdPYk2UtNXyYKOakxwtXKz4Hg+EB5Dtad6T+7rJ2X28vIj\n M7PgVPmuk7CsphDHDnAW/6uFFrBPfKRtlnrg/L60AHc2ZRiGRQHmfH9QA9J6ktiOx0ng\n b6ivAW5CTYlpFrlcreqbiRHD1rcX+iuVnHLZOCrsNp/NgZabP3Ina78SOSncPG/8MKt4\n 1lzQ==","X-Forwarded-Encrypted":"i=1;\n AFNElJ8HXwxzr0/b3SZSJvv8JAqatanCTx6BMIeaegI5cGswGkjXpxZJNANgj92b0KvjtYoq4cSFOtMUCe+gDdY=@lists.ozlabs.org","X-Gm-Message-State":"AOJu0Yy7NU2dx0KsBvTfC5MIxkF5rBococPfE2JUm5Mwx3kskk5PU2AB\n\tGQu7aMaytHAILlGGMG85Ao8s0/0VRK14L4zgDj+krMFw7odBcx1uwumCZ53bXi3rfuU=","X-Gm-Gg":"AeBDieulUA6qd7Q0JeYrKUFfmtKPGqEeIYBF21fXC8376eeGBLROYAZI3/8W17sqfFg\n\tIy3mAW+dE6iTFYyte4q5slTJE4WiXDeqm+72wkiDOZEEf0FCPKP/hPz7y9ZQVceVacLeffC3F9H\n\tPpicA3nokuPrqsn5cBvr8y7Ou9XnTOCRuvXLSFoRfBVqxXefYtXRlaZpABNRyzX8WtV4f4zuBpP\n\t5C4ow9NMk0PVUUd6orUvcPbKIQjtrA9w69PnA4KJP8amPhfgy0oczi1Z9fNbGzxrlhWX0n95BPb\n\ty/5csZNrrWkekvoutu9XeiDzlgUiwcEApyPxL+9NInnhm9SkUofeP4mu6QO7tQVqEFxD+sdnhm8\n\teKNL53CtUe59Qr5QWs56bviquO+TxfsD/Wd6Mvlz1vGm8lTn3OVVQOIpruOx7vigMboNL6ztFzI\n\tP3vPD2eNPZX0FOqdEaYbTQxpw60OdrnJf19xlFnlMBxlE=","X-Received":"by 2002:a17:903:249:b0:2ae:6192:8d78 with SMTP id\n d9443c01a7336-2b2d59411dbmr209611585ad.1.1776251679043;\n Wed, 15 Apr 2026 04:14:39 -0700 (PDT)","From":"Muchun Song ","To":"Andrew Morton ,\n\tDavid Hildenbrand ,\n\tMuchun Song ,\n\tOscar Salvador ,\n\tMichael Ellerman ,\n\tMadhavan Srinivasan ","Cc":"Lorenzo Stoakes ,\n\t\"Liam R . Howlett\" ,\n\tVlastimil Babka ,\n\tMike Rapoport ,\n\tSuren Baghdasaryan ,\n\tMichal Hocko ,\n\tNicholas Piggin ,\n\tChristophe Leroy ,\n\taneesh.kumar@linux.ibm.com,\n\tjoao.m.martins@oracle.com,\n\tlinux-mm@kvack.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-kernel@vger.kernel.org,\n\tMuchun Song ","Subject":"[PATCH v2 3/6] mm/sparse-vmemmap: Fix DAX vmemmap accounting with\n optimization","Date":"Wed, 15 Apr 2026 19:14:09 +0800","Message-Id":"<20260415111412.1003526-4-songmuchun@bytedance.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20260415111412.1003526-1-songmuchun@bytedance.com>","References":"<20260415111412.1003526-1-songmuchun@bytedance.com>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","Precedence":"list","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Spam-Status":"No, score=-0.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org"},"content":"When vmemmap optimization is enabled for DAX, the nr_memmap_pages\ncounter in /proc/vmstat is incorrect. The current code always accounts\nfor the full, non-optimized vmemmap size, but vmemmap optimization\nreduces the actual number of vmemmap pages by reusing tail pages. This\ncauses the system to overcount vmemmap usage, leading to inaccurate\npage statistics in /proc/vmstat.\n\nFix this by introducing section_vmemmap_pages(), which returns the exact\nvmemmap page count for a given pfn range based on whether optimization\nis in effect.\n\nFixes: 15995a352474 (\"mm: report per-page metadata information\")\nSigned-off-by: Muchun Song \n---\n mm/sparse-vmemmap.c | 32 ++++++++++++++++++++++++++++----\n 1 file changed, 28 insertions(+), 4 deletions(-)","diff":"diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c\nindex 40290fbc1db4..05e3e2b94e32 100644\n--- a/mm/sparse-vmemmap.c\n+++ b/mm/sparse-vmemmap.c\n@@ -652,6 +652,29 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn)\n \t}\n }\n \n+static int __meminit section_vmemmap_pages(unsigned long pfn, unsigned long nr_pages,\n+\t\t\t\t\t struct vmem_altmap *altmap,\n+\t\t\t\t\t struct dev_pagemap *pgmap)\n+{\n+\tunsigned int order = pgmap ? pgmap->vmemmap_shift : 0;\n+\tunsigned long pages_per_compound = 1L << order;\n+\n+\tVM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, min(pages_per_compound,\n+\t\t\t\t\t\t\tPAGES_PER_SECTION)));\n+\tVM_WARN_ON_ONCE(pfn_to_section_nr(pfn) != pfn_to_section_nr(pfn + nr_pages - 1));\n+\n+\tif (!vmemmap_can_optimize(altmap, pgmap))\n+\t\treturn DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE);\n+\n+\tif (order < PFN_SECTION_SHIFT)\n+\t\treturn VMEMMAP_RESERVE_NR * nr_pages / pages_per_compound;\n+\n+\tif (IS_ALIGNED(pfn, pages_per_compound))\n+\t\treturn VMEMMAP_RESERVE_NR;\n+\n+\treturn 0;\n+}\n+\n static struct page * __meminit populate_section_memmap(unsigned long pfn,\n \t\tunsigned long nr_pages, int nid, struct vmem_altmap *altmap,\n \t\tstruct dev_pagemap *pgmap)\n@@ -659,7 +682,7 @@ static struct page * __meminit populate_section_memmap(unsigned long pfn,\n \tstruct page *page = __populate_section_memmap(pfn, nr_pages, nid, altmap,\n \t\t\t\t\t\t pgmap);\n \n-\tmemmap_pages_add(DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE));\n+\tmemmap_pages_add(section_vmemmap_pages(pfn, nr_pages, altmap, pgmap));\n \n \treturn page;\n }\n@@ -670,7 +693,7 @@ static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages,\n \tunsigned long start = (unsigned long) pfn_to_page(pfn);\n \tunsigned long end = start + nr_pages * sizeof(struct page);\n \n-\tmemmap_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE)));\n+\tmemmap_pages_add(-section_vmemmap_pages(pfn, nr_pages, altmap, pgmap));\n \tvmemmap_free(start, end, altmap);\n }\n \n@@ -679,9 +702,10 @@ static void free_map_bootmem(struct page *memmap, struct vmem_altmap *altmap,\n {\n \tunsigned long start = (unsigned long)memmap;\n \tunsigned long end = (unsigned long)(memmap + PAGES_PER_SECTION);\n+\tunsigned long pfn = page_to_pfn(memmap);\n \n-\tmemmap_boot_pages_add(-1L * (DIV_ROUND_UP(PAGES_PER_SECTION * sizeof(struct page),\n-\t\t\t\t\t\t PAGE_SIZE)));\n+\tmemmap_boot_pages_add(-section_vmemmap_pages(pfn, PAGES_PER_SECTION,\n+\t\t\t\t\t\t altmap, pgmap));\n \tvmemmap_free(start, end, NULL);\n }\n \n","prefixes":["v2","3/6"]}