From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.170 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793590010; b=PifFHmiqPI82LUM4FQbefY0i6sqM62G4eJ2C/21FVHVmiECJWiEjyqrauyhYvVJwDWmA nMV8JmW/mMSThnRbOIt882pH+E83ZbIrXI3D9qQg/vMIupM1JFk2eeQZuYYPlpYu5ldpV yhdMkfqIar8bF5gdG7dbQBAc5RpsDxsPTqT3XLOzz83TqxN/dWvEIJYO408cNUsU7ryeJ BOWTy+s6Z0dePYspvdjzl8wwp6/ny2ZMkph1lytokQ4UZqwrc6Q3DTvQJEGI9VTI378OG QUKhn6R19QY1Lx5HdVu/0w/0Sc5zoywLoYQ4VAdGxY0YpmuNbBX9pI8LOos8R0Za2gg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793590010; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=lJ54Xg0GcpdGsVS9czVD/kKCrgo5Wxyx3XdjPkQ/X5g=; b=PdSN3j85BE/hSIBEgK6nlGq291NhC65T7zfq5WS9s0Icz8PeslL7t4av38N6fMZC8XIK npuTHmI0YNJ3PsHAnHOUjFJqdhRw0Yaak3Nwb1Ef7djAIdrHlxPTAvvoiBPSbatxTpNe7 kQvLA38I/pJt4ZQL9SZ6nB8mOdUspuyu32tdxW9PTnYUucrzIRhUgEPaA/hy4tw6zQGlq nOyVIbwAqkRyiW0DSbnCSppbXWj/Fi/Nz/nq8+TYb3nRFjB2EE6ldHztKfjEwCIni5GmS +OgrjTYW7xwf5skJorSpARIjqkrMl/2KdqLDjBWU4aaNmJ5mpjMVdCKmdvqRUeYmMfQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=NR1YMUIE; arc=none smtp.remote-ip=209.85.214.170 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85995606A329 for ; Mon, 2 Nov 2026 03:26:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 85995606A329 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, unprotected) header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=NR1YMUIE Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2e942864693so13792505ad.1 for ; Sun, 01 Nov 2026 19:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1793590009; x=1794194809; 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=lJ54Xg0GcpdGsVS9czVD/kKCrgo5Wxyx3XdjPkQ/X5g=; b=NR1YMUIEuwNcsitJ0tAw8/3N4ScB2DWf2WXlS+lwiZzHcyuC1lZkqhS2VcYqI54gOy PUs3Iq7CLbD5lLqw7CaDe8zdrS6J0nu6rW3fNA7WaP2y7CuvtsRqktddoTErG9vbTQKT Woks180enuNw8FOl8SbinOsEJH+gqwHtq4HRXmw2dNDccBZP30yR1/65n2LbE5dZ6FEw H7G/2VfBAr6acL9sDals/yghtR+2sf1HCfY++uvfL7QE7KY0bUgabO9cLki8T/KUV/9Y rWkV1KRrgSx9YMncrgo7T+c13X96uKM5Kw0VBjUIWxBNvonQsDY+JYQegCrrE0XOWNKb 1qZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793590009; x=1794194809; 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=lJ54Xg0GcpdGsVS9czVD/kKCrgo5Wxyx3XdjPkQ/X5g=; b=xzdW3Z+8BDvc9EShG3PY3yd/C9lymDFWxeSydWEy/H3ldMxOGZnYAJgF7RjfPuV33p T5ac6nkcbG/KgiNqXWWYcNlHFOWRtl0OvgkjjWJbCldto2WAEQUk/MIRd1j7e0Xxq2Ip TYNVQDyoVKPBhT2ZG7yw8AAqb7mgvVkCLqYDFv6Llh3/njla/QcZvl9gXHcM8G5jSrwM cPjB+UobDtJhFrHO1SFm1DyoxzEEQszHeljQj/47k3z0Tlt7bhx2CCV7ZaJ8hkYBPhrJ 5V7BL38pQVBJU9zM24yaiflaBnN+pH5eKSZLKEry27t/5q4EQUeosp3flXVRRB4YR4KO Qegg== X-Forwarded-Encrypted: i=1; AKwUvBwivyrEPOWe0/PM7AuUlrOrfP5UlWdvaIw7AjVV00vqfatnEQbzk/DQ4Z4FoYbR2D1+sbVMAWUhKLkzBtc=@vger.kernel.org X-Gm-Message-State: APuU4Z9f/vszvalB1NMfz3k9D8bZgSP3J06DzUgxqXE7CBXZiOZf/5WB ZumQr/Spts6qgYeIk3YfenxXGw3Q4ccU7/ipFJTjHgOd+xfqOWmRAhEfYKd6v38JKA8= X-Gm-Gg: AYBFou17wSBJe2BvRqPfSQdaw1unSl8AQ1FKwfm7jrEFuFd5iMRdPTP5tGAGJoYXbzv 6562Lb+V5+lB/OecxPJY+haRM9dxg8DKFnLLLkxZtgtT9Xq7Fs2bofOaEbCFNqnK/Ta4RPqmScR kfxZHztc2x3up5dSiCYg9LTCV/vaJr/jALopfySSWnYV8Au8hY8pB2ydhGe2hSlKXUEW3nxpoHo xJhccfWdB69YAZVpktWEZVRpi/12GcbH8MzJCwZmEQnyydgJKdjwGe9i2zV7DI6SYdtBjOUHYuh bfHN/CZ6aCvNZ33+AVmDcrOzcEowdvWYBfhEzH8iujgE87+RXqviW2JX/9jEV7aRyz3B5o6yZNw VEARbjtrtF8b89XQNTde8MrkyxwfW9A2ALjcm2dTlbskOZcx/frzWujlB3IQ2pa247uHxzGokJ7 RTGZFuG1eEge63ExfI1beAU4Yih+TgYQ45OgdCDXbhgdK2bndF2DEGxlvxVo9g4rbA/hUDZtvBu ZALCejKdPwK3Us7aDUyBe13jnkjVtQTcyFjH0P5gE4QK5+0l/HQV5SNVV0tCBAtpHbgDofh3qSm pgmRTSAzGW78/7/1pa4LXk/eRqJ/60ZDiPKk1NmkOf8YuwMIqQ== X-Received: by 2002:a17:90b:28c5:b0:3ad:ce24:acfa with SMTP id 98e67ed59e1d1-3ae897c652dmr6697898a91.20.1793590008702; Sun, 01 Nov 2026 19:26:48 -0800 (PST) Received: from n232-176-004.byted.org ([36.110.163.99]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ae845984absm12303317a91.10.2026.11.01.19.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2026 19:26:48 -0800 (PST) From: Muchun Song To: Oscar Salvador , Andrew Morton , Mike Rapoport Cc: Qi Zheng , Lance Yang , James Houghton , David Hildenbrand , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH v2 07/12] mm: hugetlb_vmemmap: simplify shared tail page handling Date: Mon, 2 Nov 2026 11:25:20 +0800 Message-ID: <20261102032525.3597743-8-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261102032525.3597743-1-songmuchun@bytedance.com> References: <20261102032525.3597743-1-songmuchun@bytedance.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The remap walker currently carries a shared tail page selected by its caller, even though the optimize and restore callbacks can derive the same information from the folio being processed. This adds redundant state to the walker and couples its interface to caller-side preparation. Derive the shared mapping state in the callbacks instead, keeping the mapping policy with the PTE being processed and simplifying the remap interface. No functional change intended. Signed-off-by: Muchun Song Reviewed-by: Lance Yang Reviewed-by: Qi Zheng --- v2: - Update the vmemmap page-list contract for shared tail derivation (follow-up to review by Lance Yang and Qi Zheng) - Collect Reviewed-by from Lance Yang and Qi Zheng --- include/linux/vmemmap-optimization.h | 6 +- mm/hugetlb_vmemmap.c | 90 +++++++++++++--------------- mm/mm_init.c | 6 +- mm/sparse-vmemmap.c | 7 ++- 4 files changed, 51 insertions(+), 58 deletions(-) diff --git a/include/linux/vmemmap-optimization.h b/include/linux/vmemmap-optimization.h index 065840f3c241..858311a71b0c 100644 --- a/include/linux/vmemmap-optimization.h +++ b/include/linux/vmemmap-optimization.h @@ -91,11 +91,13 @@ static inline struct page *vmemmap_shared_tail_page(unsigned int order, } #endif /* CONFIG_VMEMMAP_OPTIMIZATION */ -static inline bool vmemmap_optimizable_pfn(unsigned long pfn) +static inline bool vmemmap_optimizable_pfn(unsigned long pfn, unsigned int order) { - const unsigned int order = pfn_to_section_compound_order(pfn); const unsigned long nr_pages = 1UL << order; + if (!IS_ENABLED(CONFIG_VMEMMAP_OPTIMIZATION)) + return false; + if (!is_power_of_2(sizeof(struct page))) return false; diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 5e84004db4b8..d0af251aa533 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -25,21 +25,17 @@ * * @remap_pte: called for each lowest-level entry (PTE). * @nr_walked: the number of walked pte. - * @vmemmap_tail: the page to be installed as non-first in the vmemmap range * @vmemmap_pages: list supplying replacement pages for the remap and * receiving displaced backing pages for the caller to free. * @flags: used to modify behavior in vmemmap page table walking * operations. */ struct vmemmap_remap_walk { - void (*remap_pte)(pte_t *pte, unsigned long addr, + int (*remap_pte)(pte_t *pte, unsigned long addr, struct vmemmap_remap_walk *walk); - unsigned long nr_walked; - struct page *vmemmap_tail; struct list_head *vmemmap_pages; - /* Defer safely batchable TLB flushes to the caller. */ #define VMEMMAP_DEFER_TLB_FLUSH BIT(0) unsigned long flags; @@ -140,12 +136,14 @@ static int vmemmap_pmd_entry(pmd_t *pmd, unsigned long addr, static int vmemmap_pte_entry(pte_t *pte, unsigned long addr, unsigned long next, struct mm_walk *walk) { + int ret; struct vmemmap_remap_walk *vmemmap_walk = walk->private; - vmemmap_walk->remap_pte(pte, addr, vmemmap_walk); - vmemmap_walk->nr_walked++; + ret = vmemmap_walk->remap_pte(pte, addr, vmemmap_walk); + if (!ret) + vmemmap_walk->nr_walked++; - return 0; + return ret; } static const struct mm_walk_ops vmemmap_remap_ops = { @@ -213,53 +211,53 @@ static struct page *vmemmap_dup_page_from_list(const struct page *src, return dst; } -static void vmemmap_optimize_pte(pte_t *pte, unsigned long addr, - struct vmemmap_remap_walk *walk) +static inline struct page *folio_vmemmap_shared_tail_page(const struct folio *folio) { - struct page *page = pte_page(ptep_get(pte)); - pte_t entry; - - /* Remapping the head page requires r/w */ - if (unlikely(walk->nr_walked == 0)) { - struct page *head; + return vmemmap_shared_tail_page(folio_order(folio), folio_zone(folio)); +} - VM_WARN_ON_ONCE(!PageHead((const struct page *)addr)); +static int vmemmap_optimize_pte(pte_t *pte, unsigned long addr, + struct vmemmap_remap_walk *walk) +{ + const struct page *page = (const struct page *)addr; + const struct folio *folio = page_folio(page); + struct page *src = pte_page(ptep_get(pte)), *dst; - head = vmemmap_dup_page_from_list(page, walk->vmemmap_pages); - entry = mk_pte(head, PAGE_KERNEL); + if (likely(vmemmap_optimizable_pfn(page_to_pfn(page), folio_order(folio)))) { + dst = folio_vmemmap_shared_tail_page(folio); + if (!dst) + return -ENOMEM; } else { - VM_WARN_ON_ONCE(!PageTail((const struct page *)addr)); - - /* - * Map the shared tail page writable. A lockless get that read - * a non-zero refcount before the remap can still do its - * cmpxchg after it. The refcount is zero, so the cmpxchg - * fails and leaves the page unchanged. - */ - entry = mk_pte(walk->vmemmap_tail, PAGE_KERNEL); + dst = vmemmap_dup_page_from_list(src, walk->vmemmap_pages); } - list_add(&page->lru, walk->vmemmap_pages); - set_pte_at(&init_mm, addr, pte, entry); + list_add(&src->lru, walk->vmemmap_pages); + /* + * Map the shared tail page writable intentionally. A lockless get that + * read a non-zero refcount before the remap can still do its cmpxchg + * after it. The refcount is zero, so the cmpxchg fails and leaves the + * page unchanged. + */ + set_pte_at(&init_mm, addr, pte, mk_pte(dst, PAGE_KERNEL)); + + return 0; } -static void vmemmap_restore_pte(pte_t *pte, unsigned long addr, - struct vmemmap_remap_walk *walk) +static int vmemmap_restore_pte(pte_t *pte, unsigned long addr, + struct vmemmap_remap_walk *walk) { + const struct page *page = (const struct page *)addr; + const struct folio *folio = page_folio(page); struct page *src = pte_page(ptep_get(pte)), *dst; - /* - * When rolling back vmemmap_remap_free(), keep the copied head page - * mapping and restore only PTEs currently pointing at the shared tail - * page. - */ - if (walk->vmemmap_tail && walk->vmemmap_tail != src) - return; - - VM_WARN_ON_ONCE(PageHead((const struct page *)addr)); + if (unlikely(!vmemmap_optimizable_pfn(page_to_pfn(page), folio_order(folio)))) + return 0; + VM_WARN_ON_ONCE(folio_vmemmap_shared_tail_page(folio) != src); dst = vmemmap_dup_page_from_list(src, walk->vmemmap_pages); set_pte_at(&init_mm, addr, pte, mk_pte(dst, PAGE_KERNEL)); + + return 0; } /** @@ -287,7 +285,6 @@ static int vmemmap_remap_split(unsigned long start, unsigned long end) * to remap. * @end: end address of the vmemmap virtual address range that we want to * remap. - * @vmemmap_tail: the page to be installed as non-first in the vmemmap range * @vmemmap_pages: input/output list whose first entry supplies the new backing * page for @start; replaced backing pages are added to the list for * the caller to free. @@ -296,14 +293,12 @@ static int vmemmap_remap_split(unsigned long start, unsigned long end) * Return: %0 on success, negative error code otherwise. */ static int vmemmap_remap_free(unsigned long start, unsigned long end, - struct page *vmemmap_tail, struct list_head *vmemmap_pages, unsigned long flags) { int ret; struct vmemmap_remap_walk walk = { .remap_pte = vmemmap_optimize_pte, - .vmemmap_tail = vmemmap_tail, .vmemmap_pages = vmemmap_pages, .flags = flags, }; @@ -321,7 +316,6 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end, */ walk = (struct vmemmap_remap_walk) { .remap_pte = vmemmap_restore_pte, - .vmemmap_tail = vmemmap_tail, .vmemmap_pages = vmemmap_pages, .flags = 0, }; @@ -496,7 +490,6 @@ static int __hugetlb_vmemmap_optimize_folio(const struct hstate *h, unsigned long flags) { unsigned long vmemmap_start, vmemmap_end; - struct page *vmemmap_tail; int nid, ret = 0; VM_WARN_ON_ONCE_FOLIO(!folio_test_hugetlb(folio), folio); @@ -506,9 +499,6 @@ static int __hugetlb_vmemmap_optimize_folio(const struct hstate *h, return ret; nid = folio_nid(folio); - vmemmap_tail = vmemmap_shared_tail_page(h->order, folio_zone(folio)); - if (!vmemmap_tail) - return -ENOMEM; /* * Very Subtle @@ -537,7 +527,7 @@ static int __hugetlb_vmemmap_optimize_folio(const struct hstate *h, * they can be freed by the caller. */ ret = vmemmap_remap_free(vmemmap_start, vmemmap_end, - vmemmap_tail, vmemmap_pages, flags); + vmemmap_pages, flags); out: if (ret) folio_clear_hugetlb_vmemmap_optimized(folio); diff --git a/mm/mm_init.c b/mm/mm_init.c index d99af80ec752..a9d848c92678 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -914,6 +914,8 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone #endif for (pfn = start_pfn; pfn < end_pfn; ) { + const unsigned int order = pfn_to_section_compound_order(pfn); + /* * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory. @@ -929,9 +931,7 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone * Vmemmap-optimizable PFNs are backed by shared tail struct pages, * which have already been initialized during vmemmap population. */ - if (vmemmap_optimizable_pfn(pfn)) { - const unsigned int order = pfn_to_section_compound_order(pfn); - + if (vmemmap_optimizable_pfn(pfn, order)) { pfn = min(ALIGN(pfn, 1UL << order), end_pfn); continue; } diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 3e9d6617c4bb..b8b55e12f5ba 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -241,7 +241,7 @@ static __meminit void *vmemmap_alloc_pte(unsigned long pfn, int node, struct page *page; const unsigned int order = pfn_to_section_compound_order(pfn); - if (!vmemmap_optimizable_pfn(pfn)) + if (!vmemmap_optimizable_pfn(pfn, order)) return vmemmap_alloc_block_buf(PAGE_SIZE, node, altmap); /* @@ -286,6 +286,7 @@ static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, in { pte_t *pte = pte_offset_kernel(pmd, addr); unsigned long pfn = page_to_pfn((struct page *)addr); + const unsigned int order = pfn_to_section_compound_order(pfn); if (pte_none(ptep_get(pte))) { pte_t entry; @@ -296,10 +297,10 @@ static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, in entry = pfn_pte(PHYS_PFN(__pa(p)), PAGE_KERNEL); /* Map the shared tail page as read-only to catch illegal writes. */ - if (vmemmap_optimizable_pfn(pfn)) + if (vmemmap_optimizable_pfn(pfn, order)) entry = pte_wrprotect(entry); set_pte_at(&init_mm, addr, pte, entry); - } else if (WARN_ON_ONCE(vmemmap_optimizable_pfn(pfn))) + } else if (WARN_ON_ONCE(vmemmap_optimizable_pfn(pfn, order))) return NULL; return pte; } -- 2.54.0