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 0501942FCAF for ; Wed, 15 Jul 2026 18:38:22 +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=1784140710; cv=none; b=tnuvM90uB2kL0jsD+o4CSh/c2DujcMJGCuFHqYyHCfSvHnQRicBYztxgEVasI+90vUTmmyr+ifsqc+XBViLzP++u1vZ2WVq5sFFYM1K2Iyw1kLBFqSZeplc4YC4uqdQmvYO6kfQvEgMqVC7lH7Ln7JhkvBeNPBiKTTQXLV4wlnU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784140710; c=relaxed/simple; bh=XFomP7uIdtPUAvZgSUbABVoSB0h+Tz0PFA89Nw0N1u4=; h=Date:To:From:Subject:Message-Id; b=WNq1rH8+U2ix+DnYO2S6NGtq7UK2qzomBuJj+ah96UD08McDD23NBjkFFim6Q71cuw+gw5JlYq6cXVocAhNwWJvPrr5qhtijt68Ewv0A6GHd0qBiBpnuF4PPU//Gy7TzrD37gRghkHbcMajmN1UOB8c85oEO/azgeZwio5cS4XA= 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=mtk4mXWG; 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="mtk4mXWG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFFD71F00A3E; Wed, 15 Jul 2026 18:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1784140697; bh=wqiL8vUDXixyAEGdTwvEmaT+HwAcyzErVK/nUPbfUoI=; h=Date:To:From:Subject; b=mtk4mXWGvEMlWUBrlymbftKQy3I4W4Sjo5dfl9qPwhOQqDNmyjOV2b7ZMbT2IAzsZ Zv8cY48Y8TkVnzYJdhmjyEDTpZUe7aLnt+a6sAK2C6dPuddDivYKdZHv4klUcRXUdo AA31QikebM0lAdLCdLwwU5svPIcfHNrF+RbJx1Zc= Date: Wed, 15 Jul 2026 11:38:16 -0700 To: mm-commits@vger.kernel.org,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-unstable branch Message-Id: <20260715183816.DFFD71F00A3E@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-unstable 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-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: Wen Jiang Subject: mm/vmalloc: extract vmap_set_ptes() to consolidate PTE mapping logic Date: Wed, 15 Jul 2026 20:08:09 +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/20260715120813.3609949-4-jiangwen6@xiaomi.com Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen Tested-by: Leo Yan Reviewed-by: Uladzislau Rezki (Sony) Reviewed-by: Dev Jain Cc: Andrew Donnellan Cc: Anshuman Khandual Cc: "Barry Song (Xiaomi)" Cc: Catalin Marinas Cc: David Hildenbrand Cc: Mike Rapoport Cc: Ryan Roberts Cc: Will Deacon Signed-off-by: Andrew Morton --- mm/vmalloc.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic +++ a/mm/vmalloc.c @@ -93,6 +93,33 @@ 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 *pte, + unsigned long addr, unsigned long end, u64 pfn, + pgprot_t prot, unsigned int max_page_shift) +{ +#ifdef CONFIG_HUGETLB_PAGE + 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) @@ -100,7 +127,8 @@ static int vmap_pte_range(pmd_t *pmd, un pte_t *pte; u64 pfn; struct page *page; - unsigned long size = PAGE_SIZE; + unsigned long size; + unsigned int steps; if (WARN_ON_ONCE(!PAGE_ALIGNED(end - addr))) return -EINVAL; @@ -121,20 +149,9 @@ 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++; - } while (pte += PFN_DOWN(size), addr += size, addr != end); + size = vmap_set_ptes(pte, addr, end, pfn, prot, max_page_shift); + steps = PFN_DOWN(size); + } while (pte += steps, pfn += steps, addr += size, addr != end); lazy_mmu_mode_disable(); *mask |= PGTBL_PTE_MODIFIED; _ Patches currently in -mm which might be from jiangwenxiaomi@gmail.com are mm-vmalloc-extract-vmap_set_ptes-to-consolidate-pte-mapping-logic.patch mm-vmalloc-extract-vm_shift-to-consolidate-mapping-shift-selection.patch