From nobody Sun Feb 8 07:08:32 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 CEC1C33EAED for ; Wed, 17 Dec 2025 12:09:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765973354; cv=none; b=n8gfTJ4G/pyAU+jz6qEBteWUoti6PptK41o8iaEB/gtAIF6XIfdT2NlPABpIwXXRnQtFrvNJCT8KbR0rIKm+EFLJ9+VZSl9mWV41yd1oKZlFeY7KqmvgXudX9lFH8SyPQI3frzZ13+ckUXSC3yecNuws6lrX6FbPePkmPy+9iHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765973354; c=relaxed/simple; bh=hkv62bbtPSznPbHCWR/dYDb1hZQAXG9B5jFgDlFcYaQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LJfJHIZEG/nYQXZyT9nkTLf+p2Y2j3ZABqFVyCAkNrNydY4xz+dEQnOERGf1mjwk56jdiLX9NPLuwfrTUirH/lFkJQpqhCvjiuFCT4m2F2PW7HS2uvdG7+JkwAMZrjefT6MEqF407YN9zjeaiV4dOX1gLtM5I6elpbG8Wttyg/g= 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=WxWbGrXM; arc=none smtp.client-ip=209.85.215.169 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="WxWbGrXM" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-bbf2c3eccc9so229835a12.0 for ; Wed, 17 Dec 2025 04:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765973351; x=1766578151; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5MO3Q5T5gWjRjMPEnUZXPC/z7hpENtdSyL6rsjX0H9U=; b=WxWbGrXMWhcpHI5zUPxquIbVECuHIM6npTb5BE+fpplSaa3WV9qLtuPODmFk9dwUmf Al0EkLUOfbJ0N9SUGrqJ96+c0b3C6qWxmoa1viUHQORKJZjyYnBy+d4810sYRrPtCScv k6pN15Qx4Ac3PAeIT9siRIbagzY0lssANk58HsTXcwoFvNIdg4cgWnKTVbFcpLIWD2mM cKx8ZGixsl4xEV53EfzcETUSRZMykNoI5s3VTDbXZrbbl/79dWvhCUaE/Mdmyc9xyKOP NzTVS6fS3M0c3vWQzTEQiyvE7+kC3odJ4GrF60atiYkrNHDirAkJJGHMdrLxK6VLngvv 1I8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765973351; x=1766578151; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5MO3Q5T5gWjRjMPEnUZXPC/z7hpENtdSyL6rsjX0H9U=; b=R+VWJi35h2rMMJ1BVebcvdnqIkHszVCptW+kahVmjC/1CxdloEWueI85YFI/+v8VPr BsMs6YsEIefMtatBVf/BVxhkyu5ZG+yhkmpwBeTata20lDgyEXdIPk5SWkJCdXY6B8q0 PuxDAUiaZds8+bV5zADC9GPtm1eNnJYYSjTpw/FGiJV8/7QxnD3pwK2rjXMYqdkJNgDs m3+/XtFUR94p4W25sdWmsbzk1ZWIw5AFZGq0QFmSnU7gTJOXM1RdvnM9NNEXsGWdqoa6 c1SRDucSq8yTxm3THmsqL86dUqxVIC7lHH8Oy7DPrLw0iZ2gwwZOq2lf0TT2sy81noyo NVzA== X-Forwarded-Encrypted: i=1; AJvYcCWJ8LN17AxtwgCkX/dCg1VKwRLxfRF3qrHuZPA/Eulf5iYVOPmHHZIMdWM7zZ51+JYAZDan32Ex6RkBvNg=@vger.kernel.org X-Gm-Message-State: AOJu0YzlvzjbZkQfWyLfio6Y+BY0Zh49BuAw5jEfza5C6P6nzOiCrEu2 1ot0aDrmRRPjvl7b5gpWCvHQiaMHlG7ZpGKe+LjBCpp5cJC/+cGYwKM4 X-Gm-Gg: AY/fxX7sIlfrNAO3HNc4rcuGXnj0wRbzL+/FIrf0IRjNIz1JM6QInzCgf51z8md0E0v HWD9aPXEAEeba57m8dcxeb8ZT38ofAplrAl8M4JbZgG6pK8YPU9QnGRvJMgGUsEMtgg9UveowMd 0GkGC4+7/V7SDgvb3KOVCpRFmzk2Mxi1oRedj2tv0++rCIRXw1xfoqR88u6KKkpNSzxJR1crdZJ iiKCXlIALdwNSNmHKbfBEsaIibQqeeJrd/Mw+FJhaBCxk96JZfZepcsk7G31iqD8nzvb4+5X3tU 50F3vpQXqC2ErBHo0hwvBkz1E/7fTkNQrG30oss/38z3xrmLdLRKDTnITyk79QwpAtbvcRuwjXK aZ2w1k2TButD25iWWMho8xoDz4E18NhI8Qb9BksR7dZNZdY3wjzzMa+30NwxVDKXfQzGbyPchiG wWWrRd1CeMWlmb0SiyuvTi5yPC0Dncbd2Xdd6gFQlXiv0= X-Google-Smtp-Source: AGHT+IH03HXWxu7yczO0LADVUezeFbBUy3RsqSFlgZLDhzDggYMtvvDz8ILuMy4Gs6BIFYfX1kB8kQ== X-Received: by 2002:a17:90b:48c5:b0:32e:8ff9:d124 with SMTP id 98e67ed59e1d1-34abdf40c33mr17148583a91.15.1765973350612; Wed, 17 Dec 2025 04:09:10 -0800 (PST) Received: from localhost.localdomain ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34cd9aaaf2csm1683105a91.5.2025.12.17.04.09.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Dec 2025 04:09:10 -0800 (PST) From: chengkaitao To: davem@davemloft.net, andreas@gaisler.com, akpm@linux-foundation.org, david@kernel.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, vbabka@suse.cz, rppt@kernel.org, surenb@google.com, mhocko@suse.com Cc: kevin.brodsky@arm.com, dave.hansen@linux.intel.com, ziy@nvidia.com, chengkaitao@kylinos.cn, willy@infradead.org, zhengqi.arch@bytedance.com, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] sparc: Use vmemmap_populate_hugepages for vmemmap_populate Date: Wed, 17 Dec 2025 20:08:58 +0800 Message-ID: <20251217120858.18713-1-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chengkaitao 1. Added the vmemmap_false_pmd function to accommodate architectures that do not support basepages. 2. In the SPARC architecture, reimplemented vmemmap_populate using vmemmap_populate_hugepages. Signed-off-by: Chengkaitao --- arch/sparc/mm/init_64.c | 56 ++++++++++++++++------------------------- include/linux/mm.h | 1 + mm/sparse-vmemmap.c | 7 +++++- 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index df9f7c444c39..a80cdfa6ba98 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -5,7 +5,7 @@ * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ -=20 + #include #include #include @@ -2397,11 +2397,11 @@ void __init paging_init(void) * work. */ init_mm.pgd +=3D ((shift) / (sizeof(pgd_t))); -=09 + memset(swapper_pg_dir, 0, sizeof(swapper_pg_dir)); =20 inherit_prom_mappings(); -=09 + /* Ok, we can use our TLB miss and window trap handlers safely. */ setup_tba(); =20 @@ -2581,8 +2581,8 @@ unsigned long _PAGE_CACHE __read_mostly; EXPORT_SYMBOL(_PAGE_CACHE); =20 #ifdef CONFIG_SPARSEMEM_VMEMMAP -int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, - int node, struct vmem_altmap *altmap) +void __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node, + unsigned long addr, unsigned long next) { unsigned long pte_base; =20 @@ -2595,39 +2595,25 @@ int __meminit vmemmap_populate(unsigned long vstart= , unsigned long vend, =20 pte_base |=3D _PAGE_PMD_HUGE; =20 - vstart =3D vstart & PMD_MASK; - vend =3D ALIGN(vend, PMD_SIZE); - for (; vstart < vend; vstart +=3D PMD_SIZE) { - pgd_t *pgd =3D vmemmap_pgd_populate(vstart, node); - unsigned long pte; - p4d_t *p4d; - pud_t *pud; - pmd_t *pmd; - - if (!pgd) - return -ENOMEM; - - p4d =3D vmemmap_p4d_populate(pgd, vstart, node); - if (!p4d) - return -ENOMEM; - - pud =3D vmemmap_pud_populate(p4d, vstart, node); - if (!pud) - return -ENOMEM; - - pmd =3D pmd_offset(pud, vstart); - pte =3D pmd_val(*pmd); - if (!(pte & _PAGE_VALID)) { - void *block =3D vmemmap_alloc_block(PMD_SIZE, node); + pmd_val(*pmd) =3D pte_base | __pa(p); +} =20 - if (!block) - return -ENOMEM; +bool __meminit vmemmap_false_pmd(pmd_t *pmd, int node) +{ + return true; +} =20 - pmd_val(*pmd) =3D pte_base | __pa(block); - } - } +int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node, + unsigned long addr, unsigned long next) +{ + vmemmap_verify((pte_t *)pmdp, node, addr, next); + return 1; +} =20 - return 0; +int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, + int node, struct vmem_altmap *altmap) +{ + return vmemmap_populate_hugepages(vstart, vend, node, altmap); } #endif /* CONFIG_SPARSEMEM_VMEMMAP */ =20 diff --git a/include/linux/mm.h b/include/linux/mm.h index 15076261d0c2..5e005b0f947d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4248,6 +4248,7 @@ void *vmemmap_alloc_block_buf(unsigned long size, int= node, void vmemmap_verify(pte_t *, int, unsigned long, unsigned long); void vmemmap_set_pmd(pmd_t *pmd, void *p, int node, unsigned long addr, unsigned long next); +bool vmemmap_false_pmd(pmd_t *pmd, int node); int vmemmap_check_pmd(pmd_t *pmd, int node, unsigned long addr, unsigned long next); int vmemmap_populate_basepages(unsigned long start, unsigned long end, diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 37522d6cb398..bd54b8c6f56e 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -407,6 +407,11 @@ void __weak __meminit vmemmap_set_pmd(pmd_t *pmd, void= *p, int node, { } =20 +bool __weak __meminit vmemmap_false_pmd(pmd_t *pmd, int node) +{ + return 0; +} + int __weak __meminit vmemmap_check_pmd(pmd_t *pmd, int node, unsigned long addr, unsigned long next) { @@ -446,7 +451,7 @@ int __meminit vmemmap_populate_hugepages(unsigned long = start, unsigned long end, if (p) { vmemmap_set_pmd(pmd, p, node, addr, next); continue; - } else if (altmap) { + } else if (altmap || vmemmap_false_pmd(pmd, node)) { /* * No fallback: In any case we care about, the * altmap should be reasonably sized and aligned --=20 2.50.1 (Apple Git-155)