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 B71C4C61DB2 for ; Mon, 9 Jun 2025 09:22:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5391D6B007B; Mon, 9 Jun 2025 05:22:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EB0E6B0088; Mon, 9 Jun 2025 05:22:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D86A6B00A8; Mon, 9 Jun 2025 05:22:48 -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 1C5BB6B007B for ; Mon, 9 Jun 2025 05:22:48 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CD0A8C17ED for ; Mon, 9 Jun 2025 09:22:47 +0000 (UTC) X-FDA: 83535322374.16.1ECF451 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf20.hostedemail.com (Postfix) with ESMTP id B38761C0002 for ; Mon, 9 Jun 2025 09:22:45 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=N5REsE0V; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bt0mh6xx; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=N5REsE0V; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bt0mh6xx; spf=pass (imf20.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 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=1749460966; 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=sv3IrfTkUH21zkbZkzycuFTk5KiQqrt00dQluV1en5c=; b=HGbx+somJrgg/oqSgCVqNiaI2RJbSArc8cy4oF607GUVQAkNYS18lIFNkzwZAXatdX33BI EMP9MNlyLpSk59wsB3Jh1VHyzbmSXCKiVcZoU+IQlcw0nN32FgpADUK+SaWY5NWEXnHWmy DM6w1CLTKVRAhdSCUWFRsl1uArZ5IVA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=N5REsE0V; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bt0mh6xx; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=N5REsE0V; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bt0mh6xx; spf=pass (imf20.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 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=1749460966; a=rsa-sha256; cv=none; b=sE4D4fZRqzT0+0NfcUwKd2jv/qWnSVLXiq8icevlGtSSmFRlDZYVitup1IyZM3JZsjtHVf FhspYE7z8711rOl1HwyigX4QYEL2GRy48yz45zLIjfFb157txmVhb1Y93J1nPDKpZoE5os CJw3Jg4BFOJ5OEJj9nmS/X/efNyZgfE= Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id 9A0CF211AA; Mon, 9 Jun 2025 09:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749460927; 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=sv3IrfTkUH21zkbZkzycuFTk5KiQqrt00dQluV1en5c=; b=N5REsE0VlDmSF69f4yuagNbSUjfoxGziPRWs66Hdn5LE2xzyk+jdecvzh1cRLi9I/5i3pU 3S5mv9Yg2vyEYCi/Xcmr/0U+dYURmSPIFnzwbOzyjGcJ1lVy/D+HSCA+M22mtvEEup27TV ytIYvWl+IUixVm7JCxdxM3XvPbLo5is= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749460927; 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=sv3IrfTkUH21zkbZkzycuFTk5KiQqrt00dQluV1en5c=; b=bt0mh6xxGVgV14xowow5pGvbWt2oouPfTXG9QIDckmdEbrTa7T0rPF5wJOb4IJEZutjJi0 Ltuwc3rWIdM2PyDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749460927; 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=sv3IrfTkUH21zkbZkzycuFTk5KiQqrt00dQluV1en5c=; b=N5REsE0VlDmSF69f4yuagNbSUjfoxGziPRWs66Hdn5LE2xzyk+jdecvzh1cRLi9I/5i3pU 3S5mv9Yg2vyEYCi/Xcmr/0U+dYURmSPIFnzwbOzyjGcJ1lVy/D+HSCA+M22mtvEEup27TV ytIYvWl+IUixVm7JCxdxM3XvPbLo5is= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749460927; 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=sv3IrfTkUH21zkbZkzycuFTk5KiQqrt00dQluV1en5c=; b=bt0mh6xxGVgV14xowow5pGvbWt2oouPfTXG9QIDckmdEbrTa7T0rPF5wJOb4IJEZutjJi0 Ltuwc3rWIdM2PyDg== 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 F3F6F137FE; Mon, 9 Jun 2025 09:22:06 +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 6DHGOL6nRmjJGAAAD6G6ig (envelope-from ); Mon, 09 Jun 2025 09:22:06 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Vlastimil Babka , Jonathan Cameron , Harry Yoo , Rakie Kim , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Joshua Hahn , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH v6 10/10] mm,memory_hotplug: Drop status_change_nid parameter from memory_notify Date: Mon, 9 Jun 2025 11:21:47 +0200 Message-ID: <20250609092149.312114-11-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250609092149.312114-1-osalvador@suse.de> References: <20250609092149.312114-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: B38761C0002 X-Rspamd-Server: rspam09 X-Stat-Signature: dfo5xfqs1y4qu3gtzxz3jdnqi3nd3hzb X-HE-Tag: 1749460965-28692 X-HE-Meta: U2FsdGVkX1+2+WZR9lPy2QJHFzIFKANzPUXAj5NIdni4ctBT7AxWV87l2KJxdwNmSSsMGOE1ondEhoDVKJzHz613XHaix0lcCwCUOQ91mk7GCiCb5AdRTVtNm3G0nHaPGL5yMyLnyjecJToBjGptt9OLWHBgO0HUU3GChRz9y13hFAVU/C1vNYggUwpC9+oQ/XJ4igPw2blOcXb4DDKdo86uY4b1h0TBGo9oCQz+wkX7DkCsAlw0aqpA5Vk4P8xyUaGACHfiSEwmPBV+YxoWPGnBT/AI/GHEWsezCI1UR8J3ikFjiYqfXD52HhxFC4rkxqTQaGIjmLiLvmnqrumQgZ5ynTNdF+sSA03n+dLinjUPf9Mn+0Q4M/j7T/1mMr47HSR2ke1xzeY1A0kiiC6kNnn7OfmklFAlR9fUsoDSaUYaRLwMjlHQ3t1bJDQsKkIxKI7bkW9f33gyBeAMcyof8yfm7wWUaA+K0kOclMi/LTawK1JlJQL2iHmMT3q9ebgjqJcVaGJTBBEADfFegKjsgtO24vklKyGQZP4gMA7b/35gpmRZGma/QHTGTQr9V9dNY3yxz4CyeAvWR+N9yY5aw5SGa3az8f6GFIMi264e3DT4nvPsDYHXhunbG9rHTTrKZJo8I6IhZ42OQDT/QUFn44mhh14h3uOQFQqeeF1MLC4ffhtDpQ0FLlNe5wEy1/BrV88t0MhGUaF0zAN+w7uncic150DlKM6SeL7x/Hu3tJOVnrcxJhIdXFgwo+tYuOCrkoelwJj8USx/eS8Zj8IHuKwnhwJMJ5xrm5VDhCvVxd0V1XF0ErxowCLNtn8Shvi1RgKaR4JJCKbMaLxn1mG0AYM1rpJnlyl2TfG2lZkHn0TZ0ZA19Jigq6LX+UCXL/Fk9uFubqtbzPgLGA3XgnuJYHs3I1fF5KraCwJ/hKUWXlmaC7f2G2GR1NdMRYLzWy9DAX1LrBGMt7JRXPRu2Xe n6M/D+ak 1DD04CWx2ucd4DxtYoEsTl9S6kE5eeB/wMvVN67Hs6IgIBNrLO0F5X6PBAvCGoPFrWnIDf1GSSrhvleu7bASPRcdFXViLr6NHgMQeLP4NZ7orwlOQRkdYV0zPhtPgwoJWoVdrjVqPJ8k1KNbk5mhx46h1FtEm8ennpAWE+/oKWWFtoqJlAq1SpQgYkHxilO/QTCxmAi2RbFyFybd7VJsfKhYJ4kJsQ5KmBTuRkMeZyf42q8QJF3WZAn3DEcNQ8Wpa01TBkbYVp7aY5l7teG+VVTsXin7lq3kuz0LjENQMAIfqF/x0sswE1ASpypMTnm3cMHdkB5zDeizifHF5Io1rxwqnUm2Oyp2xf9lMzSExstUiBoI0jxLp0uC050ou3D3wEiSlTHUuFcUTkfmB2w4FpwWtGupD/o1YK0u08WpqMPRGB7DCOb0Vsn+3ULg3IXD5OHda 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, but we can derive the nid from the pfn because we call move_pfn_range_to_zone(), which sets the node in the page via __init_single_page(), before calling in any memory notifier. Drop the 'status_change_nid' parameter from 'memory_notify' struct and update documentation accordingly. Suggested-by: David Hildenbrand Reviewed-by: Harry Yoo Reviewed-by: Vlastimil Babka Signed-off-by: Oscar Salvador --- Documentation/core-api/memory-hotplug.rst | 7 ------- include/linux/memory.h | 1 - mm/memory_hotplug.c | 2 -- mm/page_ext.c | 16 +++------------- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Documentation/core-api/memory-hotplug.rst b/Documentation/core-api/memory-hotplug.rst index b19c3be7437d..74897713c4f8 100644 --- a/Documentation/core-api/memory-hotplug.rst +++ b/Documentation/core-api/memory-hotplug.rst @@ -59,17 +59,10 @@ The third argument (arg) passes a pointer of struct memory_notify:: struct memory_notify { unsigned long start_pfn; unsigned long nr_pages; - int status_change_nid; } - start_pfn is start_pfn of online/offline memory. - nr_pages is # of pages of online/offline memory. -- status_change_nid is set node id when N_MEMORY of nodemask is (will be) - set/clear. It means a new(memoryless) node gets new memory by online and a - node loses all memory. If this is -1, then nodemask status is not changed. - - If status_changed_nid* >= 0, callback should create/discard structures for the - node if necessary. The callback routine shall return one of the values NOTIFY_DONE, NOTIFY_OK, NOTIFY_BAD, NOTIFY_STOP diff --git a/include/linux/memory.h b/include/linux/memory.h index a9ccd6579422..de8b898ada3f 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -109,7 +109,6 @@ struct memory_notify { unsigned long altmap_nr_pages; unsigned long start_pfn; unsigned long nr_pages; - int status_change_nid; }; struct notifier_block; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0550f3061fc4..07d7bdb65761 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1186,7 +1186,6 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, mem_arg.start_pfn = pfn; mem_arg.nr_pages = nr_pages; - mem_arg.status_change_nid = node_arg.nid; cancel_mem_notifier_on_err = true; ret = memory_notify(MEM_GOING_ONLINE, &mem_arg); ret = notifier_to_errno(ret); @@ -1987,7 +1986,6 @@ 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.status_change_nid = node_arg.nid; cancel_mem_notifier_on_err = true; ret = memory_notify(MEM_GOING_OFFLINE, &mem_arg); ret = notifier_to_errno(ret); diff --git a/mm/page_ext.c b/mm/page_ext.c index c351fdfe9e9a..f08353802fa6 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -369,25 +369,15 @@ static void __invalidate_page_ext(unsigned long pfn) } static int __meminit online_page_ext(unsigned long start_pfn, - unsigned long nr_pages, - int nid) + unsigned long nr_pages) { unsigned long start, end, pfn; int fail = 0; + int nid = pfn_to_nid(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); break; case MEM_OFFLINE: offline_page_ext(mn->start_pfn, -- 2.49.0