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 D09BB46AEC5 for ; Wed, 15 Jul 2026 12:08:41 +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=1784117324; cv=none; b=kSF5jcxckRjMpeiZbUPmv/hi2TZsSLRcTRVjwXJ7KrTLgh4qqOmezsXnAqlBmHO+PDQF8abRdVGnA6pr4y7WFdsBL09cPr8MtWyvtXmDZHtDE+WQ2FAX5UGuyKYCjkySNKqzwoGfuQatT+DZSI0H7z7T6BHe9nVg0V7LCkEpS5U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784117324; c=relaxed/simple; bh=Rhfw51yRYnuaGewszcozYbs6KuvmQwaD2hdsXZ+C+iM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iXdsYWLR+sT4AW5s+AFVcr19goeT/vpu6Y/xKaTFFGUd9AKtUIqIO6vaNMKYEdBA5b5AK97Vx0UsU4MRzluKV2+4hOhjDtqVBTcLW1/DftqojYI8LwHItKgObwXLpjKGIzWtMX08hyCnLMAGGPGp9uytL8zY0QrO2iA22GFuwXU= 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=J0JkzgPs; 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="J0JkzgPs" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2caf228a910so40364625ad.2 for ; Wed, 15 Jul 2026 05:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784117320; x=1784722120; 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=gJXfNsewMtLeFnLJ7bmWocyu9UQcX6Ca0Z8isc9W34U=; b=J0JkzgPsADuCBtp2kiFyiq/TO7XJjtdeROgmqPBSJlSiqycVvB0bqjL7ms81p/Lkw0 ZW0c80OUS0efUeBqAulyGVRCHjhXftUxfGQuqSeGSyLb8lt4XcCM9dGBfe3ESB2EiHNY Yne81aypCbb3yCTmZLV8edoVdGZHD7zgtjQKq3JkpQW7v2CK6jq+6Ux46Re2d03MbTnR 3yOoyOQZPJGjCfvEqQ2JkhDY6JDVBxPC+4RdE8aX3zMp2SlWP+6u3kD7CzwygRLE7T0I WPYxs8K86sgpzJqh82ENGjoD0HhaPB3p06Bbz+i94R65LdahOLw18rpWWGyQLIll2367 Uk/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784117320; x=1784722120; 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=gJXfNsewMtLeFnLJ7bmWocyu9UQcX6Ca0Z8isc9W34U=; b=C7NUuk6B+Y2VPlcjOU0JRvXalgGpXQcHEjehEUxbPZBMxOlKACGMHUp0WFRzDmb237 JYF3k3tJMN68fPz35g8sB+ttv811sDXwjAb83Ty3MNHfnRG5qG3RNK6MZIv0Xbe/L9fW wyjJQPVaiMpOm/me1GbT3qFFm3K5yG/xKaGi82UrCTChI/cxUCuHwa/ILsg2xzklb7fe T2pJt4vHpw5JbDLx0cozYBfJshqV73mtIuNdAJW63T5rGRTm8DMtAZ1KaHZbsMcE/T/w R23FPW8y8qkMoIFO+xOxGz5gVDXtT57mY5sK5kOSe/wtFbXuDWhDMCf1SY2tr4vyM+j9 vPQA== X-Forwarded-Encrypted: i=1; AHgh+RoNP3UEWrPs6i4nMU6bM9NX+t6wVTd/Xqr7hl4yZ14+TBBPgesDhZKSXNbtMpjIRBElEDQtJgRaEH5xui4=@vger.kernel.org X-Gm-Message-State: AOJu0YwyJHN5BqMbiW2dXCfm2Pt6QdfuIx1Am6n+GAy1MB1af3RffUXk nmaSu1oUm/yA67KlN9AcQDXk8cbN2MxpBFAx8msAkNzW5GSo0VpB5efi X-Gm-Gg: AfdE7ckQu5alOkJ4pwuHAoeCH9VrB/OkMyPDsr+Rr0qP8C94LH92CoyCifcotiHXRsp gzuh5N51cbiIUcsMxDjM+z3dFTB9xzqHfL5BRH+YhmEuH/tNPltrNd5gBO8ZO9VH4MN6Ahg4zJr arlc+jOIqz7HR7jrGpbUFOwQFG/9eN6kTBWpCLh46Ql2wtWXOed98yOxQDwsPUbxQLkqptuc59s CW4a+gIKMJ8HRWAHLYONJL0mTsOKL45BUtDnrJhTXS2z6ReU3CIbnf7qOorlDG+WT2zcFt8xjha 6w4IVKS+91oT8zO+PB2gpqBW+2iesHw0O+kUf+8bQgNhOfJ4X+UDklSPeLEe7U6/ngiZUYBpNZa 6FQwcIFwPcJhFERext4vDGmOZ84Gt1qVSHyBNDp6aiDqZH0+eSe2F0vb6sbx2CvJg0AxQdz7LRW Sc+qJsXI3/Wv46ZdUWPOPix/WnR8B9XRMbHT/ETAgdjRdx6w== X-Received: by 2002:a17:903:468e:b0:2ca:d7a0:1312 with SMTP id d9443c01a7336-2cf03cef70emr23475045ad.25.1784117319865; Wed, 15 Jul 2026 05:08:39 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf105bc642sm1216325ad.63.2026.07.15.05.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:08:39 -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, baohua@kernel.org, Wen Jiang , Xueyuan Chen , Leo Yan Subject: [PATCH v7 3/7] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Wed, 15 Jul 2026 20:08:09 +0800 Message-Id: <20260715120813.3609949-4-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260715120813.3609949-1-jiangwen6@xiaomi.com> References: <20260715120813.3609949-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 | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2c2f74a07f396..b9b29f7857bb2 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) @@ -98,7 +125,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 +147,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