From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAAAC3A168E for ; Thu, 14 May 2026 09:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751715; cv=none; b=lwySwc8eT2G+7qGg1aUB/LyXmH/P96Mp4lDk1DV8ViniFKHHVYpZVaSIzai1M1lK7b5ngFzPreDg6pyG4tzEmpnSuF4/LrjPoEesf7Fx8qZZ6w8LBXW5EyFcl0O8NA8HFIbhJvlAK5Ai8iljQ6OI/yOhKSTx80rDDPraxuVzG8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751715; c=relaxed/simple; bh=tzYKuF3rV2XdOfpQu9eYuMgVaBuh4flMpdNgBiTP7HE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WtH3lU41Fml09tULwS78xTQCCbIeDad7x3W1A7NVPBwLk2/YmT2VyWG7/pyx5Unv3GcjzIOXR0cxfHEQldVwba32bJlMNwAOPMx65RR89fSPa7MXcQczDN1OZcdGzt4Jca7kluuCDB32w1J3N9JydPWHj187sCGKzjSi70IezN8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kv5VT389; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kv5VT389" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-835c98b659eso5208985b3a.0 for ; Thu, 14 May 2026 02:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778751713; x=1779356513; 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; bh=F795Xv5J46ljVi2+6iHBT2O82gjybUH4psWzRnSB2TA=; b=Kv5VT389DhD5UTpFD8vbpQjSq7FBjT9llgg8I4y5MJAWX6ld/b/eOjw3jiaG24VK8C C/8bCm9fSkRt+fwoch1Vq916NDPDdQBt8gVd/JKfdgOcE/O3nYOh1xsPDq9wZKSnxf+q dYTlAWuqZQR73z1OwycEfKWfT286IGicFM6ZsCRDldnKKwJUT6BvwDcn+fwlG284GUuS RA+CmztVBMoc3DnopNXNP8iiHBbJ8CI1yfl15x1376j3KN+LqQCYFUoZP1hfoFZi8cRo BoFvWF3Oej0a631VnNG59BMog3cAia2rL5Mt4ufNrpxaFlsHMuZDZHltYNOXgGZHRtIc Tk1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751713; x=1779356513; 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; bh=F795Xv5J46ljVi2+6iHBT2O82gjybUH4psWzRnSB2TA=; b=IGF2h1gjnfgsDosIZnFNdSDPinkNDPoH2Wcfw9y3z/L+Gkd9Kz9rFFzdNDbOnVqtIf CxvDbn2knZX2sZAkn20IJphXF2NCyEdL7RiqZUfxA7CFjTLw3NeaUN4/JiHxWiu9sdcr btbrcrYjpU4fqQfPg7DzoLsm+3vtMgSqcvBEfKH+76C9NiQLrTs5POhn1ZqgVCNpNpB2 dTf8v/Tgz/DYbK8Qgkn7h+ev1GfZHNyY5MM+l8EesY18MB+sTH6c5ImDB04fkf0cB8nI aC3EodVu4la75Uc5N3GEoOdqL3DO2RpZvPBuUklSB8hvodl+Uxj7QR3IpW1oNk8auO6M w7+g== X-Forwarded-Encrypted: i=1; AFNElJ8+uShgJDZm4fwHE59u2uvFuocqlFiTV7Zf0imhJ5H+qVLvtircLTy345pu312uYbeM5Nnyo7qWBWp0Bo0=@vger.kernel.org X-Gm-Message-State: AOJu0YwiQFR/NhK5fNH/BVKWINXmlxKijv/S34e9Ff39hxVGcfofuyBd 6y191OcfsAJ7PprE03qAN3mmwy18lX3qVxtMP7QZ4Hlpba89Wn/hS4NS X-Gm-Gg: Acq92OFKmwwgrHET7lspEXljGPgzwUlIGBmxXumR8ldhYYvR3ir9BrL4HP2PMSsBzzn PAcYopWP/+2mBqRJehDHZYLIjBLabafmVH8oCiYydGljKq2PwMUo3XPvSieiwmgo127LiL0q+wJ sgKcPOs5qHjW/EwRokxE5kKWyrWozmrDd8qSWZdPF9JnKkPmZwVKwy2VPwGiazkGKpysKhx5veJ NbmN9ZJhYdpDI9dqA7p+h6fvoXn1demDj9v1O03xA6Ih3s3pgFZDLdIaFTPIeN3887QRZoAxgO+ pEhWLPped1JCZLJl9CShsq6Q7uVNiB4vjazrLq5JgVhGSIlR9c3qBqii8FYB36bhvuaByXlX6eL tjaoeFI4/SCzlNJlWnLdToGGJLQsyWlO/y22i81bQeaAp0KsTrvBBQzoj6HGD4f0XbACqy852nv B5rEg4e/4+3rGa+TQcp8MUGfXAgp39HJ+xRq8+DdvrfAPeSFCAZDpMmNtq X-Received: by 2002:a05:6a20:2589:b0:39b:d937:8010 with SMTP id adf61e73a8af0-3af83289f88mr8096707637.45.1778751712910; Thu, 14 May 2026 02:41:52 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c82bb114a70sm2351244a12.22.2026.05.14.02.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:41:52 -0700 (PDT) From: Wen Jiang X-Google-Original-From: Wen Jiang To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, urezki@gmail.com Cc: baohua@kernel.org, Xueyuan.chen21@gmail.com, dev.jain@arm.com, rppt@kernel.org, david@kernel.org, ryan.roberts@arm.com, anshuman.khandual@arm.com, ajd@linux.ibm.com, linux-kernel@vger.kernel.org, Wen Jiang , Xueyuan Chen Subject: [PATCH v2 3/7] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Thu, 14 May 2026 17:41:04 +0800 Message-Id: <20260514094108.2016201-4-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260514094108.2016201-1-jiangwen6@xiaomi.com> References: <20260514094108.2016201-1-jiangwen6@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- mm/vmalloc.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3e9e5156f..9bfd0aa34 100644 --- a/mm/vmalloc.c +++ b/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) @@ -98,7 +127,8 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 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; @@ -119,20 +149,9 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 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; -- 2.34.1