From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 381943112C0 for ; Thu, 18 Jun 2026 08:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781772471; cv=none; b=PEgKFWOnBr/QUIgANTp7dL9DYyZvxuJbhtr0vmlKi77GR8MC+XTHsk5Srh4JtfWUBy+NPWnunRtXc57l8Ki4OcwEMdVR9vZaIZyAK53rUwaI720mrE2DofSu+20vtFi2sBRg4ZfR4HXMEyqzQ9Tdpe0kTZWuSIwBEKFxMHtUGH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781772471; c=relaxed/simple; bh=Y5QumQBQTIiktJS2KTLZyIru55QuFXJ1JnNYsubgOnU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Zp74douGw6mCnaDFeDTxam8qaFNprKr1Ke+7AFdEDIIHh/axAhToN4RZsTEYRlbptN5C8tyPkrgXRc1O0oG+jfm621OIipqfS4ACA+PQguAHfMnBKaj217tGkRNFvGxQ7qE4OPDeTfPJ+HAR6p/1GJzvqSwiQRjZOeYYGJiLIdA= 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=jJa+9Tzf; arc=none smtp.client-ip=209.85.216.45 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="jJa+9Tzf" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-37cb36ca63bso339155a91.0 for ; Thu, 18 Jun 2026 01:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781772470; x=1782377270; 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=kLRuKvFhInROLg4Q8kC57ftYeHhuWOIlgmE1PN84SUM=; b=jJa+9TzfNN9bXMxsPiAN7pQMBy/PbqUqlcPHeAEoAd1jYe5BvRWpKw3Nn/Puu5lGdX u/IVoV65gOcj4Sl0vpRbklQH8SEgvf3104O5XRtW9wptB9nOKpT5lwAW7aY7QmNHNX9r Vw/ievjFIeQybLltgtxAoGSoQCdmyJly26Lv24u5kCxFdDgqQq0DQids8mTWA8habgoS 9iqws5BgNICjZHZSjwJ27BHino6MUxodjNKUe/IvDta4EvErODweGHjM3EZIbAASKS7w HyzinjcgItjCHwqGwMCLCUGMa+f01k1ZSh0/fqGwF9qmXXXO1TlrXLWTL7b1fZKnQ5JF pjPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781772470; x=1782377270; 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=kLRuKvFhInROLg4Q8kC57ftYeHhuWOIlgmE1PN84SUM=; b=fj8NqkMXZc6rYZlSzUIK2uxAceays4YgDOxkwahpJIDiEU6ltUvZXJ61CnKs3k42L4 V3lUl3ANZsfGuCTg2CeQu1oMJI7rPA7Ibssx3lCwTtkauK2wJRD34vEuf+RdCrPzooTO tCuDKajKKDUYP3EJ+uSb351emy5llL7U+65nr+OasrFzu9QsnjEnlMgBAvf7+u9atqnJ vs5ZTmU22KARFMCagzZMn4CcsZ4UCUAJBpbtOt6DRMPLDY8J2DpQpCi6+6tVKTG6Qg6w IfXb0yib5uCb6KePGz4V2dritZh/z0Iw1nu+SzHneFSqrO37yt9iN6MAYPIXCtncYV+a WPnA== X-Forwarded-Encrypted: i=1; AFNElJ/NWL7yzQM/+YhlssZj0sv76BRDbA/92/rGtlPD47Yt8ik/Yi9seyWFll0lhoWG6z9YO8S0L+rzXamkqBw=@vger.kernel.org X-Gm-Message-State: AOJu0YykdqWp0fRvZWg+7EPaAIl5rLZJkgIxMy4e2R5Dt2yKMpKvC7tQ izV9bHfx3fzVfbz9UeIU4T240/ETzfSBb4duEM/Nhwl3Mi29pP+/FWiy X-Gm-Gg: AfdE7cmghO9cFxlDJAZzKK180On45cQirDKCkciMMmkUZSFc7n4WN/4jeyRmm5MQKi+ 1LlJvgGJtJ6nPpj2wicXiVHmZ8uHGARYKHxxiB3Dntx/k4T9jIJqHFo8kCOTOIcQIoBCVvt0Wkn fsbejWHHiY9xC/2Ws1lDCgb3+FH6KJqY22Q6lfLGgvjBrX3wVqenXZzizkkbDWkOicZcWZm8oJ+ nyvcQF223SCo6r+CVReBuM9zd/QSG8UXbCqQ1YNm1ip6Ux6huywJqbAE+IL7Ewjpbln1zA0scJT Dke1FMnG4IQrX7ABVdcbhPnbJi6USjOsIW72+j8X3s3ztvHfaf7DUg7Ef7116F+9PqLvy94jLzy Pj0QqFvvf/iv/eORAJPXXpH2u5fgwGtZycMD4AxxPm3WxJ8hbBxlmU1PuQN4sZFoSXbQjOGd1po 74FRuBVjx9lEMaJ57fwsgYRtN12cYYlGTaEaI= X-Received: by 2002:a17:90b:1344:b0:37c:607b:2cd9 with SMTP id 98e67ed59e1d1-37ce43c0ed0mr2690740a91.0.1781772469588; Thu, 18 Jun 2026 01:47:49 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37c521d8e7bsm8628856a91.5.2026.06.18.01.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 01:47:49 -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, jiangwen6@xiaomi.com, shanghaoqiang@xiaomi.com Subject: [PATCH v4 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Thu, 18 Jun 2026 16:47:23 +0800 Message-Id: <20260618084726.1070022-4-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260618084726.1070022-1-jiangwen6@xiaomi.com> References: <20260618084726.1070022-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 --- mm/vmalloc.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2c2f74a07f396..6660f240d27c9 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) @@ -119,19 +148,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