From patchwork Fri Feb 14 06:35:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 13974535 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 15D01C02198 for ; Fri, 14 Feb 2025 06:35:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84BEE280008; Fri, 14 Feb 2025 01:35:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FA9B280006; Fri, 14 Feb 2025 01:35:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69C87280008; Fri, 14 Feb 2025 01:35:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 49EAE280006 for ; Fri, 14 Feb 2025 01:35:31 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C7D88141E36 for ; Fri, 14 Feb 2025 06:35:30 +0000 (UTC) X-FDA: 83117588820.13.BEBFB63 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 112EF1C000E for ; Fri, 14 Feb 2025 06:35:28 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ilWuwpnX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1739514929; a=rsa-sha256; cv=none; b=MEV7hBpr1yyMLo21K02ANUxP2DhGRchsvCi3xM+0nz/LqCTVbqcSqGjQQtLvibpcrbecq3 0iv2MkODq2FS32bJCs6EHn5Fd+6+XzbvT580PnIJpnEQqw5suPEEZtZXW6TqtCorrXTXnL aSlRBGuJew/w+LpTmIQSUhO91IE/Bg4= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ilWuwpnX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1739514929; 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=Sx6d6nmiay0PRStDDUNJ0RDey6GCh5MgqAtQDRntlcU=; b=AuF/JJ39htVoIHOLx3V9Krj0BS00hO1Ws/YbjxotF86RSXv+QPyOBM9Fhvblu+tw641aLX V8bObB7GYNDgtZmFV6enO8hQ3tXpury0/PVnAJFZ+gR88V4wJuZ/4RFOaXr2onI3I084md N2as4Kv+2rDIlIF91og6PfbNweu0AQY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739514928; 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=Sx6d6nmiay0PRStDDUNJ0RDey6GCh5MgqAtQDRntlcU=; b=ilWuwpnXKjm+w3t0aIixTNfPhptX20ecS/X1Q5CeV4VYzNsSYH6QTklQr/2gtwtGA61Ysm WFx1Zn1iBYHrpz+UKY9BNw40iE6lLPLM7eLfELDdAsfANuTUYNKJAQLVAB52TrSkf/OFF7 9oYXeFIjD+PQcpIg6ux5pth6tKKDAoQ= 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-478-0p6vjkdQPnixM5mFpL7pcQ-1; Fri, 14 Feb 2025 01:35:24 -0500 X-MC-Unique: 0p6vjkdQPnixM5mFpL7pcQ-1 X-Mimecast-MFC-AGG-ID: 0p6vjkdQPnixM5mFpL7pcQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 1DC551800877; Fri, 14 Feb 2025 06:35:23 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.82]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27981300018D; Fri, 14 Feb 2025 06:35:18 +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 Subject: [PATCH 1/2] drivers/base/memory: Simplify add_boot_memory_block() Date: Fri, 14 Feb 2025 16:35:03 +1000 Message-ID: <20250214063504.617906-2-gshan@redhat.com> In-Reply-To: <20250214063504.617906-1-gshan@redhat.com> References: <20250214063504.617906-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Queue-Id: 112EF1C000E X-Rspamd-Server: rspam12 X-Stat-Signature: 3z7pfrzhpha784gk1fhtgaskw7qfquan X-HE-Tag: 1739514928-695204 X-HE-Meta: U2FsdGVkX1/VOfCIldx4dbl3oAkVT/Jz/KbpI4j7uItV5hciyiy41Qqi6tMJ/BporJ782Yn22Z6N+kyZOTVJEmYyfxIWHe8N5IipE+ozEp9UR48bbzRCdcShk3XKEJtM2Guz3wKkXkO/xhkdJDnMpIzG4LdzuM9y8+suEWiNPS79QV27PB/YZEXSyzZ/NEUqbQ6b9msxjPPNlj7ILw4GfRROgu2NARcijV5QZHfUKjfuKiegT/TeAaMeqhujaCRQhymePztLwjgHuheQ28ZOai2S0/ynyDUEA8BJdCMPl7LxC379cSOrrWtklSAYxrBVN7x7INWY6y3d+8f/mMlISH9kk8A/FheY3N+kBvoOR43Yrqic89K2kP3Gb7GGgRxMyEeiZHewDiplKjh/7N+hessbu8wh0A6sbo352f0hByIfDTrxAQypzSLISG6oSAgnVdmXeQgEpF//NkOQqD+m1MGy+U/1GwyhOA3IHiMVEz+sm5Jj+pXJVjoycacWHz6WPfol5BHl5uFzbFDHus6hopioG60qYtJ60K8WAzpEjayYrvtSQQUlMw3TaKXsaDPm4TirKSO+Ll/yAMYQmpOxMkJPKO9VqlHKE4aVxUbdWgZnOZ1B2bBmDXlo0FUZnN7f5KLyupS92x6/O2YXrJuJ/Awn1ynHzEMQlLKPkAabTjzJZl1uOu2PFQdy5XZjUzl+BOE6xo1YxO1wKqMJm2pLizc8/CQKwjHTLc4E6j2kAdikZ7EocSvOT5hwSSTzkg17eb88fpo50grlYZHmG2X7loeQDfdvLj4KSnuIkhShRYpKCWy0+tH4dPFHQw074t/mSgwDNqzOgGQoEe7ifLVa3UCopxxd8T8TatxgK82LyTwvf6XjqOjRWZfMoK6HPtwOOvGIz7AhPvSFy/prXH0HIT1xWzeOjoCGgnV11EvrQNK3kUWErUaPRbwe9ZlKIbd6slWSnzHjqulDzw8sfbi AoOQQs0D o0kaa4+k1VshaRUMEOrRp/NOrQnslauztcKEBdJ7TWTTsOKwQ0kHNCdNMlBuMj80rG6eO2sJPE2K8Vmy8BN+U0Q1sVvQgyLRBjCxwHUmqsMAhH13QGgK+/eWGNq79AYFPlrS2r/Yj2oSCrtFhs4/3qi9Eb0PnI9jscgWc3OxnidPz/DfhkGG7YDH7mQ84UYrdMpzeIu82QKEPz/a6xjW754KSetR8mboT/4VWoAHEeFcHmyxZO6rcbkQGng3tpx1DLgfpGDluVtMckvRJGVdZw31Xwpbyt0CBdv5FY74aapuQuVjPifpwgGbLL99ULmmyKnZYo+A9SZspsbdcMA2t6nSpQABnilQOjpXEbiUVu1uATxk+HjYVz8D6dokCV/5YIPv9 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 keep the variable @section_count in the function because the device for the specific memory block will be added if any of its memory section is present. The variable @section_count records the number of present memory sections in the specific memory block, which isn't needed. Simplify the function by dropping the variable @section_count. No functional change intended. Signed-off-by: Gavin Shan --- drivers/base/memory.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 348c5dbbfa68..208b9b544012 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++; + nr++) { + if (present_section_nr(nr)) { + return add_memory_block(memory_block_id(base_section_nr), + MEM_ONLINE, NULL, NULL); + } + } - if (section_count == 0) - return 0; - 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 Fri Feb 14 06:35:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 13974536 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 2F3DFC021A4 for ; Fri, 14 Feb 2025 06:35:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B7EF2280009; Fri, 14 Feb 2025 01:35:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2EDE280006; Fri, 14 Feb 2025 01:35:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F71A280009; Fri, 14 Feb 2025 01:35:35 -0500 (EST) 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 811AB280006 for ; Fri, 14 Feb 2025 01:35:35 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EB4114C419 for ; Fri, 14 Feb 2025 06:35:34 +0000 (UTC) X-FDA: 83117588988.12.C26D613 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 33A711C0002 for ; Fri, 14 Feb 2025 06:35:33 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FMOLM4MX; spf=pass (imf18.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=1739514933; 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=De1ohsiMKU4xXRlb1xhOFvEfcarCcaBHb7jaQDpDfMc=; b=r61tzasCDGMzpRZLZmBs5hcvSMBi3ibPrJw0bHbuuJMIKuv4sCmOXAGKo1KnHbP8WGK6JG GrsHRCbMGtV+C8lZtXiTV7NqqvY99eBBHVawr+d5BFnmAfJxHLxMsAAI7yFP3Y1wmvtV/8 BBa1VfXJkiS7pY/lrPL45lfpwmZYRWE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FMOLM4MX; spf=pass (imf18.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=1739514933; a=rsa-sha256; cv=none; b=nf8/2doeCmFHgz7iEF6oMkwQCGiVsXVBHabGku431SxTesXR5GMkxuv014UMXAY7h5IT47 g1Q+j5RR3LqgGrymNXR96F6G2D1dIQ+5T8Uak/KtdIYT7O3+YnmTmgW1TPc2QSFPl1oU6l tDh0QFoeedEKt4cyQyzNH9pWF+50myQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739514932; 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=De1ohsiMKU4xXRlb1xhOFvEfcarCcaBHb7jaQDpDfMc=; b=FMOLM4MXDJg35MRMlhTRbEFGcQAEVzMluBSKxfFJ75DbpGk16FcNwixPpwgkXta2L6eMW7 XRIm7RcZckcggqx2LBFhGE5zAQNsxBO/XM0HB33pfmfQ1M3+4UxIJpE8kjWBJBM3fNdPqD a+Q6ZjoOn7WngCNBrCA32Qx/gwtnkII= 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-341-Yx1g52v7N--YMXUw_Ho_Dw-1; Fri, 14 Feb 2025 01:35:29 -0500 X-MC-Unique: Yx1g52v7N--YMXUw_Ho_Dw-1 X-Mimecast-MFC-AGG-ID: Yx1g52v7N--YMXUw_Ho_Dw_1739514928 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 BB0A31800879; Fri, 14 Feb 2025 06:35:27 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.remote.csb (unknown [10.64.136.82]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF319300018D; Fri, 14 Feb 2025 06:35:23 +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 Subject: [PATCH 2/2] drivers/base/memory: Correct the field name in the header Date: Fri, 14 Feb 2025 16:35:04 +1000 Message-ID: <20250214063504.617906-3-gshan@redhat.com> In-Reply-To: <20250214063504.617906-1-gshan@redhat.com> References: <20250214063504.617906-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Stat-Signature: 5wtn3ba7j63ow7rroj14h3dupox3nb1a X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 33A711C0002 X-HE-Tag: 1739514933-750578 X-HE-Meta: U2FsdGVkX1/iBSVAlBmIBRkePfTENsIZ+XVXDLR8n3vBMq2uhZjcST0txWvf+UwT0e4tCubHZBLVShzjC8alYd15R2QI24HHZL1KMTHK2ssF0vEUq4ovragPK8QKJ0TBnL/Q69zbLL2wJv83B57Dd0dE/KVHO/capvJjor0l0CNCe2arhQgIgxSKYpqyh6gkpZerMyl5hRquJWmunJZI6yLmwLQQnvH2/ePaYenzTgv5QmjUF+zp+FFWftsoCCwS4AKVrUWDDLSMu2IwpF1W1TJqG/AFcR+WV5JW17g4j5zv+xJO+2KMnPgdT3dLwIvptdrf/8NxUXqzy14llKbfhx0UF5bXMZCavv+mj+9Dj3D8uRsRT32AUOG4K2bVDX3iTZDdLsg5XZJPt8fIRiuvUmXfBGgVFNwAQ9x0HAjv/8f5zfWLvWU9qTV6JJWquv8IMCUZqEfVK4hh63ZCOFyxk6BebjxZ2yqItB3+kE+1Znt97smbITRz3niItCS+/Wkn0st5r3UrE/8UVN4MLyASJiwaFc+42uPNVkhBtDVUtcKWQ+tP/dPKn3YM6RXS8IGGYRap1XcO2E/j/yYw62YLVDHfFpTgvMuQzHz6IrTRCzMwebVWSJ6Tf1fWhesMAZLw5P0K2xMaLY/wPUTvFMiaBYIPhoKo8JNgiJ8NjTx0ZqK72AMD5IUM3DxCoYvODz4VlOdhi32ZyZ4cL0/AyjHHo8YJfsW38+FnfWWRcIJolR2wfSyR3prnRkd0Zppaz6EQ62c0i3Fem0MESQ2lGUet/YoTS/ihKQGBHhhNHZLWm9LaW0gcrV2Ka692Af+8PwQghQvI9PlWi5ubDHgSjt9q/dgg/xGZ9jMbebVbGEhZnBNF/a2moUTnrcP5U6VDHswdKqtTtXEd4Fbe9gZtnRukka0xonJux3QEXaAsCJcScRITqeJwPfgroPAKQR3w4y9wvzVbajdPjigWt/QVSzl MmmMCOxX iit6BLEgsxlHZkF+RoOIoHd+ZWkYegrRpCBn7ojHJmj8ismozv7CP8enhZ/0ED4rBmBl9wgGHA9wVYT/4bPbGjL7RDoJRbdaVBqGGJNiEpRRDmY5LxFFqoblpWCCpGbQwFJlDqMR3p54Gmm5hErYg7XSeC5vNA0Ao+dvTsghswoIni1XvxNIpziAfzaKvjJyuE8ygZrassXcNa6a2vsqPhL85Jwt4wUOBqN9OftXtvX5Uf7A8p+Z7yobA+halktGakxe11Y1kqgZ11unKiv3JtI2gUeL98CS8/nWr/a8kA4Ro4wrUsRG26drhFrdb3r0NulcU/iiBcE0Sk5w= 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 --- 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