From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794023636; b=Wn+5xmzthtY9CC1Qh1v1P4EcMVIGW2ieKfJCNY2MdTcW+MXtLzP7mNnNT1ub+Y6VZ7nb rrHcHtKJf9huAXptuQHX+qGoLyI6jCyEw1sNnoFRnaEnL8HH2+r1tB9lP5slWxhMUa9hT 6BaK6AGXrm37yX5eZibSbXoCoE2TyDj0PFgZesaU82KpG+yIfPYLGBFCKF6YE06bfjJ+3 q3CE/f9ZlxM9tUhb4bTGnq37AVJt3x8dJK603rIHDgsTiIfIELyW9pP+iElnb1d+DhtHB JtJz//LNoGtTP6uthg4ZNpqGl8zukLxGIhHew1Trj/zU0OU8P8paOErk79CQqHFc/ag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794023636; h=Received:DKIM-Signature:Date:To:From:Subject:Message-Id; bh=XdjOXE/8s70sXt0MQYKncReNWnL1/QsnrvHdCq+Zx14=; b=kQLcUFuB0num1R9Fvfgz26dLUylgqwgDUIoIL3+UlOYe7q8AKoNY2vq6Ow/K3/ET8LVm K1U3j6lVUXX3mCgwJk56P+1mhHwX/g1+UsqUopScHHceoRLpgxAoHzlQClAEMHxE4lpV4 RATrJmqyimA8Da7FnP8jjSEE0E+Ecz9dovH+IfomN4+wkOcLaJzg1D9Ups9yLzQWiZ8Gv Vu84MY1YmAGS/R9wBZ4iuHqY/fm+i0OOUAChuNQsbnumogOTSat1i3uv0yD1mLdICSUC3 MaX+8Kzdx9cGlCIdjEeHWcgHRUFMW/wjxg4GrM+xGoTGTBYkxvjQRwQKvfi8NwE1CfQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=xTHY0Pln; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E363606A33C for ; Sat, 7 Nov 2026 03:53:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=xTHY0Pln Received: by smtp.kernel.org (Postfix) with ESMTPSA id 395CB1F008A5; Sat, 7 Nov 2026 03:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1794023636; bh=XdjOXE/8s70sXt0MQYKncReNWnL1/QsnrvHdCq+Zx14=; h=Date:To:From:Subject; b=xTHY0Pln1wP7KQDLHXwkXdOpAj8zqfHMzS7mZeZlJ+Khr37A+4d1YcSpdm3NvlfgI dKVMZX4AbLduM5PrO4MN+YdTAk2v57QYV1dURn4FepBzDGxFzNjiXIky+wvLd+Qprp OaH2YPDDiZFyAhjSFmnmvw9xBb+v0ro9A92xjTKg= Date: Fri, 06 Nov 2026 19:53:55 -0800 To: mm-commits@vger.kernel.org,muchun.song@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-hugetlb_vmemmap-unify-vmemmap-range-restoration.patch added to mm-unstable branch Message-Id: <20261107035356.395CB1F008A5@smtp.kernel.org> X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list The patch titled Subject: mm: hugetlb_vmemmap: unify vmemmap range restoration has been added to the -mm mm-unstable branch. Its filename is mm-hugetlb_vmemmap-unify-vmemmap-range-restoration.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-hugetlb_vmemmap-unify-vmemmap-range-restoration.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Muchun Song Subject: mm: hugetlb_vmemmap: unify vmemmap range restoration Date: Sat, 07 Nov 2026 10:27:55 +0800 Restoring an optimized folio and rolling back a partial optimization both restore a vmemmap range, but the operation is currently implemented separately in each path. Use a single range-restoration path for both cases, making rollback an explicit bounded form of normal restoration. No functional change intended. Link: https://lore.kernel.org/20261107022756.77731-13-songmuchun@bytedance.com Signed-off-by: Muchun Song Signed-off-by: Andrew Morton Reviewed-by: Lance Yang Reviewed-by: Qi Zheng Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Oscar Salvador Tested-by: Andrew Morton Cc: James Houghton Cc: David Hildenbrand Cc: Yili Zhang Cc: Kiryl Shutsemau Cc: "Oscar Salvador (SUSE)" Cc: Huacai Chen --- mm/hugetlb_vmemmap.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) --- a/mm/hugetlb_vmemmap.c~mm-hugetlb_vmemmap-unify-vmemmap-range-restoration +++ a/mm/hugetlb_vmemmap.c @@ -287,6 +287,18 @@ static int vmemmap_restore_pte(pte_t *pt return 0; } +static inline int vmemmap_restore_range(unsigned long start, unsigned long end, + struct list_head *vmemmap_pages, unsigned long flags) +{ + struct vmemmap_remap_walk walk = { + .remap_pte = vmemmap_restore_pte, + .vmemmap_pages = vmemmap_pages, + .flags = flags, + }; + + return vmemmap_remap_range(start, end, &walk); +} + /** * vmemmap_remap_split - split the vmemmap virtual address range [@start, @end) * backing PMDs of the directmap into PTEs @@ -348,19 +360,7 @@ static int vmemmap_optimize_folio(const return ret; end = start + walk.nr_walked * PAGE_SIZE; - - /* - * vmemmap_pages contains pages from the previous vmemmap_remap_range() - * call which failed. These are pages which were removed from - * the vmemmap. They will be restored in the following call. - */ - walk = (struct vmemmap_remap_walk) { - .remap_pte = vmemmap_restore_pte, - .vmemmap_pages = vmemmap_pages, - .flags = 0, - }; - - vmemmap_remap_range(start, end, &walk); + vmemmap_restore_range(start, end, vmemmap_pages, 0); return ret; } @@ -382,11 +382,6 @@ static int vmemmap_restore_folio(const s unsigned long end = start + folio_vmemmap_size(folio); int ret, nid = folio_nid(folio); LIST_HEAD(vmemmap_pages); - struct vmemmap_remap_walk walk = { - .remap_pte = vmemmap_restore_pte, - .vmemmap_pages = &vmemmap_pages, - .flags = flags, - }; start += VMEMMAP_OPTIMIZATION_SIZE; ret = alloc_vmemmap_page_list(&vmemmap_pages, (end - start) / PAGE_SIZE, @@ -394,7 +389,7 @@ static int vmemmap_restore_folio(const s if (ret) return ret; - return vmemmap_remap_range(start, end, &walk); + return vmemmap_restore_range(start, end, &vmemmap_pages, flags); } static bool vmemmap_optimize_enabled = IS_ENABLED(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON); _ Patches currently in -mm which might be from muchun.song@linux.dev are mm-fix-missing-page-table-destructor-in-pagetable_free.patch riscv-mm-fix-hotplug-page-table-destructor-handling.patch riscv-mm-fix-missing-destructor-for-hotplug-pud-tables.patch arm64-mm-fix-destructor-for-unconstructed-hotplug-page-tables.patch mm-sparse-vmemmap-map-shared-vmemmap-tail-pages-as-read-only.patch powerpc-mm-map-shared-vmemmap-tail-pages-as-read-only.patch mm-hugetlb_vmemmap-remove-vmemmap_wrprotect_hvo.patch mm-hugetlb_vmemmap-remove-hugetlb_vmemmap_optimize_bootmem_folios.patch mm-generalize-kernel-pte-table-allocation.patch mm-generalize-pmd-page-table-allocation.patch mm-generalize-pud-page-table-allocation.patch mm-remove-pagetable_dtor_free.patch mm-remove-redundant-pagetable_dtor-calls.patch mm-hugetlb_vmemmap-remove-hugetlb-specific-vmemmap-optimization-macros.patch mm-hugetlb_vmemmap-unify-vmemmap_splitremap_no_tlb_flush.patch mm-hugetlb_vmemmap-simplify-vmemmap-head-page-handling.patch mm-hugetlb_vmemmap-generalize-vmemmap-page-allocation.patch mm-hugetlb_vmemmap-unify-writable-vmemmap-page-preparation.patch mm-hugetlb_vmemmap-rename-vmemmap_remap_pte-to-vmemmap_optimize_pte.patch mm-hugetlb_vmemmap-simplify-shared-tail-page-handling.patch mm-hugetlb_vmemmap-move-alloc_vmemmap_page_list-next-to-its-free-helper.patch mm-hugetlb_vmemmap-make-vmemmap-optimization-folio-oriented.patch mm-hugetlb_vmemmap-make-vmemmap-restoration-folio-oriented.patch mm-hugetlb_vmemmap-unify-vmemmap-range-restoration.patch mm-hugetlb_vmemmap-make-vmemmap-pte-conversion-folio-oriented.patch mm-hugetlb-fix-validation-of-unsupported-hugetlb-orders.patch