{"id":2227070,"url":"http://patchwork.ozlabs.org/api/patches/2227070/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260423071911.1962859-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":"<20260423071911.1962859-5-songmuchun@bytedance.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260423071911.1962859-5-songmuchun@bytedance.com/","date":"2026-04-23T07:19:09","name":"[v5,v5,4/6] mm/sparse-vmemmap: Fix DAX vmemmap accounting with optimization","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"e5f5bf9288f4afb2e008c2366c40a66ba3372ac9","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/20260423071911.1962859-5-songmuchun@bytedance.com/mbox/","series":[{"id":501152,"url":"http://patchwork.ozlabs.org/api/series/501152/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=501152","date":"2026-04-23T07:19:05","name":"mm: fix vmemmap optimization accounting and initialization","version":5,"mbox":"http://patchwork.ozlabs.org/series/501152/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227070/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227070/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n <linuxppc-dev+bounces-19996-incoming=patchwork.ozlabs.org@lists.ozlabs.org>","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=PCdJFU8G;\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-19996-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::1034\"","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=PCdJFU8G;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com\n (client-ip=2607:f8b0:4864:20::1034; helo=mail-pj1-x1034.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 4g1SCf1dBqz1yD5\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 17:19:58 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4g1SCP0vHxz2ypW;\n\tThu, 23 Apr 2026 17:19:45 +1000 (AEST)","from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com\n [IPv6:2607:f8b0:4864:20::1034])\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 4g1SCN2YZzz2xSN\n\tfor <linuxppc-dev@lists.ozlabs.org>; Thu, 23 Apr 2026 17:19:44 +1000 (AEST)","by mail-pj1-x1034.google.com with SMTP id\n 98e67ed59e1d1-35da8d037a5so3061982a91.0\n        for <linuxppc-dev@lists.ozlabs.org>;\n Thu, 23 Apr 2026 00:19:44 -0700 (PDT)","from n232-176-004.byted.org ([36.110.163.97])\n        by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-3613fbd970fsm7092372a91.14.2026.04.23.00.19.37\n        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n        Thu, 23 Apr 2026 00:19:41 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776928785;\n\tcv=none;\n b=RorDj15Zm3sH9C+mJzyksyy6s6ZiWkNLNkHY4Gd9AZqB0LPJXixRofie0DIxsdujJbjLlzU4xltswGF0TuHv5BWHRC5LdLNImNFXw9j+HwgqOw6vQh6Iqz+678eizotfsUIO68pVfeh7LAzZE55n7akRjS6qZGcmR9IMc+X5ju+ZUHFkUnw1jEJ+8Mgx8YzBd65rRji8cGVoRGrRl+GeoBtEbwgpgHO8HxSCT055MSsU+6myJ5aKEQQ4SCXbHf3112GSMiIzE8UoV7hDlIX4kKvRzdzr4r1RaQfhqS1/Hlcb8LuKJEzznNcbVc48LhBBRWIBq8qMAT3lJIQ+HvyDaw==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1776928785; c=relaxed/relaxed;\n\tbh=hLTLnoewwRhtugCkWIDfQqYKu4KougM+msAio3RkTvg=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=K8lyp7iHnZlVskdmrJNVXCeyRKwYrtQxorpjcfmOfm8+diAI3If7JNroGv/3lI0YIeZZ3lq92fE2gE2BOwVK2QJCvTsl8jxGhIS5UHbC/PMwo1fULlL1yGYWlDBUwQLasosSzOv9uH25gxlNlnY7Y8MaoDuUQRIzzKtB7ulbSAlrTVhtUNbVoQA3hOx4BJHSAw5tk4kDc6OoLyVvUu43g3kXECFYZMVEjpHT3W9FZfIyGarES0FZ27to3j7aPI6FQT30TGTsvBU/vF03QY454XdzqSfWxMGH527nb+bZKFYZOWkIHb14mJHRwqjAwa+wnPzsewVXLoShCcYi6f3vcA==","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=PCdJFU8G; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::1034; helo=mail-pj1-x1034.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=1776928782; x=1777533582;\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=hLTLnoewwRhtugCkWIDfQqYKu4KougM+msAio3RkTvg=;\n        b=PCdJFU8GYnRX3B/ITbJPQXYK44gO3umGt2ygeBDvr5H9cIC9fDX2zNNSZA/WT7f3i/\n         eEC6GbZ6ZzHROzIUunN4agbcF0QZkSN0Z1aCti7cGRxiMm+JYSvM3YpjZWcrYKsEYFkx\n         FRUJ7d9v5PyOzUyKlWwQfuDPkpvkp81bxmAqQoiN8+bIdn5LU4spl8BoMDOB3ea+7PgE\n         zdyeSJdulWbQ9lTSec4PvV97V3V7WaCYzKDzq7H5Wf02IawgSBedYFf3EkZfs7Zslito\n         5IFrTketkXEnVWA4Dy1o8VFl/9OiqkS7eiH6lAnvOFRYLKpMLBXApXD/zI0+kVVk/VVn\n         0fVg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=1e100.net; s=20251104; t=1776928782; x=1777533582;\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=hLTLnoewwRhtugCkWIDfQqYKu4KougM+msAio3RkTvg=;\n        b=myoxACu/nMcn9wsAbTSqwd5BpoRdRGFtxybf1jfuX0p5osmy8/FNP7Pbr2OApM9GlS\n         3fRYh4ytseeMLHfGc2syLFim6Sg9gGpDBMUjAds1LghdwdIOgG4hBwP/iIEul9FaHB++\n         9/hXn2hNYR45bisCjYItOIEFHiUsjSiP+RTxsIs3Agrn/nDYxW/TzI6FHP/iAfTH6QqR\n         w4ExQl2S0bWLXdAktiHEA/MhBQP34EjeVZS+M4uD3ToHV2knIQ8n9wgqu+WFUsy0jS9V\n         KtroLp6jd9phFK8NjnK36rhGbXnGAY3shPy4DVmqTvqlZtWdNfs0hIgjchjnRcX9tW/0\n         Fpfw==","X-Forwarded-Encrypted":"i=1;\n AFNElJ+yPpKI8sjQwVFRJTuBGtZ2/+43oYGfcp8VFDanlmxH3gVN9fqtEj+irgkSScwMvdAXjgM7vB1FjRBaIAw=@lists.ozlabs.org","X-Gm-Message-State":"AOJu0YyfoWh/wbSl4Tkw2H8b9jaaor6vFk10DQ5nQYN2tsihPa/aZD1Q\n\t0mvAYN+Y+v1kBZmwfgj5UTcKZMSo7UEZ2oXsQO1CyehHp3Mtkn8NG3RgtGBvVub9mTk=","X-Gm-Gg":"AeBDietIMc22dWNC2aGgUo5zbintQlfUSQdd2YFnEM2XrJY5syZX2OKCZSRqHKpErr7\n\t6QvdKb0RyznttBK7GPOL2PEK5dm9vub7mVDNnhNiEILfPvMbvwQvIqbPkN27JiU9BXr7xczn5qJ\n\tmb92yunYDI+mgSwYepUNe00p72cm1PnPlbfH/ZQpT4c0gIVRd14kC8jIYfv/0K4LHtke4tazQ6q\n\tYxao3MvG0V3OCnyp2QrvMbr33GG9Kpy0s9e6E1pUygmIcOQiJTzaH6UskDHjLqloU2B8jPvTj3N\n\tALbHwC7cLnRtAOaXOzCK27RytX1doLMmRlGnfxzgGt0nFFg3WOdTjPqImYZr81f2+45M1H8MnAQ\n\twwzqtUFftVOLwanBM6wjBNmHAmfyoIXTgC4glQEpV2tmxWjkmOlLLFN2hxaP4dJLpW1YyqxPigu\n\tok6FEmCurWZ/LFsfhSnDurv0rImZ8vQ4SuBjNHYp2tGUdtyxiH24l+mA==","X-Received":"by 2002:a17:90b:1d8a:b0:35f:b4c1:91f6 with SMTP id\n 98e67ed59e1d1-361403f2807mr27201547a91.10.1776928782107;\n        Thu, 23 Apr 2026 00:19:42 -0700 (PDT)","From":"Muchun Song <songmuchun@bytedance.com>","To":"Andrew Morton <akpm@linux-foundation.org>,\n\tDavid Hildenbrand <david@kernel.org>,\n\tMuchun Song <muchun.song@linux.dev>,\n\tOscar Salvador <osalvador@suse.de>,\n\tMichael Ellerman <mpe@ellerman.id.au>,\n\tMadhavan Srinivasan <maddy@linux.ibm.com>","Cc":"Lorenzo Stoakes <ljs@kernel.org>,\n\t\"Liam R . Howlett\" <Liam.Howlett@oracle.com>,\n\tVlastimil Babka <vbabka@kernel.org>,\n\tMike Rapoport <rppt@kernel.org>,\n\tSuren Baghdasaryan <surenb@google.com>,\n\tMichal Hocko <mhocko@suse.com>,\n\tNicholas Piggin <npiggin@gmail.com>,\n\tChristophe Leroy <chleroy@kernel.org>,\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 <songmuchun@bytedance.com>","Subject":"[PATCH v5 v5 4/6] mm/sparse-vmemmap: Fix DAX vmemmap accounting with\n optimization","Date":"Thu, 23 Apr 2026 15:19:09 +0800","Message-Id":"<20260423071911.1962859-5-songmuchun@bytedance.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20260423071911.1962859-1-songmuchun@bytedance.com>","References":"<20260423071911.1962859-1-songmuchun@bytedance.com>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"<linuxppc-dev.lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev+help@lists.ozlabs.org>","List-Owner":"<mailto:linuxppc-dev+owner@lists.ozlabs.org>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Archive":"<https://lore.kernel.org/linuxppc-dev/>,\n  <https://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Subscribe":"<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n  <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n  <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>","List-Unsubscribe":"<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>","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 <songmuchun@bytedance.com>\nAcked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>\nAcked-by: Oscar Salvador <osalvador@suse.de>\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..979d71158c9b 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, pages_per_compound));\n+\tVM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, 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":["v5","v5","4/6"]}