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=1794207848; b=XO0WbUgwfnNBOmBxJYyrQWYhws0sCYcEHXHe4iwcb1IaSbPR2hp6YEXeZS4HnkQjDgyn qAKcqOZf4NwMy8lNHwIdg6Xl9kLrwIEbh6Te8exHcrmYZUBFmqn8c6LHPxahja4c7Ilgh 5nujsabcfv6xLXVkdPkybGB1A8QU03pVu3t4i8jecj6BrTmBrSBc3+ilWPH5iJ7Crb+c9 WizWN2iEZorytOP6B997kw/pS4CHcnHP4YpZKPp+mHH0IcE8y5Yl6Hj2p8aAYx9T3YpL+ w1sAOt14zdq2s5KD7v0bgzmxPtPLxwtTI66wUXuNr6CrgJzqzW1Yaroc7S9ma7lc3oQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794207848; h=Received:DKIM-Signature:Date:To:From:Subject:Message-Id; bh=q/VeLFM2rIJffXAmSru9TxH286iEI3Jk3Lb+ZqnZHY4=; b=bAyl3eiGCPQczWta8uusewWEl1to9G3gGmgqqaoi5s+6Q/NaM8uA9Gm24kDGPafIlAGN YYDz+HXbqo1MaeXsQgLzZlkxTyrIpVeDhxyA17QVi2oAXkmTfHfxMFzs7I0A7mYcXUIUr icW9jV5DP2iWvzUJVsSFr+ljy9Refpf4gifAOETiVdsO1N+y7OVv//IGHuTGVa3I5DbjJ T4QS9bzeU1NOxwNipqSqI6IA05vSb1CR4IwMI6YR/CBIxHQIwE/zwlAjI56Ni00lRyS5r n8yU+AGfmvo28/D8TCm635mu0Jdym1R49DU4SRkyaALk0vsZohv7kVqihTQxqzG2SlA== 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=yYkFeAv9; 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 3E02D606A31C for ; Mon, 9 Nov 2026 07:04:08 +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=yYkFeAv9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CE081F0089F; Mon, 9 Nov 2026 07:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1794207848; bh=q/VeLFM2rIJffXAmSru9TxH286iEI3Jk3Lb+ZqnZHY4=; h=Date:To:From:Subject; b=yYkFeAv9WxeYjiA8NOrsPLOEW5V8qmboMgv6T8E10dbhfoF4PwbuiM1GYKRloV/Kr inQdSra2zKYHLLBEvkPf7wkJgfLsNeQDRay9fqhUNbyn7JlHLtfWQGqug9Zbz8GQOn rHV9bx778BPIiz2yuZfKuVQJOejM84uNiwxiP+f0= Date: Sun, 08 Nov 2026 23:04:07 -0800 To: mm-commits@vger.kernel.org,xueyuan.chen21@gmail.com,will@kernel.org, urezki@gmail.com,ryan.roberts@arm.com,rppt@kernel.org,npiggin@gmail.com, mpe@ellerman.id.au,maddy@linux.ibm.com,leo.yan@arm.com, jiangwenxiaomi@gmail.com,dev.jain@arm.com,david@kernel.org, chleroy@kernel.org,catalin.marinas@arm.com,baohua@kernel.org, anshuman.khandual@arm.com,andrew+kernel@donnellan.id.au,jiangwen6@xiaomi.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: <20261109070408.0CE081F0089F@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/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: Sat, 07 Nov 2026 21:49:49 +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. No functional change. Link: https://lore.kernel.org/20261107134953.748622-7-jiangwenxiaomi@gmail.com Signed-off-by: Wen Jiang Signed-off-by: Andrew Morton Tested-by: Xueyuan Chen Tested-by: Leo Yan Reviewed-by: Uladzislau Rezki (Sony) Reviewed-by: Dev Jain Cc: Catalin Marinas Cc: Will Deacon Cc: Barry Song Cc: Ryan Roberts Cc: Anshuman Khandual Cc: David Hildenbrand Cc: Mike Rapoport Cc: Christophe Leroy Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Andrew Donnellan Cc: Wen Jiang --- mm/vmalloc.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic +++ a/mm/vmalloc.c @@ -92,6 +92,29 @@ struct vfree_deferred { static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred); /*** Page table manipulation functions ***/ + +/* + * Try contiguous mappings at the PTE level for arches which support them, and if + * requested by the caller. Fall back to PAGE_SIZE mappings otherwise. + * + * Return: mapping size. + */ +static __always_inline unsigned long vmap_set_ptes(pte_t *ptep, + unsigned long addr, unsigned long end, u64 pfn, + pgprot_t prot, unsigned int max_page_shift) +{ + unsigned long size; + + size = arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); + if (size != PAGE_SIZE) { + vmap_pte_set_huge(ptep, addr, PFN_PHYS(pfn), prot, size); + return size; + } + + set_pte_at(&init_mm, addr, ptep, 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) @@ -100,6 +123,7 @@ static int vmap_pte_range(pmd_t *pmd, un u64 pfn; struct page *page; unsigned long size; + unsigned int nr_pages; if (WARN_ON_ONCE(!PAGE_ALIGNED(end - addr))) return -EINVAL; @@ -120,15 +144,9 @@ static int vmap_pte_range(pmd_t *pmd, un BUG(); } - size = arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); - if (size != PAGE_SIZE) { - vmap_pte_set_huge(pte, addr, PFN_PHYS(pfn), prot, size); - pfn += PFN_DOWN(size); - continue; - } - set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); - pfn++; - } while (pte += PFN_DOWN(size), addr += size, addr != end); + size = vmap_set_ptes(pte, addr, end, pfn, prot, max_page_shift); + nr_pages = PFN_DOWN(size); + } while (pte += nr_pages, pfn += nr_pages, addr += size, addr != end); lazy_mmu_mode_disable(); *mask |= PGTBL_PTE_MODIFIED; _ Patches currently in -mm which might be from jiangwen6@xiaomi.com are arm64-mm-add-vmap_pte_set_huge-and-vmap_pte_clear_huge.patch powerpc-8xx-add-vmap_pte_set_huge.patch mm-vmalloc-use-vmap_pte_set_huge-vmap_pte_clear_huge-for-pte-level-block-mappings.patch arm64-hugetlb-drop-the-init_mm-special-case-in-clear_flush.patch mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch mm-vmalloc-extract-vm_shift-to-consolidate-mapping-shift-selection.patch