From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92CD730F80C for ; Tue, 8 Sep 2026 03:04:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788836682; cv=none; b=g1CkBToZlQT9xfLAV8Tanz/3vuih/7kQ15iNyGlXMk3BMxw9x1CkOmC5MkM6YWTM0Uggvre1Ga+FfU8nIAZPtQi9nBcl5Tg4Rco6AfOB+FsguIn/8c/ssIYSUaJf/dtZJqZ5dw+J9fgSAMp+38M5i/x379w6zDddjkZaXupj7Cs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788836682; c=relaxed/simple; bh=gtGPqvfkgJXa2d045dU4tvwglGiVXOWcJDVT4mIHLzU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AvGLDNdnAhvEsjcjlvUqOLoNZcYdvjHjKxwYHtlb+QnRQL2OYyw+nP+FSG+MNwYLEt300LmW9I0cdvg/dfVTN6YKQypfhCbcNGZvl0a7mImnXy/N+i5q3xSr6x4DtMTRe+Ot1aljN+nTnkX4veW4F0LnGMNlMqbN/iQrrb4E3eQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=CF9EQOPF; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="CF9EQOPF" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-85339ed040aso3211995b3a.1 for ; Mon, 07 Sep 2026 20:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1788836680; x=1789441480; darn=vger.kernel.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=wfKr3rCUX839N8PLHteC+GkG6En7LO38FWq77XHuH2Y=; b=CF9EQOPFzWd/lfo4G7zW6j3t8tVX397cTn+xqHuGxIE5PgNmWa98su+XIVpY6elH74 im346FpKbuM5bQEtDpuvX9RV8CsXkviCsb9/W9G2NMiF+/oUBs1Fr1tNvdNWA/jHQN7x rsJ9DWBJpcmNtJOU1XKc74UEhOWmVLkkWK9qpQNyVB9xs2lnODThkS0Ctdl3q199khOY 8kVZJIdoAOG4CUCcNLoNVfSgjr7zVArhZru5+DgszPJkw0Dh8zsunKk2MWs9FWTM4NXj r5wznQDVkJxaWeCi5jpXgQBfB4I5yjj7i1h/FCReMk8YTRVN2S0GJEP8B8u9WxGXiNFN cQxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788836680; x=1789441480; 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=wfKr3rCUX839N8PLHteC+GkG6En7LO38FWq77XHuH2Y=; b=SU5ZvP/FQIq7E2Vw9F8MZ/H3LNCrBzojjlMA39f8LWhko+QXyde+iXSfVxcg05CcS1 Gbfjsf/LCiF2effScmkHqEViUwXKZzUioW6z3JDter503iE8g1Fi3iPiNQ7T0xusauAo uC/Uahp+6B7G/SM5V7R/h8rWWSreDWviwVKyq6U26oeY+xD/kRrrzDaFHbOG+7KVqJ9U C+b6c9z1ZfNf2/hvSxqn37Z3QULjuL6kNRB+6QuIkIZakZsezlILZ6OyNM592psUjSj0 RQUay+2KuaIf8yniElAY0qKVGLRtkIWHX7N8DI4vo5RegL1C6Mr1Tc3x8Ag/QyQasAHu kFzg== X-Forwarded-Encrypted: i=1; AKwUvByGEwkXKXWhRrNB0FOSnd7Z1PYDPDI6djvIl2XyaU3GNwzgOi6uKrsX0004W0gnQMdFavMERogr04/xh5s=@vger.kernel.org X-Gm-Message-State: AFuF++lnlBLcHBfe6VbcnnTrEi+7ZqGPH2HXcNfGb/uvVhPrZ8isirQ6 kAn3m3vmdKYMz3DX7n75mkUIDLj494LH9bns+rXulhStadUxvBzfYNH+c98P/spt3PM= X-Gm-Gg: AYBFou06v/LBJjVE15h0+w9i7mAhUmcbBYMHyF/TKsH4iVIJt3p0deVI97Nyctj6TTk pBgXj3DdXxf4PRS8mfBIpXgd5A1TZG6bgA9eQnKXb0nCHmRxK2Ila/wprSU5P+65cdArkIlqSiL o5GW13W1r76ggFLLTKwNMXbufN1kO65QP1PevQ66PY02KoDGG4dyxE1o5MoKpUNKzp8Rw7AQQXH U1qnErdFBwIMhw60kQ9IOFmgiXdTgIoB7aGr8v7JdUSuj3xgWyurc28TwWn7/I5jeqRSQ4XeptL pHChQM1zQvnjCqtorqxUJfWHVVp04fleFLsQESxTxvrSCqu9YlfISZ657TDzojBFIKlnhcN4Mdt 8Z1CiA3Zp+1OYsAUCpF9FZPsUdr7A5m0SnRzN2dQnvs2+N5VTXDH1Hb7IpkseYYYCUC0Ad4KFDX tY1gjZwyTogjAl7yfwKoydpvrb1Y4XUthlk204Ol63OIiGY1kvCNkZR8rEKrAhJ4cwWDzBa0nU+ ueW+unCieGT2+LYqdrCtgMT X-Received: by 2002:a05:6a00:4f81:b0:845:3033:6cb7 with SMTP id d2e1a72fcca58-86166bc01c9mr34022528b3a.9.1788836679806; Mon, 07 Sep 2026 20:04:39 -0700 (PDT) Received: from G6L4RL2QG9.bytedance.net ([61.213.176.9]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-86152a358a2sm4868234b3a.29.2026.09.07.20.04.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 07 Sep 2026 20:04: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 , Randy Dunlap , Muchun Song Subject: [PATCH v2 09/11] mm/sparse-vmemmap: drop the extra tail page from device DAX reservation Date: Tue, 8 Sep 2026 11:03:33 +0800 Message-ID: <20260908030335.96549-10-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260908030335.96549-1-songmuchun@bytedance.com> References: <20260908030335.96549-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 --- arch/powerpc/mm/book3s64/radix_pgtable.c | 46 ++---------------------- include/linux/mm.h | 3 +- mm/mm_init.c | 2 +- mm/sparse-vmemmap.c | 13 ++----- 4 files changed, 7 insertions(+), 57 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 831c231a4a18..e7e751c48dd2 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 a2ebe87e7654..969594074fd2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -5167,7 +5167,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 +5186,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 7a2e58d631c2..629420a83891 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 0201877a7f80..e655d9d1348f 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_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; } @@ -521,17 +520,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