From patchwork Tue Mar 11 00:46:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 14010890 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE264C282DE for ; Tue, 11 Mar 2025 00:48:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 771F9280003; Mon, 10 Mar 2025 20:48:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74A11280001; Mon, 10 Mar 2025 20:48:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6119B280003; Mon, 10 Mar 2025 20:48:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 42AC9280001 for ; Mon, 10 Mar 2025 20:48:02 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7C7EE121661 for ; Tue, 11 Mar 2025 00:48:03 +0000 (UTC) X-FDA: 83207433246.19.C6071DB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id A8EE7140008 for ; Tue, 11 Mar 2025 00:48:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MrnzwuGv; spf=pass (imf23.hostedemail.com: domain of gshan@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741654081; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Hgrxg5qAPOx7K2ONkn1MCXNcggxF5k+2r/MNYL/OtKg=; b=7bJBxK4mFictYKAw4R68faIlQcmZJ6Oy+fnJRUnxA6dezszJ78t5x/vArokSXyVolk6dlA mDBxFFNRGv7TGdDTfImFr8hbAKA2dXBEZdyoveKyNoCxFxY3ZPtWv+hvk74MXEkj9/u4VM ND2SmPSqaUQZEgXh8M7yrqhs+LGeJ+w= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MrnzwuGv; spf=pass (imf23.hostedemail.com: domain of gshan@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741654081; a=rsa-sha256; cv=none; b=BhC2Vx+D+ad7vqaFR7+2fVCsnDr5m1YRAb8maHtex+WQXic/VUiF4fycd7XDwwcI33IlYO /14nyvWk7EvcfIm3eumXb4Pg9mq8ZLleQqbrSD9Hu/nkRiG3PYopu4jZI0RxqqtRK5zonE tF9Lv7CDBGjnaxe22GFRgXSpPH+ikVw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741654081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hgrxg5qAPOx7K2ONkn1MCXNcggxF5k+2r/MNYL/OtKg=; b=MrnzwuGva+Q7pe8/JHVRQk00PGnC4qqqQzFQ+AZnXWsYM0Jn6Bgp/gQOKKXgxmp4zkry/D SB/YxrFBqbNEusXsj5dDrmm2arvAdsYg/klgtUen/jRwyRTrVpSxjP9ZR5MU9q9hv7wGOA Lg4NheBahvTvdTx8p8T7IpNIde7DHpk= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-eQAVUnAIOIizaZ8uLe3bPw-1; Mon, 10 Mar 2025 20:47:56 -0400 X-MC-Unique: eQAVUnAIOIizaZ8uLe3bPw-1 X-Mimecast-MFC-AGG-ID: eQAVUnAIOIizaZ8uLe3bPw_1741654075 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C90271956048; Tue, 11 Mar 2025 00:47:54 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.79]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 611301828A8A; Tue, 11 Mar 2025 00:47:48 +0000 (UTC) From: Gavin Shan To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, david@redhat.com, osalvador@suse.de, gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org, akpm@linux-foundation.org, shan.gavin@gmail.com Subject: [PATCH v2 1/3] mm/sparse: Expose for_each_present_section_nr() Date: Tue, 11 Mar 2025 10:46:55 +1000 Message-ID: <20250311004657.82985-2-gshan@redhat.com> In-Reply-To: <20250311004657.82985-1-gshan@redhat.com> References: <20250311004657.82985-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Queue-Id: A8EE7140008 X-Rspamd-Server: rspam03 X-Stat-Signature: pkcmwze49m9txdn76nt8igd19s64ysyc X-HE-Tag: 1741654081-431117 X-HE-Meta: U2FsdGVkX19tIVtXQs9tBpjppi7vjKYFDdbBBfT/kF/nofADnR72sMn7vXKYl1iVD3JSDgcrnXShj9AcDK+tx1xfe6geZzqXJdkxnFeUkIJHNCNvpxuopLOjOmGIVRCMNq99Faw1dDTEUIdYjLZ3YPx7SW5rR4Bz/OUlanMLrFsuornjuhsVaKFRfTev1f4LL6BWja2E8yluoHwxSnURgESO1IHwATEJ3vWtoprpwqOYgyVsQjBDMMpQD7D5qJoD0DhVlXqstz4MHjQx4aEOqfC246JMWW+NaGq3VJGBtBDLEAKP02eA23XMPHwllApan3MRpyw4bbuBnNVu+Mf0/JtLV/g8VhxaRlZcKWP5yWyHnF7X59X3aCRuMQobxIlkDo4XU17zkLm6Zf74kLR7t3hw80rzScwVWS1xG6T/ZVReQR9zyzRuGCo22rEnfLDakonxF7hqew7SdJI35VCX0q+bpCNg6+HHmpbbiMhGC8gmFaNpW7/Wn3rM2fUq3VGR/T4MI0MiDjGfQD4kOogoRrft05TFSWJT0X1SNHayDxhC9ZNUh7NazJE+Dl+RME571x5nGzdArsWGHGXemkMUIUSnyIyIExI3+Fwd9WPsRoQYoIJj9qcrp32KFPZqCG/ns8n+YGPRdCz3HLQA6mDQ7nkVYr+q/A6ETKjkVb3wZH3ndQ87DEJjl81e82/dolwxKHAU48lI3y+iKPssG2x3tdnMrL5owY50e9UyJXQQpVCy9ZoTTsunaJXAJBCGF6RmFQ98xN3JSAOL6nOr07YYrFw6IsGJqRp/560vJTCxBo20PfZ2MnwXWilL+qI/YLfVon38a+o7nZQ9CXNMK2lW3E1B23BFl/roBxe+QtlK4KpZAYBnjpnbtEQU8meUTmoHZu5mLmWK7zMbTqSDDYMyiQWhwSDBGJBVHQp9P+hpz6ny6PF2EGM93yhHmt5lpsdQhd/j1QxltVz3TVcejFt MZCk76iV +hCJ0O9MZQX11TjPWvRuhd8HCIy3EIvsqMujMerCzv1921sppyk15ixnaZ7HjfVoCWHqIij6VFeDGzqLxP3gKI+mQH6726T2a3K2umA/zPtO27mMgzVFfvCnMiW40gbRUWK9cQovsNyIhpsxqKirdq0Wpwx+yMYzOqr07HBwzIN0T3LqLl2bnrVuTXGycQaj5udiQODo+MjuCyi3LsF7pS4Hzx/5CSX68J7m2uHX6Zxp2gdTQC6Nk8jp/JfMksVunYMbjXOuraTy/T6uaS5yGYE25SR81qQ2QhZTyMJFUiV6KkWL8Oi1nwqGnUUqwpC4OfuXbmJoNWu4PALbMnWdhT0ayNixUI/lwuHqSXpzjfzF28jlNQSfzNVqZdkxKxkD+EBJEGE+4O3pfGPHLDRM0gUDdP4stx30ixoDGuAL2MMITOCo+vlE7MuZZXp+2zXZZDbX/1Mnn4vmHqmYKUIYGqrqhEy2J4078uRS3 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Expose for_each_present_section_nr() to be used by drivers/base/memory in the next patch. No functional changes intended. Signed-off-by: Gavin Shan --- include/linux/mmzone.h | 5 +++++ mm/sparse.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9540b41894da..0f6646da34d7 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -2097,6 +2097,11 @@ static inline unsigned long next_present_section_nr(unsigned long section_nr) return -1; } +#define for_each_present_section_nr(start, section_nr) \ + for (section_nr = next_present_section_nr(start - 1); \ + section_nr != -1; \ + section_nr = next_present_section_nr(section_nr)) + /* * These are _only_ used during initialisation, therefore they * can use __initdata ... They could have names to indicate diff --git a/mm/sparse.c b/mm/sparse.c index 133b033d0cba..fe77d523ab8d 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -170,11 +170,6 @@ static void __section_mark_present(struct mem_section *ms, ms->section_mem_map |= SECTION_MARKED_PRESENT; } -#define for_each_present_section_nr(start, section_nr) \ - for (section_nr = next_present_section_nr(start-1); \ - section_nr != -1; \ - section_nr = next_present_section_nr(section_nr)) - static inline unsigned long first_present_section_nr(void) { return next_present_section_nr(-1); From patchwork Tue Mar 11 00:46:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 14010891 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7983DC282DE for ; Tue, 11 Mar 2025 00:48:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A288280004; Mon, 10 Mar 2025 20:48:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 152D7280001; Mon, 10 Mar 2025 20:48:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F364E280004; Mon, 10 Mar 2025 20:48:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D44DC280001 for ; Mon, 10 Mar 2025 20:48:07 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7E616B9C88 for ; Tue, 11 Mar 2025 00:48:09 +0000 (UTC) X-FDA: 83207433498.06.7E7FC11 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id B3E76140003 for ; Tue, 11 Mar 2025 00:48:07 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DrC1QSCr; spf=pass (imf09.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741654087; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=e0HbzPi7UYXU5CIv0zG6CMHVf7Xivfr/axNQwtv2yW0=; b=3q6tkAx2gqqWUfEF2N0eHHx35WCDVXWv9zAdAiMM4wUwUuMkuVzjdzYN7DdHgP4u6XFgNv anz9WGnJpdVu4vpYyjEgDhW+sYwGOzxFyl4msYcVNm1CjqWDYhZ+twB9EyCDKTrH1JcQBY BfFup4FZF2HFvBPkjX9y3zQby0QtEbw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DrC1QSCr; spf=pass (imf09.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741654087; a=rsa-sha256; cv=none; b=SBjHzWIVG4/2ivmhDLYqUpPChST5ZkIL6VW3bSwWygyygY9FtJzjgHPsutTMwFdibuvahb TQ1xp/yf9Qrqw9InsvKq0EXhvjwC+iQz6xaSNnBFZC396MhXKW37bKE4oeSQQF1iJPjyBD yyg9bJgCQhfb7YJ/W2FXVloeqNEWuTQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741654087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e0HbzPi7UYXU5CIv0zG6CMHVf7Xivfr/axNQwtv2yW0=; b=DrC1QSCrPwdS3HXkVlL80R2Z6XLrU0+oQWkNLBzl/xa7W0JuAPSAysRewPxxySq+xalLFs RfSadAWYfeAt3//MTXMlojyj4j9f0Thc7VlEVbCyucBwJeVrV6WDM15tMsZ/1Djao34t31 6SYJCrw/C9QOhmYOWhxCKw+d6Fem3Go= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-2V7kjy-6PcKacCUXDWDGxA-1; Mon, 10 Mar 2025 20:48:02 -0400 X-MC-Unique: 2V7kjy-6PcKacCUXDWDGxA-1 X-Mimecast-MFC-AGG-ID: 2V7kjy-6PcKacCUXDWDGxA_1741654081 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC2F01800263; Tue, 11 Mar 2025 00:48:00 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.79]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BEDBC18001E9; Tue, 11 Mar 2025 00:47:55 +0000 (UTC) From: Gavin Shan To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, david@redhat.com, osalvador@suse.de, gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org, akpm@linux-foundation.org, shan.gavin@gmail.com Subject: [PATCH v2 2/3] drivers/base/memory: Improve add_boot_memory_block() Date: Tue, 11 Mar 2025 10:46:56 +1000 Message-ID: <20250311004657.82985-3-gshan@redhat.com> In-Reply-To: <20250311004657.82985-1-gshan@redhat.com> References: <20250311004657.82985-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B3E76140003 X-Stat-Signature: y665mazhx7k8exui3ikwz9iqb11o7aq8 X-Rspam-User: X-HE-Tag: 1741654087-382183 X-HE-Meta: U2FsdGVkX19IYtiMfpQphWInTCkfCGevrEN6P1JuUa7wx4ycFPQIl+6IXkkXrtZZgtz9aN+Eu9XjGqEY12b5N7SzBJuGM/xw3v4/0vqwkFDx2m5j1WMHjdxn36U7az786EhW1G7iv1nd14R6qe4qzyaC37rjl1YtCGqzVPsphW3aWcwYCuETO16/vvfnTHp7cHxDrqcizkUj+hWHuwDX0xDUIW0haE2N9r2pa4gvn1m4fYsksDzR0OK/9DoNrX/UY+q1B6kYvBAQjus8dADVadYMbe7gjzhexUDOJ/PsDbTa0u1iI3yzPKZpcr7kIUzShdYCOXcUp5FV5dHlVrrAhP/EzAKLLKkfpvuOS+bQQxEw4vKnIubpGHhjXLitDs6+ZPs3HRCGaBuRAogT5rSAr/jwKoBRz5IDQfeeUoavz8maoeFp8PZmCvMBaUCKv686l7ndM1bc3HYrEUC5YY4t92WzQhZfXCRX5UGUxaq99bdovfUDBv86aOcM0OyThwNR8c2WA9NrOz68rC3ekmImJI2GHjX0xvZGQZcVyEbX6fXlUnOAwCZpFftu3hmFgd3TZz+y8VxQ6IOORNGq7VXABCJuT9Ylxw88WEFiVyEqHsbZZb0AbZ5WobiOfXFowoaSGObDzwq380XaYK6dQCco6ugKtqog1QDS/gwII7KjqLdATqCfvAGtKHGTQjXkj4r0CEGd6uSvMMkr62EBmIWlp5T89n6eo8AEzNG0PKLt1rlpqU+l9Jeltbd50rDllzY1P9sBEcZOhw3BD/rsavD5AcTTTFWaOFS1irdcLiVoG9bXpy90Ya/fNNNREOlMneMOL5uQJFwFZ2Aybme7XKBEtpUD/czn63MzsPLCSeX3mC/dYeQ8KM8Jw+U1VsKGYg8bT1BLRlEyJgFUkOEJjKFsCdRNFQuXvySnjNMeuoZYmVRp0uF41Wcn9Wh2jbfSwpYSlUWNZk3f3UXIzy/0KN4 huvP3YYO RdE/nuk1UXXNvgRuaq1dI7dRyVH0NNQHWC+EuSj6YZzy7bh4FKwtwm+7NyJ543ixZ3FxrUQeP9e4ySUvl/xtcgA0tRM/pbAz2lWzjMgByxlMowNn0S8hayMEWifU9ajps8FF4fksWlq4Ls3h1jNlTEnG5E2nYigUxjECox3Sky462rCoW2b9oOV6QKLcU1jIFu/2tD+7nbiJaohqWFPxeOd3MWUPNmwXB4LZhxOi96mbR3ZbSUCCZ4ssOHFIocyXtYgwzRb++DeDmkW7zvA8E4ccduPwRnZ9GOpc7sBf7pznKe+sdSPdmOaX2obvCGZQhuyMFlnnGE1FHbr1n/5WbbMO0xzvB+wxcmLDZ+5cVz0MhsG/cG11+XwCHUc1cW1J4i2/Sa7L7wjJ+muhFilszQxsos3CD/VnrnWtRKUo2WgdCu25piPN6AuZiTHuUsPbAsQgkoQgO4YHk3nrs692kDAyHcgPvcoS7alFnH8PSXjVhypo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: It's unnecessary to count the present sections for the specified block since the block will be added if any section in the block is present. Besides, for_each_present_section_nr() can be reused as Andrew Morton suggested. Improve by using for_each_present_section_nr() and dropping the unnecessary @section_count. No functional changes intended. Signed-off-by: Gavin Shan Acked-by: David Hildenbrand Acked-by: Oscar Salvador --- drivers/base/memory.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 348c5dbbfa68..f66e9d537c12 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -822,18 +822,17 @@ static int add_memory_block(unsigned long block_id, unsigned long state, static int __init add_boot_memory_block(unsigned long base_section_nr) { - int section_count = 0; unsigned long nr; - for (nr = base_section_nr; nr < base_section_nr + sections_per_block; - nr++) - if (present_section_nr(nr)) - section_count++; + for_each_present_section_nr(base_section_nr, nr) { + if (nr >= (base_section_nr + sections_per_block)) + break; - if (section_count == 0) - return 0; - return add_memory_block(memory_block_id(base_section_nr), - MEM_ONLINE, NULL, NULL); + return add_memory_block(memory_block_id(base_section_nr), + MEM_ONLINE, NULL, NULL); + } + + return 0; } static int add_hotplug_memory_block(unsigned long block_id, From patchwork Tue Mar 11 00:46:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 14010892 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C203AC28B30 for ; Tue, 11 Mar 2025 00:48:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6738A280005; Mon, 10 Mar 2025 20:48:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6231C280001; Mon, 10 Mar 2025 20:48:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 51262280005; Mon, 10 Mar 2025 20:48:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 35417280001 for ; Mon, 10 Mar 2025 20:48:15 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A2402B9C7F for ; Tue, 11 Mar 2025 00:48:16 +0000 (UTC) X-FDA: 83207433792.03.5CB0220 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id EC0F2C0003 for ; Tue, 11 Mar 2025 00:48:14 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fp2WoTHI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741654095; a=rsa-sha256; cv=none; b=171kAyuwXuItN9yQ+Py/oBqPEbf7j9OxjfLZTA/jaoPV6u7QeVxvj73/HOMj+3SvrFCBSS 5RDWXtlAtYJqqRFvreSVJXAAP0znTBtm2a7c86MP8N5329xFhHBqvA/lbY7fjxBK0k7TCE PSYV+fiHwGx6cIqfzvnGc1hO0hh+N7U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fp2WoTHI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of gshan@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gshan@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741654095; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eE53Ah3+LX+rmJRq+jfZ6lpqQieXXNgXZwY62OeKfdE=; b=eSKl9XW2O3M1WgLM9xF2FEw16yNb/axiwJ4i+PqivNhGOz2bF/MAAMoJ4qUh4qahhaOja8 OLsYuZR2RzfhL+uLsOge2KKn2hJLhgy/A2ea5+Wg3BQ9Jj4Fj6aEDKdivyj4EkgoTJyDXq ohRKZtXzlqZe6NBQXa5q580FNuw4n18= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741654094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eE53Ah3+LX+rmJRq+jfZ6lpqQieXXNgXZwY62OeKfdE=; b=fp2WoTHIp0hbxkjXLll1pQyYQ8Z94OYlKnfbrUmais3yjOjz6LMG5xwmQhol5jxHOM2FRG TTBVwYmZauavUAf2mjtHEWxUYezADFUGTQgkZ2kWfM7Qj3q//pwth9ujgayFEMcBFJE9RH CChXJj1pFK5U24L2P+nBMgnPmixrF94= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-362--IaUVPyZNbqlfswGgtIVzQ-1; Mon, 10 Mar 2025 20:48:08 -0400 X-MC-Unique: -IaUVPyZNbqlfswGgtIVzQ-1 X-Mimecast-MFC-AGG-ID: -IaUVPyZNbqlfswGgtIVzQ_1741654087 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B9ED180AF53; Tue, 11 Mar 2025 00:48:07 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.79]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DA511800373; Tue, 11 Mar 2025 00:48:01 +0000 (UTC) From: Gavin Shan To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, david@redhat.com, osalvador@suse.de, gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org, akpm@linux-foundation.org, shan.gavin@gmail.com Subject: [PATCH v2 3/3] drivers/base/memory: Correct the field name in the header Date: Tue, 11 Mar 2025 10:46:57 +1000 Message-ID: <20250311004657.82985-4-gshan@redhat.com> In-Reply-To: <20250311004657.82985-1-gshan@redhat.com> References: <20250311004657.82985-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Queue-Id: EC0F2C0003 X-Rspamd-Server: rspam11 X-Stat-Signature: ppss6got56juydixwc1iwdhpfdcp1ttq X-Rspam-User: X-HE-Tag: 1741654094-357377 X-HE-Meta: U2FsdGVkX1+gsAy1Y78Jv9uknieD/HBwS5sZxptglzUOTAdmTOPdwnocpyuw0r5m4gvEvNbzV4YxJs/mc9VqHzg5E7BlMYl5En4Ghaxh9itInEZioCRJqWM7+BYLCy23qZO/n6k/2lBfTWMnqetGYKATEtxBysxBhX0C+XNV0JYE9nlK5ATDxK/0S/1gMtCocbnnsvZSuWTB7tVbb1dG7fPhKOIUx7rAxJBN+dD0/o1W3ohFs8i/Jlas90KVsCbrwaYskI2TrsUgDaDs0lhP3eg2AwGS9Ip6/Su6kdf5/4veLp0IwJfdhNEGpPfdftF669ktWkoC4Hn5hHNmgBY9HflqbFcDn3Kf3Ox6S9ysuc2WClGGrXy7RLABBcY7jseDhDlIttCOKI3kuxVL9lreUCNYK0lumC3GgZXFqbitKY/TMpkfjNseMcodi1EUNxTl5U1ohtA2euwYrFtYBInnFQ1xGoDHdv/JHu7/bMx++VEVnzi8t/xcFYVIMNFhMes38YQ6eXVdsRoDMVbDotZd50wWeO6iGgGSUUoBlgS9VI0E/atWR5stwTDtjnGjzGUeoHYUm9CcJ9p+BOMAZT7BTZqrDGALau7KHT+AHK9n1IyiEMWiKQYcHjbw9uVF/1+Qg0G00Pyv4Usfb2A0G3oKpGOL8ZeEznQ8LeaMZ1rzIC5fQnjIJl3JimwSOZQClgsU8h6Nm8OmhGv2oaopkPsVM0e7zb6emdYwpnm4Dd6P051kw5QsDdFfiVS2PW5nsVvJSdk10XvXw1GmXLVppNCVhkImsMmLN6AZcBgmurGfrWE7JinxAisit/JWNoWIrDNkasr8faXL7Np/uweZkw7Y0Up8IlxhOoaaUD+hFdQqjTXDDfRpSwAlPsEeiMyGHgeCVtAeWO//NJloLixFmtmtO9o2iYmskjky//v3pR47QZP1v0FZh7drWoqBWRsb8YU38O8WUyde1xKOwelus6e H9wI1JaF 7cG7YxR/4ct5G3TXWBh4dSj7EsDMhAIFJRH9cUtXmThenOKPMzFJYqT6NZinIQVfxo3t0imfagSwMQA+E2lJAoZHkJ4dLc0nfY3FeOWSIAZLDMuj2jW33FFTystugoH9mIMK4t4Slya4GhNbb709B71BMID6dY2+ot1U5ORCU/Tfx405XXMuzM3RxnsWt+QnSoVz3dcFm9HuEWeiFRH0QMXCMmhCqxlhhYK/h5eFJiZ29Aq5pqQ/YoQFhD+E+zrPT4eBH0grRPeB+0sMiKxHIR4rp0LlZYoM4yBe+KWj/JMV/gmnwfIhAk1oPxHDImr+FxUY7MQflCed6AVW5AAVGxw0PD0JQzTvTsY8nI8lmsSVNVy9obhW0NFJTg6i6hfOgZ2/Le/knp5G+R0cTDb+qiz3o+g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Replace @blocks with @memory_blocks to match with the definition of struct memory_group. Signed-off-by: Gavin Shan Acked-by: David Hildenbrand Acked-by: Oscar Salvador --- include/linux/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/memory.h b/include/linux/memory.h index c0afee5d126e..12daa6ec7d09 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -25,7 +25,7 @@ /** * struct memory_group - a logical group of memory blocks * @nid: The node id for all memory blocks inside the memory group. - * @blocks: List of all memory blocks belonging to this memory group. + * @memory_blocks: List of all memory blocks belonging to this memory group. * @present_kernel_pages: Present (online) memory outside ZONE_MOVABLE of this * memory group. * @present_movable_pages: Present (online) memory in ZONE_MOVABLE of this