From mboxrd@z Thu Jan 1 00:00:00 1970 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 65413C3ABAC for ; Fri, 2 May 2025 08:37:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59FCE6B000A; Fri, 2 May 2025 04:37:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54D826B0098; Fri, 2 May 2025 04:37:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C9096B009A; Fri, 2 May 2025 04:37:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 18EA96B000A for ; Fri, 2 May 2025 04:37:02 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 376D7CB59D for ; Fri, 2 May 2025 08:37:02 +0000 (UTC) X-FDA: 83397312684.10.C304F12 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf30.hostedemail.com (Postfix) with ESMTP id 0BAF780003 for ; Fri, 2 May 2025 08:36:59 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=E407EIsB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dhTksgVL; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=E407EIsB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dhTksgVL; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746175020; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UDf9u3uKTejLxqlFBo+30RhKdS2KOtzyesZwbietrzs=; b=syWkqhormXTM2dp2XzZDROxFv1Ph3HNMzhDyS2pcPX5k0z9/rW8T5zIwSZukF9VXzKr4DW zQl4D6KDJZksljWw3W2uaVoYO0yaBydw5k0IZBSL2N4E9OxOiaNoEMYqSalMXyeQZgWvIi 36asVGIVm8Bj4c4ub/PJZFF/VkU/uG8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=E407EIsB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dhTksgVL; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=E407EIsB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dhTksgVL; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746175020; a=rsa-sha256; cv=none; b=EWfQtMhXjUue0VlUqNqJk8xtj4nmszMuRUhfVN8ZFSpm0fFPGrzh/Y9IOJxCrAFBxlzwx7 KqKMygmDnnnbqicH5cqzKI6NX3XJlvKALhNBIWfuU0W3oH8il560eOHP3oXsZgyVqxHw9T Bt6GZhiXKc+Yo6MSD6k1Q6mRVN6k3BA= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 569E01F385; Fri, 2 May 2025 08:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1746175007; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UDf9u3uKTejLxqlFBo+30RhKdS2KOtzyesZwbietrzs=; b=E407EIsBUWip8Z6Cwmgh3Wl2kaa0j7sxZ1hltythl7SUS6D2WT96YDDh9+c9fr40WfOVyo 3IGv7Q+d7ayql4Zq5GYndUiti11mNpddW0MPMCBf3lMF6orjC2otMELnZ7Msq+IKyMa5SU 6F5Hhwp0/n40OrGI/Es6L7RP18hYzCM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1746175007; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UDf9u3uKTejLxqlFBo+30RhKdS2KOtzyesZwbietrzs=; b=dhTksgVL5QO8F9XwJ2/P1tItL1hidLjb2ESMRXIkrtbHg+lsCLhNb5i9aiWrFbrUI2Hj1/ 5BRmW3lq2kX19PCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1746175007; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UDf9u3uKTejLxqlFBo+30RhKdS2KOtzyesZwbietrzs=; b=E407EIsBUWip8Z6Cwmgh3Wl2kaa0j7sxZ1hltythl7SUS6D2WT96YDDh9+c9fr40WfOVyo 3IGv7Q+d7ayql4Zq5GYndUiti11mNpddW0MPMCBf3lMF6orjC2otMELnZ7Msq+IKyMa5SU 6F5Hhwp0/n40OrGI/Es6L7RP18hYzCM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1746175007; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UDf9u3uKTejLxqlFBo+30RhKdS2KOtzyesZwbietrzs=; b=dhTksgVL5QO8F9XwJ2/P1tItL1hidLjb2ESMRXIkrtbHg+lsCLhNb5i9aiWrFbrUI2Hj1/ 5BRmW3lq2kX19PCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BF50F1399F; Fri, 2 May 2025 08:36:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cJTyKx6EFGhVSwAAD6G6ig (envelope-from ); Fri, 02 May 2025 08:36:46 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Jonathan Cameron , Rakie Kim , Oscar Salvador , Harry Yoo Subject: [PATCH v3 3/3] mm,memory_hotplug: Rename status_change_nid parameter in memory_notify Date: Fri, 2 May 2025 10:36:24 +0200 Message-ID: <20250502083624.49849-4-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250502083624.49849-1-osalvador@suse.de> References: <20250502083624.49849-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0BAF780003 X-Stat-Signature: nwssw61j8ah6ehbj6anww79gm3p8d7dz X-HE-Tag: 1746175019-213637 X-HE-Meta: U2FsdGVkX19emfyRZrfgXqMSc8sQx588eR4BKYyj1htnnRDNmEAgbDhUUXn7rVbbjdi8npxAC43QaOm1RTdSw7RoJmp0WkRH9d3l6NR2G3IMM/0Zl9d0ISZnVAU0xDuf+u3DDyZpoYaqLVLM3fx3sEcw6YnLemN5ezw4y4MJ2B7u6vgvw9u8BqPZW053PX+oc19VpSxBN3i3ihDlNHqIY3ClkT3W7D6Zijo2M9uypPqtk3sbmWIxM32sOaELN0O0QsMDCgSJQLXAy1W9x+YHHzsofLNmBR2mnFH2VquLjt1fosFh8f1EtR4YJ/Yi04NCPp5UBTPqio+2kTB2XTHZJcB6nESUEGAe3wZeHtSpLcqDbMTECEZ1ddZurfhVCwR58XHF+Br951BBKhm6JdAYXDDIEppD35F9ZpDey6tFiPkKGYyzFlOuFcToPUWLXrh4k6RoCyUirbJyiT/2DnqOVsNBeMdWH5kHHi+WbfuywVCi07y3u5SEAqWLpLmlNEFRtkDcY6Qz2OC4zXKdKPUmGRhPOQVhkwRKfSz2xtC1Gnr8OxoLcXuWKrgrNWaDlceNHaKc/vApl3LEvFN5NMymbN38JtIk9nrUz19Id0RnrKmtjLttQmImZp9ZXTxnxIxGPL2INkEoQUIMHj+qnAgSUAOHQ8vx3pKzMGlFFuicg9cugndeGDC/2HJU6t8D99esyUtKbaLPv2MtLRGxsQmAcxU/iXeIc6RL4dIsQJ+udeozxEIALopZB+C6fmC58dNGHf9mWwpKbJYnrKFHrazhO8lxsUMS3BFHXLgJLcZ1Alw2YM1VkVK3UgMxO2Wc+uVWcpaemzoqcwR8pWjs1NWUxvgXC4QLULHEu4BHhCYXNPMsPogtYlhttqao3ZV/Rgq/MpJf4AW1O0oAIvJ5pEcmULFp+b569wNpBbGNwTBU0L4RRtVi7VQLVVAyfYf5O+As90MxlsfwizG904HXiwm +PXRaP9Z BcaHM2Y+8k0RSEHAPbPQmAuo1S/x4vwBh7ASG4+ZxZgW1GnNDtatAVRqMqBGGK7r/QREtasSGLkr6HQBCgb13zZecCRwosR0AeWMWsgff7d+iPTXxu2LVQIjfqtVrwEtaHUJj1AsNIBPHb4fGcFVEw+yv+1v8aZPopCmMBoBx9VkJ1WQuwBedZBxZpWO1gyfIM0iK+ZgIA3spHvWEhDh+3Nqn2l3DlxgewPk/xbqeT9+wXjaxpT4nwbhsIqStXoYAUs/mQVjFV3+DlrdSXvXopbvyCoAt2MVpDn+qLCLTgmTt1mxy1Xnt9YDGQHK2kUpBEJ2goFF1R13M3aSIgbmfH5xC82kDDZncUfIK9dp4VKkuVakifIyntHNOM6BHchuCRf3rV904CMnZOJESUYrz3SYZu75fAePBLyKb+AFIe/RG4bk= 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: The 'status_change_nid' field was used to track changes in the memory state of a numa node, but that funcionality has been decoupled from memory_notify and moved to node_notify. Current consumers of memory_notify are only interested in which node the memory we are adding belongs to, so rename current 'status_change_nid' to 'nid'. Signed-off-by: Oscar Salvador Reviewed-by: Harry Yoo Reviewed-by: Vlastimil Babka --- include/linux/memory.h | 2 +- mm/memory_hotplug.c | 4 ++-- mm/page_ext.c | 12 +----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/linux/memory.h b/include/linux/memory.h index 8c5c88eaffb3..3c482f189d14 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -117,7 +117,7 @@ struct memory_notify { unsigned long altmap_nr_pages; unsigned long start_pfn; unsigned long nr_pages; - int status_change_nid; + int nid; }; struct node_notify { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 777f98326908..9b57b58e88bc 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1192,6 +1192,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, mem_arg.start_pfn = pfn; mem_arg.nr_pages = nr_pages; + mem_arg.nid = nid; node_states_check_changes_online(nr_pages, zone, &node_arg); if (node_arg.status_change_nid >= 0) { @@ -1204,7 +1205,6 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, } cancel_mem_notifier_on_err = true; - mem_arg.status_change_nid = node_arg.status_change_nid; ret = memory_notify(MEM_GOING_ONLINE, &mem_arg); ret = notifier_to_errno(ret); if (ret) @@ -2014,6 +2014,7 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, mem_arg.start_pfn = start_pfn; mem_arg.nr_pages = nr_pages; + mem_arg.nid = node; node_states_check_changes_offline(nr_pages, zone, &node_arg); if (node_arg.status_change_nid >= 0) { @@ -2025,7 +2026,6 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, } cancel_mem_notifier_on_err = true; - mem_arg.status_change_nid = node_arg.status_change_nid; ret = memory_notify(MEM_GOING_OFFLINE, &mem_arg); ret = notifier_to_errno(ret); if (ret) { diff --git a/mm/page_ext.c b/mm/page_ext.c index c351fdfe9e9a..477e6f24b7ab 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -378,16 +378,6 @@ static int __meminit online_page_ext(unsigned long start_pfn, start = SECTION_ALIGN_DOWN(start_pfn); end = SECTION_ALIGN_UP(start_pfn + nr_pages); - if (nid == NUMA_NO_NODE) { - /* - * In this case, "nid" already exists and contains valid memory. - * "start_pfn" passed to us is a pfn which is an arg for - * online__pages(), and start_pfn should exist. - */ - nid = pfn_to_nid(start_pfn); - VM_BUG_ON(!node_online(nid)); - } - for (pfn = start; !fail && pfn < end; pfn += PAGES_PER_SECTION) fail = init_section_page_ext(pfn, nid); if (!fail) @@ -436,7 +426,7 @@ static int __meminit page_ext_callback(struct notifier_block *self, switch (action) { case MEM_GOING_ONLINE: ret = online_page_ext(mn->start_pfn, - mn->nr_pages, mn->status_change_nid); + mn->nr_pages, mn->nid); break; case MEM_OFFLINE: offline_page_ext(mn->start_pfn, -- 2.49.0