From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 A15B63A0E85 for ; Fri, 26 Jun 2026 16:21:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782490917; cv=none; b=iAaTjyX7AUO/LpiFzWDwYaTosaZrj0oiHaCu/n5LFOCRWmsO3Dgyqh3YYK0GA3prMzc/wOOAiadMueTO06y7YYY/jfLdAJnQ5eacBrxeeIddn9ZEihbQJEWfSzeRh1X1GEiq1gL/IEbedDvsb2HKOCilDJMfc8qtymRBCjEEvyY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782490917; c=relaxed/simple; bh=CTcnnHTWhvTGvr4esQ5KNIhitzqCNvgsCxiHj4T02ZE=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=MCtuUmDcW9DFKy1vkDbynsJy8jIR1paRDuMI7XZiGM7QYvKxKoVs/X+B1sHZk/yL8hepN6hGdQi/6ojN+sYgvmtKShfhF8BJynipD0j+SAEdSI7ikkoOtIojtfODl93DyvmxtRRWRA65EQ5L203/hrghowA5/kqFGQg7AoK5tCo= 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=FHqX0KH6; arc=none smtp.client-ip=209.85.167.46 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="FHqX0KH6" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5aea36c9558so1014368e87.1 for ; Fri, 26 Jun 2026 09:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782490914; x=1783095714; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=VBlnVq/S0dm/GPydxBpVJQrOU3YgiAXnWHM/7A5IJg4=; b=FHqX0KH6aMItsJhexipHy0AMhzW97LSWFO9rA/qNoOMoSC2mufCkuDnWRMlgxEk1SZ vroy7OabwA7DllvWkJ8wdQWY4IyiqeFHYmVbhaqdOJKxmqcWjqQwcT2eJCZooKNA0Ysi kaCSyopgwSQZRooyZRnA2XQT0u/2MoxCqMGeZiYF79hmSaQyeLab7nhcgJN1Le/0PN/y zs0LCslvHtKhiyoTk/mboxznkKnGJJZC9p6XMkKn0X4PO8+S33Q5iUniGMMH5hdDUa9o FIR2mFtshjqTLBatu/Hlfr+hI7edtlxJ0NpGlY26ZZGAC3oz6WhpdefgyYJXvysDyxB1 uivg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782490914; x=1783095714; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VBlnVq/S0dm/GPydxBpVJQrOU3YgiAXnWHM/7A5IJg4=; b=VqW8/LoCyAjlJfj4CpWbkZgKrM1/D/aeF/MHfWIgCHWD7kUmqBYizJCaEshHqLh+yK 6iy+X5ZrK/MSKcmtNLcYJk+CNu9t+Cq308higS2DoKkwx0q5K2hkXgaZkniW0HhwD0Sv 7xQzBsfJWA9iBPz8n4KCh6S8si7Zrax1p0wkwWMB0BMMGhNOWFj5TncCSdbMb6e5uP/X wNfbXN0Kvwv/Nm1FKpmBwTZMKDqlWF6D9+6NPRpLx2PFRacfskLA/bXj1AJTA72zsqyl oG7p3o1hIDlSMzr4e1BvuPEKhemwcfPugadOhehQpqjO1NIU2RSezTvS3O15RKH7qyym G7OA== X-Forwarded-Encrypted: i=1; AHgh+RrbkqPpnXBU5xeC90pFu3sPQtbqMxmgUOL0YJFnsQZ3K45jSjNBZrW7k+NMJeARTrPKF5hpefm20XW+E3s=@vger.kernel.org X-Gm-Message-State: AOJu0YwsIi0/K16wO63Z86vt9VQVG//btlOhtD0SG5HMfiTTyMno0Mi4 6G2vxre36CDpLghWj4SI5oUh6EiILCEurn6QIamPXFWZydBD3Ym9vlZ9 X-Gm-Gg: AfdE7cnLSd4GHfTEBXRSyoWnHskaY7nrBhkNCN+eswZVyjcHj7rt1B5IlvNbBmZ8DiI +ZLdX6atnL6InjbXdiWVTAf1Yk30f+UDU9ZXHzMufBL2UV+LNpBTp6FW0JiSzT3tNcODIKQCWgl llW+9ByAKsoZlOaZiNFOtsXgeuT4BmU/rMyNmhzSzj1oCQ8Qi8RUhNKDdDflRo/Y0d2H5CBj1Nn 7BjSMKTlnTFbfoZZUMUrlljRJu50H0M5UnsQgmGA5sFBLiT3b8s2sm1KkoavfFMxQ0ZOJ737TRM ix9V32LM4b6x0sG8ZeaYqO4GwlSWVTo2UMev8Sq0BDq4uYb7YqTEomQCAQwt5bi8RWJwvnDU+Hu 4yAwrVqCR//GQuDDAg1QF6HAdMEBRF4EfeIbdMKzGEiTtOUQWvSMTC4od/IuEjyy5 X-Received: by 2002:a05:6512:608d:b0:5aa:6ede:5b with SMTP id 2adb3069b0e04-5aea1f3c096mr2475000e87.14.1782490913622; Fri, 26 Jun 2026 09:21:53 -0700 (PDT) Received: from milan ([2001:9b1:d5a0:a500::24b]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5ae9d8fb537sm2467551e87.21.2026.06.26.09.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 09:21:53 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Fri, 26 Jun 2026 18:21:51 +0200 To: Wen Jiang Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, urezki@gmail.com, 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: Re: [PATCH v4 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Message-ID: References: <20260618084726.1070022-1-jiangwen6@xiaomi.com> <20260618084726.1070022-4-jiangwen6@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260618084726.1070022-4-jiangwen6@xiaomi.com> On Thu, Jun 18, 2026 at 04:47:23PM +0800, Wen Jiang wrote: > 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 > Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki