From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 4EA103C1974 for ; Thu, 9 Jul 2026 07:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783582733; cv=none; b=hu9XyOqaMtmYZnki51hoXAiOVFlxFMvBHeEhHyxFlWWFpv5ZDw1vyXMHqtbUOa0qIT15/QgWGN02YbWyosLa1cN0RTMY6Mx7JmIA2eh9QPtyKsjzfSLssYVEe8xakHRGULMHB8hKl5dhVUdeOzlQFJD5ms3A4xP89B12YQf+FLY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783582733; c=relaxed/simple; bh=mRQqhVpY5a8Xvq+/oxTPgr6q9gv/aObn8mier/6S9sM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cWZr4qLz0CXYfLonDX1buXsLGEHhYwGjwGJNWQ05f9CHwiQt9ps8SgGrPl4GNc81iKbjWcTr076oYW6G1Vmdt8b7sS7plht+ZU/g9c1E5Gl4ZK60ZBSvKke5Fx2UsqFTs2pyjVw69p6rAfvIhpw4wInH5WeybtYDX5sSDwaVJG8= 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=F6YNi62q; arc=none smtp.client-ip=209.85.210.176 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="F6YNi62q" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-84864086bfeso88033b3a.1 for ; Thu, 09 Jul 2026 00:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783582731; x=1784187531; 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:content-type; bh=0spoNjs2N2IikfxIi4vPxdEU/Zh2HTYHpAsMmHsIBMM=; b=F6YNi62qi4CZaLide1SRrBsPINxTJuNv+H9yTm/MD2SJTf2gucVVDOWPugCBq3uFgY cUHyAQo5ktDs8we+pyEjwchv/L3O3WMPq38jYNvQTqaYHxt/+zfFRlVQkgBj7vuU9lxF Zq7pFUNrBX9xv6zFEY3sSpErSp4S8V59LpvzzhJL7lt7Hhkg33kBK1EQjiZLssTnBUHH R4kW0bccAaqNDfKnppRhfeU534VJTrVrLcEJCQepyMB4PoU1f2Q+wZ57qDUlBRm2dAq/ m8Gdk6frqxnEKGyvsLE5dPeKHvphfuoV1GWVg/Ua7hAIRYEJj92w7VMrV9BWIpHLvG3Q nNPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783582731; x=1784187531; 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:content-type; bh=0spoNjs2N2IikfxIi4vPxdEU/Zh2HTYHpAsMmHsIBMM=; b=c5dOSKvP6URgEWn5C3bp+8tXB/vyIMsqlHsdKx4u9wf1dS6Qv+0IqIx4nP9+vfM+M3 UDw76ONsJhCLeiFEcs36BFAstk7d+4tXT97bFb/i4Y3rAWLc7gSlWg0MQshUmPMLPOmv cf1ISWFg180GyS353Bo3hh1I4HAdvRPw93A3pJnLVJu0FUpCwXMHK05eN9gYGRLLCvp3 Dmv/2MOaqgrY/sk4Z4OruInVRQJGTQl425CtYhBc+kkEtMc9Ts/TRA0Hqm6eo03kn5Vt Z9TOmXh9J1M/EJBxWdmTd0BVFqu8hOU5jeBHL3WLa2OlIUG1Hsdm55HfGhyiSyv4whKO IJvA== X-Forwarded-Encrypted: i=1; AHgh+Rqjz6S2JpLUlQ1bGQkUBToe7RSfov97NuS9AE2/wdwMLlso9SFyR6vyNj5fDyjnJsTf110Du+OI/GC5nfA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4a9TY+JNj5sfCC/P+p7w6pgEngV9hou7IVhsrX8GWfZ895nOQ eW2x+7pSdA5OejR+oDUragvimZXANllgLqb+zvWC/j8OznQC3BciMLX+ X-Gm-Gg: AfdE7ckNtNhLzuvyX69Ml4pTl3QYqjKlZvBgOcGkfkYxXpUAYGGQe53mulE107N69gc 4oBbmLv1DffGusGGwCsR7fnncqxTVnjJ1lrfwUzYVCgcio4isVGVgxToWsCDd62q51hkqO7lLBG LQ7kYYlEi+zJF383HV+tx/bNBC+FYwPN+nqgIfW1vx1QUbf9TG6Ke6qYiDoTB41Q+0F6oXRnZ2a CkriYuO4qDax4iJGAeEvImPH/E+gQn9rgOIf/y/OefBdxbytBvwd3kVt6aC8SwN5y/fBBlPlPjK nSOF//ExnyE7y8oK+Z+gRxQFjyCVsgYgI5hCfgVf8kpmKGGYXgBlZaYFWk6SXONNcWKGdsW4tft Snuzip3F/6aapvgsJWBmhFXfHXXhJ5FM2sqbsV9C2VcJCm4ZrsdQ2D6iToYju/70F4Eb1hsS4la 42f9IPjwyAuf6dxWTTP14AjAk48Le3c0YHaGU= X-Received: by 2002:a05:6a20:3d0c:b0:3a2:d838:bfc6 with SMTP id adf61e73a8af0-3c0bccbbc8amr6866655637.29.1783582731389; Thu, 09 Jul 2026 00:38:51 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ca5b3162a49sm3334902a12.15.2026.07.09.00.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 00:38:51 -0700 (PDT) From: Wen Jiang X-Google-Original-From: Wen Jiang To: akpm@linux-foundation.org, catalin.marinas@arm.com, linux-mm@kvack.org, urezki@gmail.com, will@kernel.org Cc: Xueyuan.chen21@gmail.com, ajd@linux.ibm.com, anshuman.khandual@arm.com, david@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, rppt@kernel.org, ryan.roberts@arm.com, dev.jain@arm.com, Wen Jiang , Xueyuan Chen , Leo Yan Subject: [PATCH v6 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Thu, 9 Jul 2026 15:38:20 +0800 Message-Id: <20260709073823.6643-4-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260709073823.6643-1-jiangwen6@xiaomi.com> References: <20260709073823.6643-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. No functional change. Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen Tested-by: Leo Yan Reviewed-by: Uladzislau Rezki (Sony) Reviewed-by: Dev Jain --- mm/vmalloc.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2c2f74a07f396..d7fef85b241c4 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -91,6 +91,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) @@ -119,19 +146,8 @@ 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++; + 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(); -- 2.34.1