{"id":2226087,"url":"http://patchwork.ozlabs.org/api/patches/2226087/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260422081420.4009847-4-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":"<20260422081420.4009847-4-songmuchun@bytedance.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260422081420.4009847-4-songmuchun@bytedance.com/","date":"2026-04-22T08:14:18","name":"[v4,3/5] mm/sparse-vmemmap: Fix DAX vmemmap accounting with optimization","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"a2aabbd996f454d5461f325a34edad7af603450c","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/20260422081420.4009847-4-songmuchun@bytedance.com/mbox/","series":[{"id":500940,"url":"http://patchwork.ozlabs.org/api/series/500940/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=500940","date":"2026-04-22T08:14:15","name":"mm: Fix vmemmap optimization accounting and initialization","version":4,"mbox":"http://patchwork.ozlabs.org/series/500940/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226087/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226087/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=hgJVpI9c;\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-19939-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::52e\"","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=hgJVpI9c;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com\n (client-ip=2607:f8b0:4864:20::52e; helo=mail-pg1-x52e.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 4g0sTr1JNFz1y2d\n\tfor ; Wed, 22 Apr 2026 18:15:12 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4g0sTh555Vz2yr9;\n\tWed, 22 Apr 2026 18:15:04 +1000 (AEST)","from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com\n [IPv6:2607:f8b0:4864:20::52e])\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 4g0sTg0YjRz2yqs\n\tfor ; Wed, 22 Apr 2026 18:15:02 +1000 (AEST)","by mail-pg1-x52e.google.com with SMTP id\n 41be03b00d2f7-c795eacbeb0so2123660a12.2\n for ;\n Wed, 22 Apr 2026 01:15:02 -0700 (PDT)","from n232-176-004.byted.org ([240e:83:200::34f])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-82f8ec0307esm16522874b3a.53.2026.04.22.01.14.55\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 22 Apr 2026 01:15:00 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776845704;\n\tcv=none;\n b=CGbaoqAgEBi5EnPBdsSk7kcjZrjN37x4cbaoEoQ7WWtNIoLvjG4d391V2Le5morQsV6/M4kvmUh5p7j0WT/eDOb92SefuvP4H7lN40Q/R2io4OpBuqQ9XNAvv6FazPh4Nw/D8YyzQX6bM9GwUA3wiD4R5ngyvw+QyK/q1W/M69VGqv4rdBeROBvDesu5psJZPd3p6lZMHzfu3Njn6j24iD5OQQTK2YLv4S/Mk4S4DFNqeOgxTvSfVA8n2v3gjm5l53vIBL2SGaU8vN7/6LQfkZ4QRejP3cMfk9MMiFqMKScjQcF1lvyRzO+qziOX60V0WZoFWETwnIeHofnRlRKh6w==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1776845704; c=relaxed/relaxed;\n\tbh=guNzfHlKCo9CNY+Bza9mDTIoReNzZ+M+FnR7lRKuPVg=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=N0WrpawGWP4jCjHYAVfD05GSSu0ktdbK5XwCWg3w58X+U+59J6nusnA3En0e5nDRcFxE4mbYCPi74vsHgfYQnHFu0ilXIeSdkIzDadDDT+vftMR1ZtPA7uXPcskuWLf8F9hSqH8U82SNJKizMRKNUcSCFaYggCLcMJsGwDa8hX2MfPaor6TPUzD3TKF3Jsw2F6JlKRCCO1wTThl0uBQwxLPWqkgxHsTpCAoBx/6ob5EwWj6NSnCp4O3va81sh5esZiWHWxGN4V4HLU/WmNThDQsDGJg/KlHS3GhGGnbuNZBkuKH2uLfGQ89+GD8Ug22wRCQ37Ajgt9ehPL0MVL7T8g==","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=hgJVpI9c; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::52e; helo=mail-pg1-x52e.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=1776845701; x=1777450501;\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=guNzfHlKCo9CNY+Bza9mDTIoReNzZ+M+FnR7lRKuPVg=;\n b=hgJVpI9cq7ROjEO6UEtLbtfk9RdPtdzQjfP5l7U8NMicV0EduE/NZfYlcNviDpjOF4\n A70ojNO/VUzLqHTQrzgQ/U+y86x3L6WGj8qDxLiAZeRwsj7/oEPSWbL0Khw7H8DTTR1e\n 3FAzZr4/xSmd42rRu6cX1sLvzBPsuYwdZVf9oM2pMKYiyqu+KSmeM5LOSotQRqrXd9Ds\n i+UJToCnpo+3DgUC5RENhSPAVsmyMFV5ptgvcaTJQxuhQ+H3ehf57B7YtFXPQZRKFjQY\n jpFiyqHADzeSSQKRNQPCa1TbLUy+2AQgsiSiveYJ7CMeBebd3IYQcp7LhW3uYZiEvCLr\n akRQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776845701; x=1777450501;\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=guNzfHlKCo9CNY+Bza9mDTIoReNzZ+M+FnR7lRKuPVg=;\n b=TQZgzlIJ3pdAo5hl6ooVw7ehx67n9LZvLbAy4d2UrDwJf4NNHH9/38znIyd/RpUqyi\n VjcCxfVff6PKHGZYbjhKbdbDsnnAicq/CRsSZx/lfkusp52M+QlXOHt6IN+MQTLw193X\n 8EGHDP+G8xyh9sgbm/QKRL+I01xOWpcvZTI/6BpO4paec+5eQgJoM339frGpJHpEPSav\n aBc1WDNIag/P/9AKvqdY4wSqQJHRQae7mALC7Rlumnbp3lpl/kzDao1NxiDlJvHKcLs5\n yKEYBO3ReMhei80JikuZ33WsHftjAnEpvoCc26sgWRneb34m8OPJZd3BYfQOElkJ1F8W\n nkAA==","X-Forwarded-Encrypted":"i=1;\n AFNElJ9X9uI9RCJ8D5mpguhMAQzR+z1HTpw5bBCwQ3lkqy2MUN1IXbPXR/HkUC8Vsdc2D1m6oxifOyp+nD9CAVU=@lists.ozlabs.org","X-Gm-Message-State":"AOJu0Yz2p0DCZcL5vFwxifDWjFXIYf+Zlt4W+P1CjiNreH3jh+Wo/eUk\n\tPK5RIH75KQs3VFs5+838Asp4qhK4IphKE3lPhUODVpgC9tSLffOvxOcwd5pjVdIeDWI=","X-Gm-Gg":"AeBDiesh4nakVoHXzWj/8rEC773x5WfxqGojF/EVQoGSR72/Zj/IZ1hklpp8Hya78D3\n\tL7+ghZrx81G+2Xf7x9f3HpyxDt2/nGs/doHDht94nWxcRuUS5oR+ubV+Bm1aYQZy3xgkLueMorh\n\tMN74ddCMJKAkOZGa5OqbwqZtZbtgTOZNOpt836JuIj+F3ClifOkctKM5/29ZRLKX0S2UrIGDr1H\n\tF0Yw1417Y/gv+k44hVfpZSmnoKBF2BDi9lKtW2Go5gn44Gw50TI1LVOO5slBS1gnaIOch5UvA2w\n\tIGb5PqJ4FMSvay09494HtCJ1CYYp9MojeGNXf5AIBPxAzSgt9LO62kDZxslqu2HVF8+UTnJtMQb\n\tB48Yy75hmm6VMioixva6qTzXBoIRkgUR4gwDjni8F9z7+R2bjBcrVvrZn7ELyLd4Jiq7uIctPeG\n\tV9q23iNiwlRiBLqoqwb4gRSH3W5CFf","X-Received":"by 2002:a05:6a00:3397:b0:82f:24e:6a50 with SMTP id\n d2e1a72fcca58-82f8c830359mr23157259b3a.10.1776845700663;\n Wed, 22 Apr 2026 01:15:00 -0700 (PDT)","From":"Muchun Song ","To":"Andrew Morton ,\n\tDavid Hildenbrand ,\n\tMuchun Song ,\n\tOscar Salvador ,\n\tMichael Ellerman ,\n\tMadhavan Srinivasan ","Cc":"Muchun Song ,\n\tLorenzo 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","Subject":"[PATCH v4 3/5] mm/sparse-vmemmap: Fix DAX vmemmap accounting with\n optimization","Date":"Wed, 22 Apr 2026 16:14:18 +0800","Message-Id":"<20260422081420.4009847-4-songmuchun@bytedance.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20260422081420.4009847-1-songmuchun@bytedance.com>","References":"<20260422081420.4009847-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 \nAcked-by: Mike Rapoport (Microsoft) \nAcked-by: Oscar Salvador \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 c208187a4b00..fcc5e0eda9e7 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@@ -678,9 +701,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_vmemmap_pages(pfn, PAGES_PER_SECTION,\n+\t\t\t\t\t\t NULL, NULL));\n \tvmemmap_free(start, end, NULL);\n }\n \n","prefixes":["v4","3/5"]}