From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C695CA5FC7 for ; Wed, 30 Sep 2026 14:08:44 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4hvxjR14RJz30VL; Thu, 01 Oct 2026 00:08:43 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:39::c" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1790777323; cv=none; b=MGtNB2F4ZxGhb9CvcOcSCx7cOk5YQ9XgpW8d6ehJREuPQoZmo1o8a7lc8kw3mIphBRKhrhOg/eN6YrDQUT6JG0/XIiXG9Amt7pew5+Q4TRpR3172E+51zjLdwRto137Jla/aHtNQXIWvnR8VM79gPrj0t2aWTtcHFD0Nmkp62Cswue2gIMBzFO8DM1TSlesZJiqH9piOE0xKWscLaMMRUPVXNgQQV4vfJCeyCG1Ll9e93g5sM0ChKqrjiUZ9pfLpmcILFlH2m7Elt6chH6ibq8SrVHtQi3i6OwYpwBpWaOKxuIV3JECtwljy4GbJyFvQNX054M+bAB13Ou2xX7QQfQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1790777323; c=relaxed/relaxed; bh=kejX7DiXDSEjNsfVvfwB1fwE0QuTnt9rWXUy2FUn1A4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bKR2z/UVU27EtOiEGnpzdZLP8K5gO3hxSEsd23rZr0tQZlbCPZ9Jka43A7/a58Cv4OpyBJte9MarWw7O9BPqUUXq1KZz0Zr61tug6/W2oYWwd+beGflUF/afPvEZUVxcEtGkChTOaviMA1qKLLem3BKsZcqacj4GeTU2a4QGPmoCznTQaOCl19IUVnFJYEoCdjnVpxQ/hVJF67NFY2g5U/jYyspoC5s3tqy4GGRm9f7MnugoTG0QuApIryatKkOV+ymMEVkd8Xl76Jf0t6UlxKLbyEJvOpZqnSOeqSGnaLna7g2Ux/jwwW20hvHvPnBG5bRZMQ6vytIoSK5vuY8uOw== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; dkim=pass (2048-bit key; unprotected) header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=NmBZsDkg; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:39::c; helo=mail-pj2-x0c.google.com; envelope-from=songmuchun@bytedance.com; receiver=lists.ozlabs.org) smtp.mailfrom=bytedance.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=NmBZsDkg; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=bytedance.com (client-ip=2607:f8b0:4864:39::c; helo=mail-pj2-x0c.google.com; envelope-from=songmuchun@bytedance.com; receiver=lists.ozlabs.org) Received: from mail-pj2-x0c.google.com (mail-pj2-x0c.google.com [IPv6:2607:f8b0:4864:39::c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4hvxjQ2ydwz30V2 for ; Thu, 01 Oct 2026 00:08:42 +1000 (AEST) Received: by mail-pj2-x0c.google.com with SMTP id 98e67ed59e1d1-3a0d31bda43so3327030a91.1 for ; Wed, 30 Sep 2026 07:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1790777320; x=1791382120; darn=lists.ozlabs.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kejX7DiXDSEjNsfVvfwB1fwE0QuTnt9rWXUy2FUn1A4=; b=NmBZsDkgrDT0iO9ThYFH8ws2wrOT6GvAN8WANBOybyMvR6SrNReE6S00KAtowG/D/q uW+arEfcF2RDr0Cz1chTrnhEURnq5uk1gZEskfaOOP9fZxHtSSW43O0eh6k5kzgrEuwI Qc8pNsYL8GcRUUPSN8EQMN0bNGPN3Z4/7HMXoNV/8l8sLmchdl1GM/GmWUS+GDIpXuYy B60F4UA9QzEScGqpec6wAtuakXbsksy3VgldgvQxPXwG55HjVhd52vIENxySYyOjd6AD cOls5U6r4RbDw1ma4ys00zEoI6MPZ2pylGc5qmI8xceej04ZxiHMPo32cKSG4XwEfxuB u/hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790777320; x=1791382120; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kejX7DiXDSEjNsfVvfwB1fwE0QuTnt9rWXUy2FUn1A4=; b=SzD4cjOJUrlGOf2vB90E8cLskjQdlcsTscBhyxLWsQvQ8sHY6OWo9A8SmwGgGtV+NM zfKRcx+/sr6mSRgVx66ndCKER0xiKR3uyzJdAJjfWmbUz9ESq7MCqVaG7ZKBaYeAgKQp P1xBaS01Tc4HrOlS/loE9Nb3XnKbsd0DMOyXNYlrz1aMxy3fPalQQKZ7BsvE/W/k4GzF Ixa4K3pr2ggRDhPS0HTE5aGjqB4ojpJKL3c++JHZvPINeBC1ZH8rAAlpXiwd8W9x/kEl 0LCxAq+r2HgVkWtO3Razc8WyfQeTcBOrQZKlUOnGEaL+t4U+d4ZQr5qBShum5eD/uVJ/ aNcA== X-Forwarded-Encrypted: i=1; AKwUvByOCMhqF13DzRNbi1i/pxvmL6zHV3Tl+CPS6/EoYuk8/Ubr/OXSeEpyt4KZ0zCAnbHRPazrUfqZ7DerO0k=@lists.ozlabs.org X-Gm-Message-State: AFq9FYIsT9vGziv4KnUYCYrAmlnviOG38IZJGOCM05rTJFwO50PYbkgd F6S+JZvxlRqvvGN4jaMUpujTwfzewBmVkfoQ+gYnLemhRWAIieCtNvc91Iz1wYb+hPU= X-Gm-Gg: AYBFou0DhBy6a8tA0UsTM4krltYDh0ma9xRPc1MJ29nmi2zTlc2brpntZdevaWyy2Gc nkYnDIEqdnODSSZFlPApXghtuXEdHvWQEzIDe7NDc0Vkm78/+jk37crS0QO2VdeZNRUu/Y0Fq/+ mmz1NynnvYQyIwLVETT8K+euzvh/DTo8t7GPIBVeux0TedC4wHi/8fKgw9cISLok4QGjdn4gmQ/ 30Gprr3UuGyWz0oVShT+/UW6Bih44FGxhBSIIU0pcKHvKL1WeT0F7zFE3ss8dpeHuhZmDuGpZJS 4wbSXfN7jyF7AiqclZxX/pLKURKVZ+l03Nt0EEEV1uBS3b33YAnEcO+iQXQafaaJviZuNrqn4J1 u6n/tugY3rg9l3GoB7hddpDWCM+Sr1UrOuql1XFpxPSZwpz+0nPVnKpqYNaX/6hJz9G1teebb23 jJu9gX3aH9LNmYq0LYweVikHrgRcNZy4ww0S1UudAwOa5AF3bakSzofaeXLvZ1TWk2ABlXPx7qJ Aersopy/yRYQg== X-Received: by 2002:a17:90b:2d07:b0:3a4:c673:7636 with SMTP id 98e67ed59e1d1-3a4d19d4232mr1117525a91.26.1790777320318; Wed, 30 Sep 2026 07:08:40 -0700 (PDT) Received: from G6L4RL2QG9 ([139.177.225.238]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a4e60ea12csm639509a91.1.2026.09.30.07.08.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Sep 2026 07:08:39 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Oscar Salvador , Madhavan Srinivasan , Michael Ellerman , Jonathan Corbet Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org, Muchun Song , Lorenzo Stoakes , Mike Rapoport , Qi Zheng , Nicholas Piggin , Christophe Leroy , Ritesh Harjani , Shrikanth Hegde , Randy Dunlap , Muchun Song , Lance Yang Subject: [PATCH v6 10/12] mm/sparse-vmemmap: drop the extra tail page from device DAX reservation Date: Wed, 30 Sep 2026 22:06:25 +0800 Message-ID: <20260930140627.57431-11-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260930140627.57431-1-songmuchun@bytedance.com> References: <20260930140627.57431-1-songmuchun@bytedance.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The device DAX vmemmap population still reserves one extra tail vmemmap page after the head page. Drop that extra reservation and let the shared tail page cover all tail vmemmap pages after the head page, so DAX follows the same reservation model as HugeTLB. This reduces the reserved vmemmap pages for optimized DAX mappings to one and removes the now-unneeded first-tail population from the generic and powerpc paths to simplify the code as well. Signed-off-by: Muchun Song Acked-by: Qi Zheng Acked-by: David Hildenbrand (Arm) --- v6: - Collect Acked-by from David Hildenbrand v3: - Collect Acked-by from Qi Zheng --- arch/powerpc/mm/book3s64/radix_pgtable.c | 46 ++---------------------- include/linux/mm.h | 4 +-- mm/mm_init.c | 2 +- mm/sparse-vmemmap.c | 13 ++----- 4 files changed, 8 insertions(+), 57 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index ee068f24a79f..9ca28e4a610a 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1218,39 +1218,6 @@ int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, in return 0; } -static pte_t * __meminit radix__vmemmap_populate_address(unsigned long addr, int node, - struct vmem_altmap *altmap, - struct page *reuse) -{ - pgd_t *pgd; - p4d_t *p4d; - pud_t *pud; - pmd_t *pmd; - pte_t *pte; - - pgd = pgd_offset_k(addr); - p4d = p4d_offset(pgd, addr); - pud = vmemmap_pud_alloc(p4d, node, addr); - if (!pud) - return NULL; - pmd = vmemmap_pmd_alloc(pud, node, addr); - if (!pmd) - return NULL; - if (pmd_leaf(*pmd)) - /* - * The second page is mapped as a hugepage due to a nearby request. - * Force our mapping to page size without deduplication - */ - return NULL; - pte = vmemmap_pte_alloc(pmd, node, addr); - if (!pte) - return NULL; - radix__vmemmap_pte_populate(pmd, addr, node, NULL, NULL); - vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); - - return pte; -} - int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, unsigned long start, unsigned long end, int node, @@ -1297,7 +1264,7 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, if (!pte_none(*pte)) { /* * This could be because we already have a compound - * page whose VMEMMAP_RESERVE_NR pages were mapped and + * page whose retained vmemmap page was mapped and * this request fall in those pages. */ next = addr + PAGE_SIZE; @@ -1318,16 +1285,7 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, return -ENOMEM; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); - /* - * Populate the tail pages vmemmap page - * It can fall in different pmd, hence - * vmemmap_populate_address() - */ - pte = radix__vmemmap_populate_address(addr + PAGE_SIZE, node, NULL, NULL); - if (!pte) - return -ENOMEM; - - next = addr + 2 * PAGE_SIZE; + next = addr + PAGE_SIZE; continue; } diff --git a/include/linux/mm.h b/include/linux/mm.h index 070ce27e9cd3..30a3365bca82 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -38,6 +38,7 @@ #include #include #include +#include struct mempolicy; struct anon_vma; @@ -5167,7 +5168,6 @@ static inline void vmem_altmap_free(struct vmem_altmap *altmap, } #endif -#define VMEMMAP_RESERVE_NR 2 #ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP static inline bool __vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) @@ -5187,7 +5187,7 @@ static inline bool __vmemmap_can_optimize(struct vmem_altmap *altmap, * For vmemmap optimization with DAX we need minimum 2 vmemmap * pages. See layout diagram in Documentation/mm/vmemmap_dedup.rst */ - return !altmap && (nr_vmemmap_pages > VMEMMAP_RESERVE_NR); + return !altmap && (nr_vmemmap_pages > VMEMMAP_OPTIMIZATION_PAGES); } /* * If we don't have an architecture override, use the generic rule diff --git a/mm/mm_init.c b/mm/mm_init.c index efffa8609b85..56bb4567a494 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1056,7 +1056,7 @@ static inline unsigned long compound_nr_pages(unsigned long pfn, if (!section_vmemmap_optimizable(ms)) return pgmap_vmemmap_nr(pgmap); - return VMEMMAP_RESERVE_NR * (PAGE_SIZE / sizeof(struct page)); + return VMEMMAP_OPTIMIZATION_PAGES * (PAGE_SIZE / sizeof(struct page)); } static void __ref memmap_init_compound(struct page *head, diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index e1f8a03e3d49..4cea94126cf6 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -136,7 +136,6 @@ int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages { const struct mem_section *ms = __pfn_to_section(pfn); const int order = section_compound_order(ms); - const int vmemmap_pages = pgmap ? VMEMMAP_RESERVE_NR : VMEMMAP_OPTIMIZATION_PAGES; const unsigned long pages_per_compound = 1UL << order; VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, PAGES_PER_SUBSECTION)); @@ -147,13 +146,13 @@ int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages if (order < PFN_SECTION_SHIFT) { VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, pages_per_compound)); - return vmemmap_pages * nr_pages / pages_per_compound; + return VMEMMAP_OPTIMIZATION_PAGES * nr_pages / pages_per_compound; } VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, PAGES_PER_SECTION)); if (IS_ALIGNED(pfn, pages_per_compound)) - return vmemmap_pages; + return VMEMMAP_OPTIMIZATION_PAGES; return 0; } @@ -558,17 +557,11 @@ static int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, if (!pte) return -ENOMEM; - /* Populate the tail pages vmemmap page */ - next = addr + PAGE_SIZE; - pte = vmemmap_populate_address(next, node, NULL, -1, flags); - if (!pte) - return -ENOMEM; - /* * Reuse the shared page for the rest of tail pages * See layout diagram in Documentation/mm/vmemmap_dedup.rst */ - next += PAGE_SIZE; + next = addr + PAGE_SIZE; rc = vmemmap_populate_range(next, last, node, NULL, page_to_pfn(page), flags); if (rc) -- 2.54.0