Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2219929/?format=api
{ "id": 2219929, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2219929/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260405125240.2558577-5-songmuchun@bytedance.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/1.2/projects/2/?format=api", "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": "<20260405125240.2558577-5-songmuchun@bytedance.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260405125240.2558577-5-songmuchun@bytedance.com/", "date": "2026-04-05T12:51:55", "name": "[04/49] mm/sparse: add a @pgmap parameter to arch vmemmap_populate()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "bdf2dcf5439ff42a2a50a8ad809df66d3e757472", "submitter": { "id": 78930, "url": "http://patchwork.ozlabs.org/api/1.2/people/78930/?format=api", "name": "Muchun Song", "email": "songmuchun@bytedance.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260405125240.2558577-5-songmuchun@bytedance.com/mbox/", "series": [ { "id": 498783, "url": "http://patchwork.ozlabs.org/api/1.2/series/498783/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=498783", "date": "2026-04-05T12:51:51", "name": "mm: Generalize vmemmap optimization for DAX and HugeTLB", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498783/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2219929/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2219929/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-19334-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=GkzEUzYR;\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-19334-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::1030\"", "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=GkzEUzYR;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com\n (client-ip=2607:f8b0:4864:20::1030; helo=mail-pj1-x1030.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 4fpXTH4JHcz1yCs\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 05 Apr 2026 22:53:55 +1000 (AEST)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fpXTB4LpQz2yl2;\n\tSun, 05 Apr 2026 22:53:50 +1000 (AEST)", "from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com\n [IPv6:2607:f8b0:4864:20::1030])\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 4fpXT94Pk0z2xMY\n\tfor <linuxppc-dev@lists.ozlabs.org>; Sun, 05 Apr 2026 22:53:49 +1000 (AEST)", "by mail-pj1-x1030.google.com with SMTP id\n 98e67ed59e1d1-35d9c7bf9a1so2804198a91.3\n for <linuxppc-dev@lists.ozlabs.org>;\n Sun, 05 Apr 2026 05:53:49 -0700 (PDT)", "from n232-176-004.byted.org ([36.110.163.97])\n by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-35de66b4808sm3748505a91.2.2026.04.05.05.53.40\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 05 Apr 2026 05:53:46 -0700 (PDT)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775393630;\n\tcv=none;\n b=TJHhPJJkFoGxGb/wNN9EmYKgfClACtGQmvD+nrePG+09KUIymFa2MyBJZ73310uLO8cyNrR4rGPHu0NKZD+JuHP75VoTZkGVPgH/awrMPrtpCaPHw/CbAAxkioxdxUZNEzfXIC1VCPaojI0J0TFCF/aliBaESGonFb2DEsbUbXLAr5LFoKOwg5K0ZpPUhwnyezy3EYY2Yljwj77W/YhPnaLBPhWWCB9sxMl9lYN7tNm0KLo+YJxK0A4P+GslLSaww6qMmcJsInbBIU49h5D6oAwzOw4wNxk9x393+x2u4IS1smCJWQ90XImDLr6S91oWHaMQhu+83XDBZHznxzD5RQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1775393630; c=relaxed/relaxed;\n\tbh=qqZiP5IDxjx5eZ19SJ749S5+pviMXDrT55UzwpoHOxo=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=TnwZ7PTKHSgkrkNEE0uEqcOCLbMPnlbvpW1FzWgY6rVUFzoUy8HI49k5ucKWUlDtYLQKYo4sE6eI6oq8Yp9GVcHmtFNUnpceC0tWNBrLgEWbDPR8qDOOwJO+JhJGHzGeUQh5K5WVF1wltS2cz/oV4j5izhkfyOAS00qIQYVfpbp9EgLHsrhW4jYNqWWd8yrxGVXyFxSPPQS4CxCTZlB5lvE2Bt1JisJMwnkFdhEJk8JY+Ez0NQ5EMi43NVUx5/2GZxwYCcdwets0YO/Pr61pkLIlD/LuUX/axwYKPLH4wvKaFdbQwttWU0urzj68xuzW64cNJiY12vMfRobTtKAj3w==", "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=GkzEUzYR; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::1030; helo=mail-pj1-x1030.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=1775393628; x=1775998428;\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=qqZiP5IDxjx5eZ19SJ749S5+pviMXDrT55UzwpoHOxo=;\n b=GkzEUzYR9tmQjysSqQXsRhvSsti2SWLN4HVIg5vacO2vK+Vvmzm/0RqTEw2f0sGgqi\n gtiLDxlWfkWnjGRwJtKyoWPZ/OdOtD/MjzEuNa9+P2Rtw8itkPYNBmBBQ+0gcW5EfsYI\n CPMMNf3ZY8SBJ2YeTqitm1XAPFcpcti3AsIVy4R1o0sRdKTcxX2Mk5oUH/4kxRgNZ82F\n HQDlVOZZeXOwzFtygyoEaZ196hLNP/U2JaphQ7ifpOcA5eiwcyCMNl+30jeVDIWvfhtY\n QKLeTTrgKzuCSK+LkD2jpPfXP0nhy2jjojBoDvGgHdp4PVP+6ITsGNzZ7LekoFHrTuYh\n arGA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775393628; x=1775998428;\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=qqZiP5IDxjx5eZ19SJ749S5+pviMXDrT55UzwpoHOxo=;\n b=VCKCLJiIf+kfzOKqfklOyMztT1nyP2Sp3CaTpSllUVuob4G/1LbeyNEXEXalNY7lpb\n RkhJGhrT5vWOxZ5SZYhsNtfJCMfQZ+1jsTRv8Zrgy9SMD9e8TvbhJQAv28D2Fo9CIJCq\n lF769Esu9xtGvaH5THP+sGZ2XIlFukCM+1YlqZTCIT+1eEFOd5FkGRg8PnP3Tf4rM5wB\n tZJieC49/CHsaLx+APJsGkdb2K8XXcWn1yDDxAX6rIQHlKSYeDeHqgv2s181deeB+Nau\n 48THc0i+670ue5WapgMS+LTbXG2ddmYQgcDbbX49pmziLc1mYpAQMnJt9wTAGgzZWZBv\n POSw==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCWC9nIXZ6/RXEFdvycTE3dikskSHbLS7iZ4aRsEM+ztWvji2MPTHvx6LsyU5YwPfDn1PQm1jdQOZS8m5Pc=@lists.ozlabs.org", "X-Gm-Message-State": "AOJu0Yz8kJdbOLFjyL/GU5Rdx9AuSJwupOxG+WHQ81LiGG0s4Sd46Pbj\n\thZnpGQxzJvQRSv9iKyiuNgGYWN/S7FBIIi1nb+h9OxmjOEu84Ot2wuwiXShSyrMrRdw=", "X-Gm-Gg": "AeBDietWsAhnkhz7S7vCziAThPY1z9hufE2dgVhrxgcivLb2DJcsNsMnwaKJWpSL6LJ\n\tjZcfCnFx6J8q22TGca6X9iDPC9RAzOp/UDlzcqovmKKKICxXswlXPSiTme5BoppjhdegjaM2WM9\n\t+CYdX0BSaw81LVt/PdAOyLxXx02j2wHVdf2Mo4pgSZQvvFFOwLBznHxEsNs/OUQf+xUfYsFN6pM\n\t48S1gEEjXdgSuWczWhyi4zipgy3ceQZ7L38b5wN4fTD833lIteEpncZ6J366lX1GwFV2+6SuMnH\n\tYRe1eKbdBR+KaImlUAU+GmXgsm8GsCdFXRkqGpXcwSBiRsFvb//BWrZ8n+K6iRFBM0Iu70bA2tF\n\tY1Z22sHbxzPxVPXBzRVUev8GDD4hVpaOwo0MI3Tt8xWByqGsouaBcnVwi9GrnBwijXnruKt+7LM\n\t/ynJfXtaZvRfwpFY/fgBWM37nTD8AXV5hiZshhqL7tr8w=", "X-Received": "by 2002:a17:90b:1dcc:b0:35d:a3b4:2f00 with SMTP id\n 98e67ed59e1d1-35de6810254mr8790455a91.8.1775393627679;\n Sun, 05 Apr 2026 05:53:47 -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 04/49] mm/sparse: add a @pgmap parameter to arch\n vmemmap_populate()", "Date": "Sun, 5 Apr 2026 20:51:55 +0800", "Message-Id": "<20260405125240.2558577-5-songmuchun@bytedance.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20260405125240.2558577-1-songmuchun@bytedance.com>", "References": "<20260405125240.2558577-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": "Add the struct dev_pagemap pointer as a parameter to the architecture\nspecific vmemmap_populate(), vmemmap_populate_hugepages() and\nvmemmap_populate_basepages() functions.\n\nCurrently, the vmemmap optimization for DAX is handled mostly in an\narchitecture-agnostic way via vmemmap_populate_compound_pages().\nHowever, this approach skips crucial architecture-specific initialization\nsteps. For example, the x86 path must call sync_global_pgds() after\npopulating the vmemmap, which is currently being bypassed.\n\nTo fix this, we need to push the awareness of device memory optimization\n(via the pgmap) down into the architecture-specific vmemmap_populate()\npaths. This will allow each architecture to handle the optimization while\nensuring their specific initialization routines (like page directory\nsynchronization) are correctly invoked.\n\nThis is a preparatory patch only; it changes no behavior. The actual\narchitecture-specific implementations and fixes will follow.\n\nSigned-off-by: Muchun Song <songmuchun@bytedance.com>\n---\n arch/arm64/mm/mmu.c | 6 +++---\n arch/loongarch/mm/init.c | 7 ++++---\n arch/powerpc/include/asm/book3s/64/radix.h | 3 ++-\n arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +-\n arch/powerpc/mm/init_64.c | 4 ++--\n arch/riscv/mm/init.c | 4 ++--\n arch/s390/mm/vmem.c | 2 +-\n arch/sparc/mm/init_64.c | 5 +++--\n arch/x86/mm/init_64.c | 8 ++++----\n include/linux/mm.h | 8 +++++---\n mm/hugetlb_vmemmap.c | 4 ++--\n mm/sparse-vmemmap.c | 10 ++++++----\n 12 files changed, 35 insertions(+), 28 deletions(-)", "diff": "diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c\nindex dc8a8281888c..86162aab5185 100644\n--- a/arch/arm64/mm/mmu.c\n+++ b/arch/arm64/mm/mmu.c\n@@ -1760,7 +1760,7 @@ int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,\n }\n \n int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\tstruct vmem_altmap *altmap)\n+\t\tstruct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \tWARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END));\n \t/* [start, end] should be within one section */\n@@ -1768,9 +1768,9 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n \n \tif (!IS_ENABLED(CONFIG_ARM64_4K_PAGES) ||\n \t (end - start < PAGES_PER_SECTION * sizeof(struct page)))\n-\t\treturn vmemmap_populate_basepages(start, end, node, altmap);\n+\t\treturn vmemmap_populate_basepages(start, end, node, altmap, pgmap);\n \telse\n-\t\treturn vmemmap_populate_hugepages(start, end, node, altmap);\n+\t\treturn vmemmap_populate_hugepages(start, end, node, altmap, pgmap);\n }\n \n #ifdef CONFIG_MEMORY_HOTPLUG\ndiff --git a/arch/loongarch/mm/init.c b/arch/loongarch/mm/init.c\nindex c9c57f08fa2c..d61c2e09caae 100644\n--- a/arch/loongarch/mm/init.c\n+++ b/arch/loongarch/mm/init.c\n@@ -123,12 +123,13 @@ int __meminit vmemmap_check_pmd(pmd_t *pmd, int node,\n }\n \n int __meminit vmemmap_populate(unsigned long start, unsigned long end,\n-\t\t\t int node, struct vmem_altmap *altmap)\n+\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t struct dev_pagemap *pgmap)\n {\n #if CONFIG_PGTABLE_LEVELS == 2\n-\treturn vmemmap_populate_basepages(start, end, node, NULL);\n+\treturn vmemmap_populate_basepages(start, end, node, NULL, pgmap);\n #else\n-\treturn vmemmap_populate_hugepages(start, end, node, NULL);\n+\treturn vmemmap_populate_hugepages(start, end, node, NULL, pgmap);\n #endif\n }\n \ndiff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h\nindex da954e779744..bde07c6f900f 100644\n--- a/arch/powerpc/include/asm/book3s/64/radix.h\n+++ b/arch/powerpc/include/asm/book3s/64/radix.h\n@@ -321,7 +321,8 @@ extern int __meminit radix__vmemmap_create_mapping(unsigned long start,\n \t\t\t\t\t unsigned long page_size,\n \t\t\t\t\t unsigned long phys);\n int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end,\n-\t\t\t\t int node, struct vmem_altmap *altmap);\n+\t\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t\t struct dev_pagemap *pgmap);\n void __ref radix__vmemmap_free(unsigned long start, unsigned long end,\n \t\t\t struct vmem_altmap *altmap);\n extern void radix__vmemmap_remove_mapping(unsigned long start,\ndiff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c\nindex 10aced261cff..568500343e5f 100644\n--- a/arch/powerpc/mm/book3s64/radix_pgtable.c\n+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c\n@@ -1112,7 +1112,7 @@ static inline pte_t *vmemmap_pte_alloc(pmd_t *pmdp, int node,\n \n \n int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\t\t\t struct vmem_altmap *altmap)\n+\t\t\t\t struct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \tunsigned long addr;\n \tunsigned long next;\ndiff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c\nindex b6f3ae03ca9e..8f4aa5b32186 100644\n--- a/arch/powerpc/mm/init_64.c\n+++ b/arch/powerpc/mm/init_64.c\n@@ -275,12 +275,12 @@ static int __meminit __vmemmap_populate(unsigned long start, unsigned long end,\n }\n \n int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\t\t struct vmem_altmap *altmap)\n+\t\t\t struct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \n #ifdef CONFIG_PPC_BOOK3S_64\n \tif (radix_enabled())\n-\t\treturn radix__vmemmap_populate(start, end, node, altmap);\n+\t\treturn radix__vmemmap_populate(start, end, node, altmap, pgmap);\n #endif\n \n \treturn __vmemmap_populate(start, end, node, altmap);\ndiff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c\nindex 980f693e6b19..277c89661dff 100644\n--- a/arch/riscv/mm/init.c\n+++ b/arch/riscv/mm/init.c\n@@ -1443,7 +1443,7 @@ int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,\n }\n \n int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\t\t struct vmem_altmap *altmap)\n+\t\t\t struct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \t/*\n \t * Note that SPARSEMEM_VMEMMAP is only selected for rv64 and that we\n@@ -1451,7 +1451,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n \t * memory hotplug, we are not able to update all the page tables with\n \t * the new PMDs.\n \t */\n-\treturn vmemmap_populate_hugepages(start, end, node, altmap);\n+\treturn vmemmap_populate_hugepages(start, end, node, altmap, pgmap);\n }\n #endif\n \ndiff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c\nindex eeadff45e0e1..a7bf8d3d5601 100644\n--- a/arch/s390/mm/vmem.c\n+++ b/arch/s390/mm/vmem.c\n@@ -506,7 +506,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size)\n * Add a backed mem_map array to the virtual mem_map array.\n */\n int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\t\t struct vmem_altmap *altmap)\n+\t\t\t struct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \tint ret;\n \ndiff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c\nindex 367c269305e5..f870ca330f9e 100644\n--- a/arch/sparc/mm/init_64.c\n+++ b/arch/sparc/mm/init_64.c\n@@ -2591,9 +2591,10 @@ int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,\n }\n \n int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,\n-\t\t\t int node, struct vmem_altmap *altmap)\n+\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t struct dev_pagemap *pgmap)\n {\n-\treturn vmemmap_populate_hugepages(vstart, vend, node, NULL);\n+\treturn vmemmap_populate_hugepages(vstart, vend, node, NULL, pgmap);\n }\n #endif /* CONFIG_SPARSEMEM_VMEMMAP */\n \ndiff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c\nindex 77b889b71cf3..e18cc81a30b4 100644\n--- a/arch/x86/mm/init_64.c\n+++ b/arch/x86/mm/init_64.c\n@@ -1557,7 +1557,7 @@ int __meminit vmemmap_check_pmd(pmd_t *pmd, int node,\n }\n \n int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\tstruct vmem_altmap *altmap)\n+\t\tstruct vmem_altmap *altmap, struct dev_pagemap *pgmap)\n {\n \tint err;\n \n@@ -1565,15 +1565,15 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,\n \tVM_BUG_ON(!PAGE_ALIGNED(end));\n \n \tif (end - start < PAGES_PER_SECTION * sizeof(struct page))\n-\t\terr = vmemmap_populate_basepages(start, end, node, NULL);\n+\t\terr = vmemmap_populate_basepages(start, end, node, NULL, pgmap);\n \telse if (boot_cpu_has(X86_FEATURE_PSE))\n-\t\terr = vmemmap_populate_hugepages(start, end, node, altmap);\n+\t\terr = vmemmap_populate_hugepages(start, end, node, altmap, pgmap);\n \telse if (altmap) {\n \t\tpr_err_once(\"%s: no cpu support for altmap allocations\\n\",\n \t\t\t\t__func__);\n \t\terr = -ENOMEM;\n \t} else\n-\t\terr = vmemmap_populate_basepages(start, end, node, NULL);\n+\t\terr = vmemmap_populate_basepages(start, end, node, NULL, pgmap);\n \tif (!err)\n \t\tsync_global_pgds(start, end - 1);\n \treturn err;\ndiff --git a/include/linux/mm.h b/include/linux/mm.h\nindex 0b776907152e..bebc5f892f81 100644\n--- a/include/linux/mm.h\n+++ b/include/linux/mm.h\n@@ -4877,11 +4877,13 @@ void vmemmap_set_pmd(pmd_t *pmd, void *p, int node,\n int vmemmap_check_pmd(pmd_t *pmd, int node,\n \t\t unsigned long addr, unsigned long next);\n int vmemmap_populate_basepages(unsigned long start, unsigned long end,\n-\t\t\t int node, struct vmem_altmap *altmap);\n+\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t struct dev_pagemap *pgmap);\n int vmemmap_populate_hugepages(unsigned long start, unsigned long end,\n-\t\t\t int node, struct vmem_altmap *altmap);\n+\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t struct dev_pagemap *pgmap);\n int vmemmap_populate(unsigned long start, unsigned long end, int node,\n-\t\tstruct vmem_altmap *altmap);\n+\t\tstruct vmem_altmap *altmap, struct dev_pagemap *pgmap);\n int vmemmap_populate_hvo(unsigned long start, unsigned long end,\n \t\t\t unsigned int order, struct zone *zone,\n \t\t\t unsigned long headsize);\ndiff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c\nindex 4a077d231d3a..50b7123f3bdd 100644\n--- a/mm/hugetlb_vmemmap.c\n+++ b/mm/hugetlb_vmemmap.c\n@@ -829,7 +829,7 @@ void __init hugetlb_vmemmap_init_late(int nid)\n \t\t\t */\n \t\t\tlist_del(&m->list);\n \n-\t\t\tvmemmap_populate(start, end, nid, NULL);\n+\t\t\tvmemmap_populate(start, end, nid, NULL, NULL);\n \t\t\tnr_mmap = end - start;\n \t\t\tmemmap_boot_pages_add(DIV_ROUND_UP(nr_mmap, PAGE_SIZE));\n \n@@ -845,7 +845,7 @@ void __init hugetlb_vmemmap_init_late(int nid)\n \t\tif (vmemmap_populate_hvo(start, end, huge_page_order(h), zone,\n \t\t\t\t\t HUGETLB_VMEMMAP_RESERVE_SIZE) < 0) {\n \t\t\t/* Fallback if HVO population fails */\n-\t\t\tvmemmap_populate(start, end, nid, NULL);\n+\t\t\tvmemmap_populate(start, end, nid, NULL, NULL);\n \t\t\tnr_mmap = end - start;\n \t\t} else {\n \t\t\tm->flags |= HUGE_BOOTMEM_ZONES_VALID;\ndiff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c\nindex 0ef96b1afbcc..387337bba05e 100644\n--- a/mm/sparse-vmemmap.c\n+++ b/mm/sparse-vmemmap.c\n@@ -297,7 +297,8 @@ static int __meminit vmemmap_populate_range(unsigned long start,\n }\n \n int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end,\n-\t\t\t\t\t int node, struct vmem_altmap *altmap)\n+\t\t\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t\t\t struct dev_pagemap *pgmap)\n {\n \treturn vmemmap_populate_range(start, end, node, altmap, -1, 0);\n }\n@@ -400,7 +401,8 @@ int __weak __meminit vmemmap_check_pmd(pmd_t *pmd, int node,\n }\n \n int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,\n-\t\t\t\t\t int node, struct vmem_altmap *altmap)\n+\t\t\t\t\t int node, struct vmem_altmap *altmap,\n+\t\t\t\t\t struct dev_pagemap *pgmap)\n {\n \tunsigned long addr;\n \tunsigned long next;\n@@ -445,7 +447,7 @@ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,\n \t\t\t}\n \t\t} else if (vmemmap_check_pmd(pmd, node, addr, next))\n \t\t\tcontinue;\n-\t\tif (vmemmap_populate_basepages(addr, next, node, altmap))\n+\t\tif (vmemmap_populate_basepages(addr, next, node, altmap, pgmap))\n \t\t\treturn -ENOMEM;\n \t}\n \treturn 0;\n@@ -559,7 +561,7 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,\n \tif (vmemmap_can_optimize(altmap, pgmap))\n \t\tr = vmemmap_populate_compound_pages(pfn, start, end, nid, pgmap);\n \telse\n-\t\tr = vmemmap_populate(start, end, nid, altmap);\n+\t\tr = vmemmap_populate(start, end, nid, altmap, pgmap);\n \n \tif (r < 0)\n \t\treturn NULL;\n", "prefixes": [ "04/49" ] }