From nobody Sun Feb 8 06:04:51 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 7542A32D0D5 for ; Fri, 19 Dec 2025 11:58:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145517; cv=none; b=S6aD2u9/fJIzbsJD1rVKhUQaU+jilTaV2vYTe45Ha0tuqhGkYH5Wvt6vevI/w1EkNgnu08Wc2a6bfEJypO9eJLXbuqX+v0vrWUBB/BMBcx/T+qDXW9ilKKQUkly8oE9w8jwZwvLZ3ytqEf6My1eWUoCcYqZhPoBL22DysnQWU/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145517; c=relaxed/simple; bh=3pWw4P0odQo6+R2d7TtcfhVeRyfUHqzonKgWsY3PvHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VuuLORW8OV6HMUF8f+7pSsRvFZCL5mTmeVxhkQOxi7DJHvmJvQ3MJlshNa1rQloZcCDo+A92dBVyyGQdjVpzTN2BHG973cx6MTPfIAKnumanWPk1NxpbQddgLZGWQumx7r/B3be79I0cCupF0pCxePq+MHqEHTCdTevTDJfgeFY= 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=K7GJz7VO; arc=none smtp.client-ip=209.85.210.170 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="K7GJz7VO" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7b9c17dd591so1499245b3a.3 for ; Fri, 19 Dec 2025 03:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766145516; x=1766750316; 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; bh=XKBIZ7X3YGqQjD1QrQoyKYVgf0OWXgKlCuUAkiD9UlQ=; b=K7GJz7VOfZ6fQMUy2/56+SzcOcM6Ts+w8/NEkoxrH4LIDueE7PpPryn3lPuOYzFH9C Gd7FpQI4MmL8oNwcIIoUHpMlyge1Pue9GgMCrboIAGJeXK2KR57pIZ0R7NcngJkEbgDz dPuiOFNZQCUrme59JUJEP8wHeDrrLqhh7oUu1RJ1Bpod2ipG5xB6nFYg6tg7rCXbdoLk U3jWdUMy5XykfHfEQueqkZ8qCUU31kTG+D5smG0/UXCYudDKyVpg6X2l/ruJpn3lunfS /dV4yWChbIraCzyU9daeyINdln/1N7WMS4W2k/VkV8VCqj/A/6mDcaS+QtR/EWI+lr+a 1fyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766145516; x=1766750316; 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; bh=XKBIZ7X3YGqQjD1QrQoyKYVgf0OWXgKlCuUAkiD9UlQ=; b=ql6tgqlBh90s44NN5Fof9VX81MzohUG0ZRzlVrijNjniHnzB+F9EhkWUMzdgXZBhPT UvWWr8tpzAtJreHrWpL97MNpmiMlPYX7qUDzX892BofBUFPYlby5f5HWjYVElgE7OPR/ Ot8h3ENxk3KUwakPRK+Ow30WN1UACwIdFcwKd24Lqyq/LFeK4EGySjmdJHr0Y7KuMjNh 1qVU0eWRYgpKvjgh4jl4F471M9lwcYjZT2LXpW2YJrwHAA2ttd9L4l/LcC/BiPiSxnh8 bN8dVc7CZh3lzF+9pVI03do5bSe0FhP9OSRDVSsmjnnChQdNtNcaRF2Ak2pA1yVXQiNZ LU5g== X-Forwarded-Encrypted: i=1; AJvYcCXVCB8u0cxVKxHtpT6TNYihiUR0GQbMkshCmoHq5w9HOO/MO+5I9LnJ4zT2GuXXeDxdVA8ePbnukf6sIiw=@vger.kernel.org X-Gm-Message-State: AOJu0YzsdXKEqwobnaOQOXjm8B4l5nuWoFUCF/S+v1uo0lMC1ufAw4QV tZlrcuyevrr47WfUFUCK+u1UfrlxbsBYL78t6GFWb5Mo8B8HIC4gt/Lo X-Gm-Gg: AY/fxX4kImmEKEFqVryE48e1V71/yk0fTED3jsFvJzxX7RRLM9tjxGn2ZK2plKnkgdc TnyhbjBpNpWWHmeXvEmrXJ3NJQNAiyyGwQlFJo4TQO4wuPv+SzhUTXeR/ySigpQ1SeYNetZiOwc WsXPGufnIA+MIeL9b4h4jd/uZxnBVPgO2/xGO9fPt+GOmKMbWVKyvapKX2cJ+zoYaMor6Gr2lYt xkIMw6Ue0f1KVD6ASZjp8GCgEryWqy+V3bt38+NjIFXaxeFNpyD5MdHm+cVDm5kcdq6h5Css/rO Z0LGFkJ/b62R1YfuEvT9ThxHzZ49JYK21Xw+zWpQePqHKjErY6Urac9K6ezpNqRujAjGoI8H57y VEjLSnwp1+nZIVO/I8LnwsY8uQCREe6EWooPSf87Ooyt5nZvYwvQGYJp6yhQWOzPMpi6A84K90S CZ0/SFGGfeuETGS0birbIx9nOxHfzqc3L7+DLJAZgXX7EEP5wXZpNG X-Google-Smtp-Source: AGHT+IGo8qcsBU7nnRMisHe+3/ZdYryGUHrh6G2oCtGYAIPB39ve/9QZxztOzFs0p/0RxiDANxcA3Q== X-Received: by 2002:a05:6a00:801b:b0:7e8:4587:e8cf with SMTP id d2e1a72fcca58-7ff66a6ea42mr2101088b3a.66.1766145515736; Fri, 19 Dec 2025 03:58:35 -0800 (PST) Received: from localhost.localdomain ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7b127b00sm2258560b3a.21.2025.12.19.03.58.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Dec 2025 03:58:35 -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 v4 1/3] sparc: Use vmemmap_populate_hugepages for vmemmap_populate Date: Fri, 19 Dec 2025 19:58:10 +0800 Message-ID: <20251219115812.65855-2-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251219115812.65855-1-pilgrimtao@gmail.com> References: <20251219115812.65855-1-pilgrimtao@gmail.com> 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. In the SPARC architecture, reimplemented vmemmap_populate using vmemmap_populate_hugepages. 2. Allow the SPARC arch to fallback to vmemmap_populate_basepages(), when vmemmap_alloc_block returns NULL. Signed-off-by: Chengkaitao Acked-by: Mike Rapoport (Microsoft) --- arch/sparc/mm/init_64.c | 47 ++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index df9f7c444c39..858eaa6615ea 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,24 @@ 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_val(*pmd) =3D pte_base | __pa(p); +} =20 - pmd =3D pmd_offset(pud, vstart); - pte =3D pmd_val(*pmd); - if (!(pte & _PAGE_VALID)) { - void *block =3D vmemmap_alloc_block(PMD_SIZE, node); +int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node, + unsigned long addr, unsigned long next) +{ + int large =3D pmd_leaf(*pmdp); =20 - if (!block) - return -ENOMEM; + if (large) + vmemmap_verify((pte_t *)pmdp, node, addr, next); =20 - pmd_val(*pmd) =3D pte_base | __pa(block); - } - } + return large; +} =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 --=20 2.50.1 (Apple Git-155) From nobody Sun Feb 8 06:04:51 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 4588B32E14F for ; Fri, 19 Dec 2025 11:58:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145525; cv=none; b=b4PDPTzO2qrGSamA0Skz+Opd5D/mS/94QMPCCbu9dI229nD5dsSeQNmO9J/PaKqx4rhF7y8DKiYDXm07MqV/eYsXtsI2CfRYwNZwo+ifcLs8Jg2Wz4pcfShcE2HPcYkAt3UGgLmkyGES01Nw6qUI2+MCsm+/bRQYyMjqnEzmZf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145525; c=relaxed/simple; bh=JSNCFCGCnTJ5C/s6JqxpKX2kZcgQfa5SddswCGob0dU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mn8BgDBaE+nj03JU5ynL9xoM9WtC8fBwkZ/wwvLExPhxM6cCeCfPsrk/Loq7F0Cx5UafhvlG0zNznnNxZlwlyg5R3/OpqPgJ/2umAk1rJduLHxHpJEeqiu0x1ChM7MRBbnXEb/+dQ0/lNkIohxIRjql+W1M1UTrZ2a2Us/ORHsk= 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=WgDIjA5x; arc=none smtp.client-ip=209.85.210.172 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="WgDIjA5x" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7b80fed1505so1804916b3a.3 for ; Fri, 19 Dec 2025 03:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766145523; x=1766750323; 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; bh=kVePrI9HNUUUrQXi6c3AiF1RzNZZo1pMhE3QtRBD0Es=; b=WgDIjA5x5ycgzUxrH9NKVaQ1T2vjigrdswo90qXMg/MY/aN+xJDukQSKInWsuwxcHE JqKjzZwFJ6BzZHRi2v1SRE8Qo0ZofiHhV240ReCj76Udonsw6I1zyJTe6VmGbm4o//W7 xJZ3AVZ34qfwXK0vVo6hiW4JJrsC+MlEyOQHgBy4aZ5rwbcTCzI83B6qCOs/J4rx6s6k tIhD3pQ1QwifCruuG0/1/mqGgpjilbSv1mX1cWxgdC7bEzAWS15wxmUqL6ly+imY9D4O kJjAFzvf+QoZsiiHocoSNVWJukQm8qOOloJ7AXPkYZUywSVjPjzwvSQGLKGbhkc1Z4YI YB8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766145523; x=1766750323; 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; bh=kVePrI9HNUUUrQXi6c3AiF1RzNZZo1pMhE3QtRBD0Es=; b=aZ0XEm0LHJ3YBTCAtFfgaRZqo8knntNDAF7csa2Bgivc4iyk6L4Ky+V65SioojZrbK 2FJpObG/buf8xHERcUSqcKP/tLRQcx4VANP3bR/BEBeq/EDyblTHvlMJHCMtt/CVqOZC EeY+S0HjDsuRpI7hwcAxIQQZqvShesaaZlgdi6u61tQGkNxT2Thnm89aiocnGjEFnGC8 oRAgbeSXCgEIPIQLZaeSLD8BKbe6x/pMNP6FyKu46ACNKd2Z87t535x3N29V/NGzLCRK SxF8gOljH8DV+q8xHd8ZJNblXQbc8KhhzPfJvEpoI5B2Ib8JIW3T1MUAVNkYwgv/E9DZ bQvg== X-Forwarded-Encrypted: i=1; AJvYcCWAwEF4JuknYDRWf42skbGwgZ6BE9aTLo4eIIAdAEr0jMfLokoJAF299pksdoZkXaQ2g58D9PZhqrwHLEg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+H5JjNNHjFHJDrfHcT4CUBv1jhrLZYWt1gssNXhrP6GmtGMNk LPqDThXoExX/cOlpppOwMZLYBw6kyhybgKw3xnRjnOjQ+rIryUQLg4ex X-Gm-Gg: AY/fxX6H7QV5av5OuihoC5DkCYVzeFZlFwrUz2IYZfm2hH65oSKNEPfsgzAXqze8IEd 1DuU99Y/aO8xR2xIFQ3MUclQV8zlkAAMG444RRBm/a9yZ666CBkH3oPoZafr8RkQBXuosMHzRyZ Zdx72R0lr6pbNL8KRxVGwT0laUYcyayUJ/9TXTnegx7kKCRGbO3JnW+pDtBhXG6aAX5NbGoXLNa l/CEdcLek4R/wsyVGRux2UYNMUkq6s5PNg9R82ppZJkwvUKfIluMS7X6gUt8hoNRNfmQmLM8+nt tRI+G7bsulf4pGJb0e6CEC+eDPVIgvKtn18TIsRnBUQLn+jQkLgwOU3VDpmuCiIykdO6TeN9BLR B9cvco0eAOF346z+GedqFhTp4QHoFyTZbBLBlYAAU4B13wADVI8tQCdkORyYpzch40f3YQcXiWe S8lJzWzUXwKDXgeQDS9HPzmVNcrfFJKUzKn+ewv5v5Eg== X-Google-Smtp-Source: AGHT+IEssKL24IcA70xxc4mhVvvw4D6teK050VKbdzvFCYfVJoKpYEGbrW4olo5yzEO8AY5fL8eV1g== X-Received: by 2002:a05:6a00:1bca:b0:7e8:4398:b358 with SMTP id d2e1a72fcca58-7ff6607b228mr1844327b3a.43.1766145523337; Fri, 19 Dec 2025 03:58:43 -0800 (PST) Received: from localhost.localdomain ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7b127b00sm2258560b3a.21.2025.12.19.03.58.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Dec 2025 03:58:43 -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 v4 2/3] mm: Convert vmemmap_p?d_populate() to static functions Date: Fri, 19 Dec 2025 19:58:11 +0800 Message-ID: <20251219115812.65855-3-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251219115812.65855-1-pilgrimtao@gmail.com> References: <20251219115812.65855-1-pilgrimtao@gmail.com> 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 Since the vmemmap_p?d_populate functions are unused outside the mm subsystem, we can remove their external declarations and convert them to static functions. Signed-off-by: Chengkaitao Acked-by: Mike Rapoport (Microsoft) --- include/linux/mm.h | 7 ------- mm/sparse-vmemmap.c | 10 +++++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 15076261d0c2..d98a38a6ac0e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4234,13 +4234,6 @@ unsigned long section_map_size(void); struct page * __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); -pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); -p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); -pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); -pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); -pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, - struct vmem_altmap *altmap, unsigned long ptpfn, - unsigned long flags); void *vmemmap_alloc_block(unsigned long size, int node); struct vmem_altmap; void *vmemmap_alloc_block_buf(unsigned long size, int node, diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 37522d6cb398..67f9a08c2376 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -151,7 +151,7 @@ void __meminit vmemmap_verify(pte_t *pte, int node, start, end - 1); } =20 -pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int= node, +static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long ad= dr, int node, struct vmem_altmap *altmap, unsigned long ptpfn, unsigned long flags) { @@ -195,7 +195,7 @@ static void * __meminit vmemmap_alloc_block_zero(unsign= ed long size, int node) return p; } =20 -pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int= node) +static pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long ad= dr, int node) { pmd_t *pmd =3D pmd_offset(pud, addr); if (pmd_none(*pmd)) { @@ -208,7 +208,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsi= gned long addr, int node) return pmd; } =20 -pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int= node) +static pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long ad= dr, int node) { pud_t *pud =3D pud_offset(p4d, addr); if (pud_none(*pud)) { @@ -221,7 +221,7 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsi= gned long addr, int node) return pud; } =20 -p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int= node) +static p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long ad= dr, int node) { p4d_t *p4d =3D p4d_offset(pgd, addr); if (p4d_none(*p4d)) { @@ -234,7 +234,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsi= gned long addr, int node) return p4d; } =20 -pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) +static pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) { pgd_t *pgd =3D pgd_offset_k(addr); if (pgd_none(*pgd)) { --=20 2.50.1 (Apple Git-155) From nobody Sun Feb 8 06:04:51 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 D2A0632E14D for ; Fri, 19 Dec 2025 11:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145533; cv=none; b=mho1y6w3J5URyNZ1UMNXAqytGyNgP1rst5KkxJHcKd4CCer5T3UEPzZAVGxW6deZGpUYrpjI5DvxYHbXPwhs3//3+UfbrRSOyvY53f05xC5xR4xBef9F9g6Nb9JOKlXORk85UpNcZU+NOwhH2M/vyBS568z0K/N5wJRCwGPesj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766145533; c=relaxed/simple; bh=bFwxR5OTrg7lbxjFx7fCNd9yJcjjIHw349Z07jIDKK4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GdmMiFqggeyRTB70s+KGRq87drYkqASUt8klMOlrfo6/hZaBAQQEvA6od98VOk08bxJ6UWp4Hii4DV8XisNlFoVbF802Y+aKxOMxKoV+xkrdrGga7+VgaNWAnyf0AsP2Wt84KzJR5vKthmpV5ukjcJUVzQ2ViyD9hgWGhjhxQgE= 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=Bzo2WCHL; arc=none smtp.client-ip=209.85.210.179 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="Bzo2WCHL" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7d26a7e5639so2037915b3a.1 for ; Fri, 19 Dec 2025 03:58:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766145531; x=1766750331; 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; bh=RsWpa24lxI6xHk1ZPBUYj2BnfB01U6tPDq237TH7seo=; b=Bzo2WCHL/yJkJGg/SEbTXc+Ec1QGr5IOuUoaaGPEU2Qts+Dmnf3oXbVR2c1p2YTYDC 8PeNQjW9D1/th2n3Ym3FAA0c6QbVsAQkaE7qjeyF5p/TNKe2Yu8Dw9rdKv+5tOydOM1K 3OjlO3VM0mURqlkcqXA5JhcE5vv2dPcEcQBHG6GZ3tTtKgweu8sax82hpYxkebSJJ6c6 Ia9LwOHjX3VrpY8HV8tTZ1cE+7SKVVtqXF5n7ug6kCGVKceiYwoSks2+zfgh1t+KaZ+6 1n9BCTIK9prvJdftBgSBd8ct9WrcSeDbulYxwRHPG08OsV40Zgh73VX5DHnKv4Vco39T a5Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766145531; x=1766750331; 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; bh=RsWpa24lxI6xHk1ZPBUYj2BnfB01U6tPDq237TH7seo=; b=X2mce1Ew7jhzYWFOFAubTkuAp7JJOha/y4CJXURoOQr54ZxKYEAz+Wydt7YNRQFPXp TsKRtKEp3I+QQWt46BXZZWdTbLEInuhqTgzvVMAE/Bv43wDpgYrAWrMe55QgEQce7r/4 IGNOkBOSptL7e7DQ6FCNWtkfDUDyvqQZc/sgcLQXyd1wBe0BGfHPPAz5XHuoPGxX3TIu dnfPSc7mclsMGkfrtE9/vWHBjZKE0EuQz+KtUFEQIbg8/jAN2zCpASTWq/mgOqAbl3Zh +NFaXhbSpgo1dOtAUtE2iHsIUaO5028+Tje1aXQEfcjmUMQ1bgIWrkmjSBhCQKSr64IV 0iWw== X-Forwarded-Encrypted: i=1; AJvYcCUsO/gplRHe2tE2oMugTwU/djirEM81Bn5/4WByTaVKqq8oSOWMLB87qR99Fdwcg/CISp52qzgG1EI1cfs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/yHERM8U3p8/4XoSL1oKMl5oKBTfKwcGPLVWz/IxlFLRcqr5H FXI+eE2KZlddEuK9zzu4kQ3mnnjvco39wJ3wfPOqGeWVZHlxoFcIpog0 X-Gm-Gg: AY/fxX5pe0sH1wT884RGfZ09Zkys5Ew8p9EQBQ5WZlYQ0afNmPaeeoR3jPKu23ew3Vr O+xDUjQeMWCh1BK2yJ28dIVktYrrnoadTK5Wblj1AlA3sXxqbYTbtYma5+JsbrrSPP1FLkERoR+ oB85SwgPRRq6bfo2Eek5f/6tOlab1NXNagoJ0UU/M9r71gnuFedWQV/6kurnvarPjP1tD3OMl9S d2p0aTupkHhIrZyWCu5YQHDIJgHV44h/icd3dyIm76oBUkzPMs95eD307s/Ul4Rc1lZBkuxAQOD ke7hAHz7nazl0anXiKtcFoqJpq9bFBWpAtsN41O935jYBbwfSV8evlU/lURrpgGMVTAo9ZfCA5U UwMR0E8L8uMwJPlGgJeUmANPMDUBpUl915XhQB1avgC97I203BiLHFWmh7r2LVcNbUPibNzN0nT XwtCFrfvOpM665swQkIpjPHsKdyVnuQxM9N4VlKJB0YgWy9EWSl6H6 X-Google-Smtp-Source: AGHT+IF11NXTxykBJC+oLwlMsW0lPOQ7p7i34Dr/aL0JQHuQ9W6RwWlf8VZxMOhy6Q0w9LFlCexwYQ== X-Received: by 2002:a05:6a00:884:b0:7ff:8cde:f202 with SMTP id d2e1a72fcca58-7ff8cdef2e8mr2140403b3a.15.1766145531015; Fri, 19 Dec 2025 03:58:51 -0800 (PST) Received: from localhost.localdomain ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7b127b00sm2258560b3a.21.2025.12.19.03.58.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Dec 2025 03:58:50 -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 v4 3/3] sparc: Remove unnecessary whitespace Date: Fri, 19 Dec 2025 19:58:12 +0800 Message-ID: <20251219115812.65855-4-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251219115812.65855-1-pilgrimtao@gmail.com> References: <20251219115812.65855-1-pilgrimtao@gmail.com> 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 This is purely a code formatting change with no functional impact. Signed-off-by: Chengkaitao --- arch/sparc/mm/fault_64.c | 4 ++-- arch/sparc/mm/hypersparc.S | 4 ++-- arch/sparc/mm/init_64.c | 6 +++--- arch/sparc/mm/io-unit.c | 12 ++++++------ arch/sparc/mm/iommu.c | 2 +- arch/sparc/mm/swift.S | 2 +- arch/sparc/mm/ultra.S | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index e326caf708c6..963b2c4c87e2 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -201,7 +201,7 @@ static void __kprobes do_kernel_fault(struct pt_regs *r= egs, int si_code, unsigned long address) { unsigned char asi =3D ASI_P; -=20 + if ((!insn) && (regs->tstate & TSTATE_PRIV)) goto cannot_handle; =20 @@ -229,7 +229,7 @@ static void __kprobes do_kernel_fault(struct pt_regs *r= egs, int si_code, return; } } - =09 + /* Is this in ex_table? */ if (regs->tstate & TSTATE_PRIV) { const struct exception_table_entry *entry; diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index 6c2521e85a42..bac194982498 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S @@ -30,7 +30,7 @@ hypersparc_flush_cache_all: ld [%g4 + %lo(vac_cache_size)], %g5 sethi %hi(vac_line_size), %g1 ld [%g1 + %lo(vac_line_size)], %g2 -1:=09 +1: subcc %g5, %g2, %g5 ! hyper_flush_unconditional_combined bne 1b sta %g0, [%g5] ASI_M_FLUSH_CTX @@ -325,7 +325,7 @@ hypersparc_flush_tlb_page_out: sta %g5, [%g1] ASI_M_MMUREGS =20 __INIT -=09 + /* High speed page clear/copy. */ hypersparc_bzero_1page: /* NOTE: This routine has to be shorter than 40insns --jj */ diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 858eaa6615ea..cf30040db2bf 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 diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index d409cb450de4..15f83e6d21e2 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c @@ -4,7 +4,7 @@ * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ -=20 + #include #include #include @@ -62,7 +62,7 @@ static void __init iounit_iommu_init(struct platform_devi= ce *op) prom_printf("SUN4D: Cannot map External Page Table."); prom_halt(); } -=09 + op->dev.archdata.iommu =3D iounit; iounit->page_table =3D xpt; spin_lock_init(&iounit->lock); @@ -109,9 +109,9 @@ static dma_addr_t iounit_get_area(struct iounit_struct = *iounit, case 2: i =3D 0x0132; break; default: i =3D 0x0213; break; } -=09 + IOD(("%s(%pa,%d[%d])=3D", __func__, &phys, size, npages)); -=09 + next: j =3D (i & 15); rotor =3D iounit->rotor[j - 1]; limit =3D iounit->limit[j]; @@ -150,7 +150,7 @@ static dma_addr_t iounit_map_phys(struct device *dev, p= hys_addr_t phys, struct iounit_struct *iounit =3D dev->archdata.iommu; unsigned long flags; dma_addr_t ret; -=09 + /* XXX So what is maxphys for us and how do drivers know it? */ if (!len || len > 256 * 1024) return DMA_MAPPING_ERROR; @@ -185,7 +185,7 @@ static void iounit_unmap_phys(struct device *dev, dma_a= ddr_t vaddr, size_t len, { struct iounit_struct *iounit =3D dev->archdata.iommu; unsigned long flags; -=09 + spin_lock_irqsave(&iounit->lock, flags); len =3D ((vaddr & ~PAGE_MASK) + len + (PAGE_SIZE-1)) >> PAGE_SHIFT; vaddr =3D (vaddr - IOUNIT_DMA_BASE) >> PAGE_SHIFT; diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index f48adf62724a..f43163a9a812 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c @@ -89,7 +89,7 @@ static void __init sbus_iommu_init(struct platform_device= *op) iommu->end =3D 0xffffffff; =20 /* Allocate IOMMU page table */ - /* Stupid alignment constraints give me a headache.=20 + /* Stupid alignment constraints give me a headache. We need 256K or 512K or 1M or 2M area aligned to its size and current gfp will fortunately give it to us. */ diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index f414bfd8d899..cfcc48b6c5c7 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S @@ -243,7 +243,7 @@ swift_flush_tlb_page: nop #if 1 mov 0x400, %o1 - sta %g0, [%o1] ASI_M_FLUSH_PROBE=09 + sta %g0, [%o1] ASI_M_FLUSH_PROBE #else lda [%g1] ASI_M_MMUREGS, %g5 sta %o3, [%g1] ASI_M_MMUREGS diff --git a/arch/sparc/mm/ultra.S b/arch/sparc/mm/ultra.S index 70e658d107e0..66cbfbb1d3cd 100644 --- a/arch/sparc/mm/ultra.S +++ b/arch/sparc/mm/ultra.S @@ -284,7 +284,7 @@ __cheetah_flush_tlb_page: /* 22 insns */ be,pn %icc, 1f andn %o1, 1, %o3 stxa %g0, [%o3] ASI_IMMU_DEMAP -1: stxa %g0, [%o3] ASI_DMMU_DEMAP=09 +1: stxa %g0, [%o3] ASI_DMMU_DEMAP membar #Sync stxa %g2, [%o4] ASI_DMMU sethi %hi(KERNBASE), %o4 @@ -312,7 +312,7 @@ __cheetah_flush_tlb_pending: /* 27 insns */ be,pn %icc, 2f andn %o3, 1, %o3 stxa %g0, [%o3] ASI_IMMU_DEMAP -2: stxa %g0, [%o3] ASI_DMMU_DEMAP=09 +2: stxa %g0, [%o3] ASI_DMMU_DEMAP membar #Sync brnz,pt %o1, 1b nop --=20 2.50.1 (Apple Git-155)