From nobody Sun Feb 8 02:56:10 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 3F5F133BBCB for ; Thu, 18 Dec 2025 13:10:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766063411; cv=none; b=Iy3OYFI9r5ScIdpo+o9t6fjVzaR/KIf15Sd5u1+Wx07IPu0V2WwiFPSUDQJtVIJfvfwiqbElevEak/zJ8vFxHLczPJyHp302PmgG8QwOVqHX46VuuMUM8UyteTpPZqv5dOuBYA+qFLk/V/LSYKtCZ1FtXAJw01RY74mFlUwkSj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766063411; c=relaxed/simple; bh=FWK55CrKQxqqJF07xpBROWBCTj7q20BnUv6oWg7F4Hc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Gr/3VaRPqKN4cjtTp84UsEhdDwdTjlQO/Yto9V2s2cosKmkHU99aI5HeQBgCg8Z/Bi/6xxBUwNKHeCajmByoJiD+BpdE+ZySjrB1LmUsSdjYXke/xe0KpkwbDuedCa/HMwkN1yjukgfSkd7OrH0OBN/OMJcUXHUXezjw/nsubZg= 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=MlDswGu2; arc=none smtp.client-ip=209.85.214.178 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="MlDswGu2" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2a0b4320665so8737355ad.1 for ; Thu, 18 Dec 2025 05:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766063408; x=1766668208; 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=G3TCENr0pwf1AEzmfzATzYgD/ncjqU5Y+gUYLbJJ/50=; b=MlDswGu2frE2F5iDGUguX8ORnRnAJZs5hhQyY078WSg/QP/w7gI6zGpSuJXxyAEJ6b SxKHG/4c6q+iXQfSES44lHnpLLxzFWhQb8rw8hNYp9Ls/wY4ZWxXn2Iz25X3+2SBNL6v fH7mTkg9qPSWgZKcibmMwmgzBL+GH7zb+oXvonhBaT1+mzG6X1IF7uwIzyxweKzNUvZz 2jhTW9Dj4xBatkFkMhw7XZYvXO0BhE5pnrCAzBdXVD5yJB++oRS8vByMcXMqNSjcK0NY OST4bPiqgIl4mf5zstm/e7cKbKX7fH2QzfqsdrVrm/TGQeRdU3OQqgqjoWr7DTZyDagM i8rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766063408; x=1766668208; 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=G3TCENr0pwf1AEzmfzATzYgD/ncjqU5Y+gUYLbJJ/50=; b=d4YBvE6U/WFdQ+obkxACVn6wxY4xHLurdUDkd41PWClOt/6JrBEepTZvSfQ4bkPF6Z zQRspRRRGWM5i/V2Ymh3HOm644gIN2ApiUWRhzzSZFg69tnPcZQbMI+rAsaq5vM+sInz 0rlurV32d1PZGAC00CKwHaZpJIY+v0YdyBbZWlItbyp3YfXG1z2ct2TdPtOqdEgvCFYA IREtG5d9ktkV83DFZ8xundCZA27fFmcgO99FcH2BF9b2bypvPGfYODJbyzivvK9FEbHf YjqLBn2Mqecy4u4MUMl7HeSo0Yyod5fypLnEFyT4dFBRV+P5eZQlawRZixEGIbTxJ0OL Gfeg== X-Forwarded-Encrypted: i=1; AJvYcCU+Q3kIspmfLeK4vAgrtGIYOnq9HGlbxGB9FqgXHMqt7hAVSamR4yzfym5dfnE+AloIWjygC/YahiWc5LU=@vger.kernel.org X-Gm-Message-State: AOJu0YxySy6W/X4wwPp3BFvt3LrRgiuBI4okRPhhxW7yIp9sCyIVzK36 7v4J+B6NFTzP/fDoiZ7Io8jhK3DJthXT9SXIDmt/8ACJoCV7sf2IoM9E X-Gm-Gg: AY/fxX7YpjUzoQ5UaKmqNGZo8Xg/IBSvZZj8Q+2KIl6mFjkYBv3uvZkRRsY2admpytC 6rasSkK7hKCgKK+yK/gmTuE+QFdB+HFPsR9ofoZFTYJ17+pFQFYYd4pD6baUsIFncnzWknbdPrT Qjp+YL3w+wd0QAoYXiZr0HBxxsjn/dBrA/hTBd2ACM8MsSz/lv6c+fGdn4Q9Q9ZNfC7iAoksE39 tO/duTlqi/pHYfhmsNMNVTpRZCeVdomZhnovcy3On5Hl6N8DFvZA8oceuiJClJSkuZxzi3ASYPZ 2grS6UX1BsK07mz/6fII4jBulj40fMS8u7f2bF4xXmmf0oOuT0Fmew2e996ITla+WndZ1u0faZU +Hfs/9KLOFO11mHBSIddD0zIxJ45rYGAm77rYoDYa0NLl/BYzsIjITZzLeWDEv3jud7+tsBZ33h 0gxT+6klhct3Il/CWRoYbjycaPF58YsYLPOotQqscR0Q== X-Google-Smtp-Source: AGHT+IFaf6sCWgD75/ILIq3bALtZPi+pj1h/4krEFrOW2ZcgvzVOSmifnnbQZGCeJL5QUhBwf7aNiQ== X-Received: by 2002:a17:903:46c7:b0:2a0:8966:7c9a with SMTP id d9443c01a7336-2a0896681ecmr172355385ad.58.1766063408168; Thu, 18 Dec 2025 05:10:08 -0800 (PST) Received: from localhost.localdomain ([113.218.252.152]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2d089cf0bsm25475205ad.40.2025.12.18.05.10.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 18 Dec 2025 05:10:07 -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 v2] sparc: Use vmemmap_populate_hugepages for vmemmap_populate Date: Thu, 18 Dec 2025 21:09:57 +0800 Message-ID: <20251218130957.36892-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 --- v2: 1. Revert the whitespace deletions 2. Change vmemmap_false_pmd to vmemmap_pte_fallback_allowed Link to V1: https://lore.kernel.org/all/20251217120858.18713-1-pilgrimtao@gmail.com/ arch/sparc/mm/init_64.c | 50 +++++++++++++++-------------------------- include/linux/mm.h | 1 + mm/sparse-vmemmap.c | 7 +++++- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index df9f7c444c39..86b11150e701 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -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_pte_fallback_allowed(void) +{ + return false; +} =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..ca159b029a5d 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_pte_fallback_allowed(void); 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..45eb38048949 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_pte_fallback_allowed(void) +{ + return true; +} + 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_pte_fallback_allowed()) { /* * No fallback: In any case we care about, the * altmap should be reasonably sized and aligned --=20 2.50.1 (Apple Git-155)