From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97C1D3043CF for ; Thu, 25 Jun 2026 02:57:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782356251; cv=none; b=AypgqG6ysjpJwBOFpKyrahxwBwpZXL/agRpvxh2x0ILvseqLWPe6ucDp2imfhbia0VY17wvAeNUbMZubyoDcsF9+n3cqmt8xjJUscosxsS5DP/MgAfyzwlf1+UGFJ+hAOxLMJS3NAXJbne6Q4dw2EkSL6yGnXKrUeEbcSMv7AT0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782356251; c=relaxed/simple; bh=RO31w0JwCuDrmXcU3U5q2+nZBGW0TjzA80I1RUcG484=; h=Date:To:From:Subject:Message-Id; b=KvDurR4QNZY5fjymfHBgj6GSSbWvAwS2Yjg7uP1tEdJf1LGJ8I3WZ8ZkXOBWEuX9pxjHHyTCrBxa8DT5AklH1pz35dLjlyhzieT6OhmpAEE3RoBDnbqBZplcjS8xSh+Mae5Sx6itQQEtyyALtW7AJXw0lIuToLtaGVQ2N9CRQ3E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=U1WshlwP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="U1WshlwP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D1FF1F000E9; Thu, 25 Jun 2026 02:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1782356250; bh=y/E90hgyJ2UxhObWYPxSObOYa/3X5sRrNRIc61Lw3vA=; h=Date:To:From:Subject; b=U1WshlwPIvmQgXrJRH4m5lDdAJQah8tD2J96+YmGptaAiPBY92k9ty8qjQ7x1bnBG +cLhZYxHWsLkM73LtJyOMID7zMp0SIATzxnshoLXKhIfTKdV+SnEF4/4/Tuu3EtUzo y28hSJgsHB0A3o1kEKnyVIzcjPk2uV37dyfeMbAY= Date: Wed, 24 Jun 2026 19:57:29 -0700 To: mm-commits@vger.kernel.org,xueyuan.chen21@gmail.com,will@kernel.org,urezki@gmail.com,ryan.roberts@arm.com,rppt@kernel.org,jiangwen6@xiaomi.com,dev.jain@arm.com,david@kernel.org,catalin.marinas@arm.com,baohua@kernel.org,anshuman.khandual@arm.com,ajd@linux.ibm.com,jiangwenxiaomi@gmail.com,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch added to mm-new branch Message-Id: <20260625025730.2D1FF1F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/vmalloc: extract vmap_set_ptes() to consolidate PTE mapping logic has been added to the -mm mm-new branch. Its filename is mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch This patch will later appear in the mm-new branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Note, mm-new is a provisional staging ground for work-in-progress patches, and acceptance into mm-new is a notification for others take notice and to finish up reviews. Please do not hesitate to respond to review feedback and post updated versions to replace or incrementally fixup patches in mm-new. The mm-new branch of mm.git is not included in linux-next If a few days of testing in mm-new is successful, the patch will me moved into mm.git's mm-unstable branch, which is included in linux-next 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: Wen Jiang Subject: mm/vmalloc: extract vmap_set_ptes() to consolidate PTE mapping logic Date: Thu, 18 Jun 2026 16:47:23 +0800 Extract the common PTE mapping logic from vmap_pte_range() into a shared helper vmap_set_ptes(). This handles both CONT_PTE and regular PTE mappings in a single function, preparing for the next patch which will extend vmap_pages_pte_range() to also use this helper. The #ifdef CONFIG_HUGETLB_PAGE guard is moved inside vmap_set_ptes(), so callers no longer need to handle the conditional compilation. No functional change. Link: https://lore.kernel.org/20260618084726.1070022-4-jiangwen6@xiaomi.com Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen Cc: Andrew Donnellan Cc: Anshuman Khandual Cc: "Barry Song (Xiaomi)" Cc: Catalin Marinas Cc: David Hildenbrand Cc: Dev Jain Cc: Mike Rapoport Cc: Ryan Roberts Cc: Uladzislau Rezki Cc: Will Deacon Signed-off-by: Andrew Morton --- mm/vmalloc.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic +++ a/mm/vmalloc.c @@ -91,6 +91,35 @@ struct vfree_deferred { static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred); /*** Page table manipulation functions ***/ + +/* + * Set PTE mappings for the given PFN. Try CONT_PTE mappings first when + * supported, otherwise fall back to PAGE_SIZE mappings. + * + * Return: mapping size. + */ +static __always_inline unsigned long vmap_set_ptes(pte_t *pte, + unsigned long addr, unsigned long end, u64 pfn, + pgprot_t prot, unsigned int max_page_shift) +{ +#ifdef CONFIG_HUGETLB_PAGE + if (max_page_shift > PAGE_SHIFT) { + unsigned long size; + + size = arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); + if (size != PAGE_SIZE) { + pte_t entry = pfn_pte(pfn, prot); + + entry = arch_make_huge_pte(entry, ilog2(size), 0); + set_huge_pte_at(&init_mm, addr, pte, entry, size); + return size; + } + } +#endif + set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); + return PAGE_SIZE; +} + static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift, pgtbl_mod_mask *mask) @@ -119,19 +148,8 @@ static int vmap_pte_range(pmd_t *pmd, un BUG(); } -#ifdef CONFIG_HUGETLB_PAGE - size = arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); - if (size != PAGE_SIZE) { - pte_t entry = pfn_pte(pfn, prot); - - entry = arch_make_huge_pte(entry, ilog2(size), 0); - set_huge_pte_at(&init_mm, addr, pte, entry, size); - pfn += PFN_DOWN(size); - continue; - } -#endif - set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); - pfn++; + size = vmap_set_ptes(pte, addr, end, pfn, prot, max_page_shift); + pfn += PFN_DOWN(size); } while (pte += PFN_DOWN(size), addr += size, addr != end); lazy_mmu_mode_disable(); _ Patches currently in -mm which might be from jiangwenxiaomi@gmail.com are mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch