From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 E9BB63314D0 for ; Fri, 22 May 2026 05:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427929; cv=none; b=aRZznJn8CZzUk5vMwEq1GHeI0ULYrjFYyJBeaYZSwOAMu5kODpjrPLSWN3cx/XOOkRBHzBe5ZoCKzjql/pDKcbHBzJrtTaGVO5s4FgZF7zoodSdh8+yS0yCR10p9GifFy2DPhBj3oBlMHodsKqxuOc0xmNnkXRbZSfQfTC8ZURE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427929; c=relaxed/simple; bh=zDWeF3IKVtVD/akZ9SaGHX0qvhWf5NXaeIWz/D1fBi0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NVjs41IJOeyU8DytXZLLIVRbYLqMxfZhKBE0w2gDpUkhXNoJ4nEhcDrNoCXJ/FOVmhthN7t8sag0pChFvbt6r+Pq6Exu1nFLsHPdN3SJ/Y17IZOtzmFyNIhP1mLHJB+RYlWpp5yMTgJQ8pvDsUgbJCEPpzHlhwMazrQSqapxnrk= 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=BP9Ln+Tf; arc=none smtp.client-ip=209.85.214.175 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="BP9Ln+Tf" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2bd80b3aa13so44939525ad.0 for ; Thu, 21 May 2026 22:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427927; x=1780032727; 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=HydODzhJG5OH95FA088njE0U9Wx1Okn+yobhn9IOhgQ=; b=BP9Ln+TfsRbBdJEX8AJrVltUELzCoGaEFoLhdcFczhoZGrY8NK+ko5uvLOyle1B3t+ Sr00FAAzGFzsJxB//MavgDLcxpI0TOwl4aRgPAONsRiyp5PVlQ/niCO/BVjQerzhQGpU 23hrvOGKNCHCSiHJ6E1r+TyrTeLo2eL3Zxp/ZS5fePYAHPeQHR9Qva4c3h+gFymDveCO gYPEAzkdqfKG34MsnG8QGpp34qOKZjMhZGLAmnrjLFJ/wpZp978iuJoTl1UGqk+ZDNye mFmBRXDGnDGM0u9DH9AJxkEgwPc47vNGGpZ0JN0S6xMFdj3jrIH9UczspWoKEuGkQeFS /Pgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427927; x=1780032727; 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=HydODzhJG5OH95FA088njE0U9Wx1Okn+yobhn9IOhgQ=; b=kvy1v/L4UkEuI3R4BAarL4n1vRavuqbWdZdvYrm+ncXdyoz8CU4HPNCgxewPWLSIxK Xj2JqrgzlBcigcHgq3scRvHRNqtZVx9E3ROe/iEhPpAchFTpN7P7CwISb3/fkp3sEzG1 fqMWAJR5ftlfI9Vw9ffIRSC/EIu7i2azfMuhKgsM2GH1F59mUi6aymLQT+ZVjXROgFRK ytaMpWEWeRi2XhqnYbpw3gdJ2q7GIoP8CU0Gp8yyGa+xg8NnISp9obPGqOSSLtiqzQRA 4NEKT17BqDYyEhsUf1Yd9EUtv4NZ1C0Cdj93gN+JPL9akWAZfEpBheXCY2VmVqSOq54e F8FQ== X-Forwarded-Encrypted: i=1; AFNElJ8yPdGZxCfXCm2nLwp1CdvdI6+aqksfWHEbMF2+LpYA5UoLKZc/1pEnFjok+wcPNWhftRoHX0ZEW8GF3rw=@vger.kernel.org X-Gm-Message-State: AOJu0YzWsstbEKlDZKT7VD2qqt87pMktMwMFxr2qkc+ZTHIK+xBS2PMJ vYqHxHbI66AjfRZb4M6qSg4QhlF/Z7XUBjlarvT0M9IUrsJu5S2A4TyS X-Gm-Gg: Acq92OF62n4k/H1ehih3wLXtF+z8aizCf8pGjRxu2IMSJoVEHs+TKEVfA6nriTpB5nR F29KClP0W+5oqQv/S4rmw1DlZiywkyXJmpYznNSSGkiIdL9xUFerxnxE5KmcrCj1hVsIbHKGA1c ukyzDy7OC9mXjzROQ8/onwwrin92n4tPDMXVLQ+YRnmn2IiqwDi5gX8A9jqYNHcAsMisULSulCH VIBvGXEDChdrUTiGOj2ky8cdKDuQ0o9wdnMZLG6RwN+mLuXLqbECixfS/P5O+3fnWm2s/H4gZvH 0cRrPfYeq6EotGpBzo4SrSTCYdw4wcsk5CVlBydyU//0hQSFpPlSTvHbdDkBDpH/vh+Gy73YBk2 CQyumX2IRjE53qXR1Z/5IUt7cD6NSlaOocX5E3UBbSdXbyo74tRpORF6bYHzockOjJvtncY15A+ QAvNoWNrp+JTHMnf37tQc6vsswfVxfrHUMgbhOggzr95vUv2zZqrc= X-Received: by 2002:a17:903:f8b:b0:2bd:5026:ca11 with SMTP id d9443c01a7336-2beb06ea84cmr20575295ad.2.1779427926999; Thu, 21 May 2026 22:32:06 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb56d68adsm4782665ad.32.2026.05.21.22.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:06 -0700 (PDT) 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, jiangwen6@xiaomi.com Subject: [PATCH v3 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Fri, 22 May 2026 13:31:43 +0800 Message-Id: <20260522053146.83209-4-jiangwenxiaomi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260522053146.83209-1-jiangwenxiaomi@gmail.com> References: <20260522053146.83209-1-jiangwenxiaomi@gmail.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 2c2f74a07f396..53fd4ee460ea4 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