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,