From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 9647E13A3F7 for ; Mon, 1 Jun 2026 17:34:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780335269; cv=none; b=R+imlvLaX1l7MWbRfq9YT+Luq4VDIkav9tIjHpP3lokChTypLh5NxRU/KEgB1egGGVyUZYJkq32ep3EuYhaEQ/4UTxKb2Pm9Y9yQsiArsuzmbzhRpZ2CPDpQikaHGPAdVKuP/i4FjaVrWE17w/TEGprJDEK2O0Gfi2yniTBjQqo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780335269; c=relaxed/simple; bh=vjNUYs84xSWCgMRUhi7TnXu70wjhaGvuMgb133VehCU=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=niOVF9IHvFlHXN55K4w89J7iL8Ul8yFzk8BQBvWEKcQTgrHiZDFST6sRHpv7WxFSiwFeROSLgrrPuaIeVp8CZF8n0wtNGW6eNhrqxw7p0xjyu62C06xjR1t+ZLm8O31eJpGlLOrYSP7X0S6ANyjjQMTF/lF26soehHh2+K2AqNE= 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=e6L1VoFt; arc=none smtp.client-ip=209.85.167.53 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="e6L1VoFt" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5aa63628d26so1930902e87.0 for ; Mon, 01 Jun 2026 10:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780335266; x=1780940066; 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=ZdZl1JqvXa8x+O2FgoLF+eh6j2BB3hLfw/Br1aD0zu8=; b=e6L1VoFt649DzMoYHGRE061FDFm0xU4iYGNgEr65NZ8kSgdias+H3qruIzYotcbT2U w1kY5x2dWXjEAdHkObqvSfDzT6AoQaRig3NShdHfQX4M4TJoDjg41bMBoNWVtXx0IVdm QRy7pmokisrfDvMxDiRRkHBT7izDVlz8A/WuApsGPinzc2nCZFjpsf9/ORhlmN5TnZcR Vtx6H2RP2gH2eSTtI9Zl+ab64yMH1sqCzYCBhZlwyTpWlPADamy/p5oaWzd585NvtlvP FVmAufckzcepsR/vVj00PsjtEnitvq5gQBq8RrNn5Xi8qKzBgrWUs7U4itf7AkFa0mGu cGmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780335266; x=1780940066; 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=ZdZl1JqvXa8x+O2FgoLF+eh6j2BB3hLfw/Br1aD0zu8=; b=FjENRj79BgcZ19y1sEAaA2/tF6MyNBvWPjX/3FwJErAh2iysISybH9qYX/pmgmb9jn +6R/ZkTg41SbVMIz8ASUduKX0j+DX0vwRZrLVVgVqJaHRJ1b4iiqWas1l2q7hBWpcRBL 4ACaJBbkzw+spMZJx4j3CDyNZIi7ignJYULpmDTBJRxadOtDqGlucGD0PDrusSIunpGq 7weWiVUM7LqNCt6pIIrf3sbVa3FwAuM8o211Uu5jP7d0gIVq7flvzoBmZYb9Vd3dpxf0 tYu99G3GDb4MMXHeWldWlGr1fB9I7wWx4kQk6jUvdgNmWNbuWSzZOKSgIQCHG+903vLO isbw== X-Forwarded-Encrypted: i=1; AFNElJ9MguEAcqADjViHUNEuHPgERD7yiyjS5ZBMwwUVtKeiIQgu7an2IA4YwNaxc3AqAUasYBJ8xLkT57cfeLM=@vger.kernel.org X-Gm-Message-State: AOJu0YyObaNr/7SVePml7oi6EWVdXk7KGoCbQCBDPlv4F+YzJCooKcai mJsWvm5rX83WSvBafd79oMHGCE9w0S5egs1mQQfNCKWLtoyuOfBH12Si X-Gm-Gg: Acq92OFcfoq3r1VCAcn+VsPVoTGxZT2N8dIM4cUK8vkCm1Rv593l93svUKTK3NjvfJq My7aQTh2O7RZQrnW54OWGMhPggddlWjn9cG8+gs2Mot+4klyM50tLzFcvqR8SO2LB97I0uUBrnu 1/qR1AXRZ+jHsxmXuWiwd4T8I+Bdf+h4CS9o8fiX50Z+fic70Ap+/U1i0qm6ujFZBEAmbi4vAyM tNTx/GNpNKXpXcHI0u3SEYwdarmJox8ly14sYQTIcYE63pxunbHFvCJdg4M6NINkdxMOAzVBUXj 9eA5jhwSMju0n/kDT25zKJRnkNk1nHmK0txHwpZdCJpDAkvGWu7fPXtWvCaezjFSJ4Lt5NCBurU yZ0o0t6tuVNyrgVMq0fFiK9YTnsEijNkgTkHJFpS9i7aBjavV2IixAXkMg0RilrvKZd1bzyEXiT DW8AIY3LA6mg== X-Received: by 2002:a05:6512:6319:b0:5aa:70f9:b0b8 with SMTP id 2adb3069b0e04-5aa7430a39amr259985e87.10.1780335265467; Mon, 01 Jun 2026 10:34:25 -0700 (PDT) Received: from milan ([2001:9b1:d5a0:a500::24b]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa62f7f539sm1696560e87.4.2026.06.01.10.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 10:34:25 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Mon, 1 Jun 2026 19:34:23 +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 Subject: Re: [PATCH v3 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Message-ID: References: <20260522053146.83209-1-jiangwenxiaomi@gmail.com> <20260522053146.83209-4-jiangwenxiaomi@gmail.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: <20260522053146.83209-4-jiangwenxiaomi@gmail.com> On Fri, May 22, 2026 at 01:31:43PM +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. > > 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 > IMO, we should add just a helper with "no functional change" and second patch will extend it. Otherwise you added a helper which has already been slightly modified. -- Uladzislau Rezki