{"id":2227627,"url":"http://patchwork.ozlabs.org/api/patches/2227627/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260424025547.3806072-5-songmuchun@bytedance.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/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":"<20260424025547.3806072-5-songmuchun@bytedance.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260424025547.3806072-5-songmuchun@bytedance.com/","date":"2026-04-24T02:55:44","name":"[v6,4/7] mm/sparse-vmemmap: Fix DAX vmemmap accounting with optimization","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"da2503d75dd6073b4950779f771950f18818799f","submitter":{"id":78930,"url":"http://patchwork.ozlabs.org/api/people/78930/?format=json","name":"Muchun Song","email":"songmuchun@bytedance.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260424025547.3806072-5-songmuchun@bytedance.com/mbox/","series":[{"id":501285,"url":"http://patchwork.ozlabs.org/api/series/501285/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=501285","date":"2026-04-24T02:55:40","name":"mm: fix vmemmap optimization accounting and initialization","version":6,"mbox":"http://patchwork.ozlabs.org/series/501285/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227627/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227627/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=BVX6mawZ;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-20030-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::629\"","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=BVX6mawZ;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com\n (client-ip=2607:f8b0:4864:20::629; helo=mail-pl1-x629.google.com;\n envelope-from=songmuchun@bytedance.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\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 4g1yKF3MDzz1xvV\n\tfor ; Fri, 24 Apr 2026 12:56:33 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4g1yJz5Vc9z2xfR;\n\tFri, 24 Apr 2026 12:56:19 +1000 (AEST)","from mail-pl1-x629.google.com (mail-pl1-x629.google.com\n [IPv6:2607:f8b0:4864:20::629])\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 4g1yJy6svxz2xnl\n\tfor ; Fri, 24 Apr 2026 12:56:18 +1000 (AEST)","by mail-pl1-x629.google.com with SMTP id\n d9443c01a7336-2aaf59c4f7cso34587565ad.1\n for ;\n Thu, 23 Apr 2026 19:56:18 -0700 (PDT)","from n232-176-004.byted.org ([36.110.163.102])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b5fab20d33sm221668325ad.63.2026.04.23.19.56.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 23 Apr 2026 19:56:16 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776999379;\n\tcv=none;\n b=TLEYDxlb2PXE460iX7jhpE2e+QDeZKumXxw20WPU2rBrHEjXBSPY+wEzRO6drVhvYkvaTzBa1CijbjoG6QkgFkitHHhnsuIoCYaX2TvsKNjabhbKorZ7gW7FKZg7QR/kuvBVWsHR+8v0v7+3gIV5qQgozsBtv24x/s6RetT2jjHJMjwYMTGhUI+LHd/ktOkDXjWoLbO6sqcX3JAh6uULEtW9keoi65qpB+00C0p2vjGrrQP/syZR41XdoapC+eUv5sH5np3JPlRXtMjNhmuihsNoYwQZM4UnuVEIyKYgRUtnQTy4i2MlQhh2f3br4L6Ogjdw7mvfqrx0TMwia2ijZw==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1776999379; c=relaxed/relaxed;\n\tbh=C94hv/3Q9yeZJL9WguueLZ0Nxmqh1CO+hZjQa23mqmc=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=j6mrvV7m29Qy2ufuASnYyPIVBnCULDWFAlK9hhD6BeImtZ93/fJORgD8kfaPiZl0rhDQ6dWZLQz0+z5cchRqtRb4P7hdw+VvnKJ1T24PoKI04aORWGLe1IAvPkSoAj8nylftNVcvuQ+X6sMVEkVsGPEjBDICzyjqd5m1RtZhWeRtBOPdrt309mLWsGR3b6vZ6GqwSz18NHqe/B7BoyH0ziGsO5EnonaC4Wbi+HdfU3/OGknWiXaRlNISFcd23MVSKd7Zz5+zyoh10qeEZrXGiHYKVkaQYvclfDU4PrHjhFmy2k/wVi17kycq2lK06hULQZamhFJIRjjehVx97JyZMA==","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=BVX6mawZ; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::629; helo=mail-pl1-x629.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=1776999377; x=1777604177;\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=C94hv/3Q9yeZJL9WguueLZ0Nxmqh1CO+hZjQa23mqmc=;\n b=BVX6mawZEZlGTbeI9Hhgn1cV7iQsI/cl8pqtDLqQJRH6yFKsHIonqIl1xz10XYOzrj\n Xuw9lzHWZeXqjpTfn0GZqApxwBCeWkPX6EzBAWAEBFyGuVwgV2dGT6e7rhaQFq/qhsNn\n gU9YL2ezVnSP0vTljTc0dhsNOK9T2iwSK72aYjvcOe8JjBqeSNBJxrN9HZ84HtHcJumo\n AmflyGl7gUShFaQ+q9qUFrDKs3bnD5gvpuxt3NZ1P9CZky0bl57RBgd9IS2HTPdvywTf\n fABpUHBalXIYdbsEuu7cRXC2ead6BP/4wfLPjmSZSIXygpgHIhEmdkKRgWy9Ht0GymO8\n MFVA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776999377; x=1777604177;\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=C94hv/3Q9yeZJL9WguueLZ0Nxmqh1CO+hZjQa23mqmc=;\n b=OfbhJ38mbimkaq2L2odobft2d/XC/Ur4Zqa09+vsCDohlKw95KuT2YEzsL/pAf3w23\n aGRqrTp1ekCeWpmc9zgvA1k6B8885vbUMD8ouPT4NbZwwz82bznbO6qN5ezwCrLcgKKA\n P0MfU/w4jbPZUY2xfRc+Hb+N0/07HbU3dsmzB+gdyVJL8iTBElPzw+Q0FVhjAfcDdfdj\n o/rH5/AI4SyUNLmod62XCYKxaIpzDXCkF0/sX2QHu5UTw6/TloOdEoK5aNnzqi33WNqP\n EmLPZsdmz/qXROa2zn5tJBBqXxQ4mwBzwAgxNbECZUPKrDoqhONy9nl0xa7rr42qx5Zg\n XvPQ==","X-Forwarded-Encrypted":"i=1;\n AFNElJ/Ecv7gS/sKbkj18cLoeIpC8i63EC+H/cenwB5wdot+EOL+tkkK7fs6EJR4yxoRTeRq5lF5z3vk6eiX6qg=@lists.ozlabs.org","X-Gm-Message-State":"AOJu0YxHPU3b2DerTGBa3vnlxREHr1E0uxZbdVhUhHshgsQjk6TamL+0\n\t7tTkh9Q9To9YTYNZliGy93m7MRV1No2f8ZEFKhvGTtsm/ukbEBiJ19tPIzz7HJIv6TE=","X-Gm-Gg":"AeBDievFFPblVRseUvRfwK/BhriLuUBEKARKOqjrzhMt5c2NAcVh8sxk8U5GuZwCTNL\n\t4r++7vPFoU7VEl1WOji8rurwZgOCeD7cAkudAYn6g/0aqHI1hoHBMUMPOWxjXr4WWzOOek/Am5V\n\tDCXw2fzuD+3JelgFQWvR2nbfl6O3+6AuNFjvW9x+jagLwW62gCpLBYriXtii7uZJpF6oCKGp6JQ\n\twLKzhbvvRF8pSRk+WqZRiZ1MrX5Rx8L41ObhghqtMEYJsBns0J2S1zEiqqNDung5udK4xxcV2nQ\n\tNIyOw7PIm8RjmQJVZQTgcVtqV460JbpZukxcfGuS3r5Dpl7FMz6niQxIjDnn2qtASJOt12VA5Xy\n\tkRqJqdCxONnv2iCpGVw2YFDKBIkxJaJpP2aUBqimghGnl4aNW8OdOpEelP5iFFzjnDehha2YvN7\n\t5zrLIWqTd7+TIpq49o6t6fJc8rxTaKlZzbh52pD6Aaj4xpFKAGcNBCeog=","X-Received":"by 2002:a17:903:28f:b0:2b4:5309:2c14 with SMTP id\n d9443c01a7336-2b5f9f3ad64mr324239485ad.31.1776999376914;\n Thu, 23 Apr 2026 19:56:16 -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 ,\n\tstable@vger.kernel.org","Subject":"[PATCH v6 4/7] mm/sparse-vmemmap: Fix DAX vmemmap accounting with\n 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>","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\")\nCc: stable@vger.kernel.org\nSigned-off-by: Muchun Song \nAcked-by: Mike Rapoport (Microsoft) \nAcked-by: Oscar Salvador \n---\n mm/sparse-vmemmap.c | 31 +++++++++++++++++++++++++++----\n 1 file changed, 27 insertions(+), 4 deletions(-)","diff":"diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c\nindex 3340f6d30b01..2e642c5ff3f2 100644\n--- a/mm/sparse-vmemmap.c\n+++ b/mm/sparse-vmemmap.c\n@@ -652,6 +652,28 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn)\n \t}\n }\n \n+static int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages,\n+\t\tstruct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n+{\n+\tconst unsigned int order = pgmap ? pgmap->vmemmap_shift : 0;\n+\tconst unsigned long pages_per_compound = 1UL << order;\n+\n+\tVM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages,\n+\t\t\t\t min(pages_per_compound, PAGES_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 +681,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_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap));\n \n \treturn page;\n }\n@@ -670,7 +692,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_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap));\n \tvmemmap_free(start, end, altmap);\n }\n \n@@ -678,9 +700,10 @@ static void free_map_bootmem(struct page *memmap)\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_nr_vmemmap_pages(pfn, PAGES_PER_SECTION,\n+\t\t\t\t\t\t\tNULL, NULL));\n \tvmemmap_free(start, end, NULL);\n }\n \n","prefixes":["v6","4/7"]}