From patchwork Tue Apr 8 08:41:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 14042404 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 351B1C369A1 for ; Tue, 8 Apr 2025 08:42:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3B316B0010; Tue, 8 Apr 2025 04:42:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EB896B0011; Tue, 8 Apr 2025 04:42:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 864CC6B0012; Tue, 8 Apr 2025 04:42:28 -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 64C206B0010 for ; Tue, 8 Apr 2025 04:42:28 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2E262140841 for ; Tue, 8 Apr 2025 08:42:29 +0000 (UTC) X-FDA: 83310235218.07.C3733C8 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf16.hostedemail.com (Postfix) with ESMTP id F3BD4180002 for ; Tue, 8 Apr 2025 08:42:26 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=G6x6iznC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=x8d0FELz; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=G6x6iznC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=x8d0FELz; spf=pass (imf16.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=1744101747; 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=EbHqyD5MPLNmbHBByHN31fJenBrFZtOPsSi4jdC01rk=; b=xT0q6iynichHiYKi7XWewYeZ0Kkqzn+wmU6sVJKBevnDkInTiQwOIH8YlRTJm56NWVYODG KvbV6t65IsYxrlwZphQAXxv+XXpY0r9hURR6P9DdB4JHA/3rsPNO5B0Jm3/ESCx5MK4qd6 T44M31ZKvaPxabhB727tjtmlPkX+Ob4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744101747; a=rsa-sha256; cv=none; b=xyusm2GB30BjnJPL+DasvrkiUcYCdIR8P86liiQ96i455mhdt0LEzRyVT2uBV87Scjwica qziHumxf8TOZHTm0Aum5aF8OJ1KR9s4fBoQ+k7l4b6UQmjGDh6R4d6FxJdv7KmImnohZRB C1kfTm+A0Ga7qI9fWjJqwqGdDVZJSqY= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=G6x6iznC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=x8d0FELz; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=G6x6iznC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=x8d0FELz; spf=pass (imf16.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 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 94EF01F388; Tue, 8 Apr 2025 08:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744101738; 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=EbHqyD5MPLNmbHBByHN31fJenBrFZtOPsSi4jdC01rk=; b=G6x6iznCrdzY0itk2HMicKZH0IC8c06xkBWSokxCN6boaS04LYm+Rw4o8JGBWeRoM9wkYq i8D2RmlNBK3DLacMQwFmpQZvrrg157UV8Oe0q1LA/IDLKU6TZm00onqcqs9UnBCbgVCxz2 8nDLXcCD8E1MzdRVdslqdjDVV5JxR54= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744101738; 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=EbHqyD5MPLNmbHBByHN31fJenBrFZtOPsSi4jdC01rk=; b=x8d0FELzVTCthqRW8sKH9jRxMbo2+4oBUED76yIjwVqCt4WZlh4pnfViRcmW84h7DxCmfA EUU+QMnPB+sS+rCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744101738; 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=EbHqyD5MPLNmbHBByHN31fJenBrFZtOPsSi4jdC01rk=; b=G6x6iznCrdzY0itk2HMicKZH0IC8c06xkBWSokxCN6boaS04LYm+Rw4o8JGBWeRoM9wkYq i8D2RmlNBK3DLacMQwFmpQZvrrg157UV8Oe0q1LA/IDLKU6TZm00onqcqs9UnBCbgVCxz2 8nDLXcCD8E1MzdRVdslqdjDVV5JxR54= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744101738; 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=EbHqyD5MPLNmbHBByHN31fJenBrFZtOPsSi4jdC01rk=; b=x8d0FELzVTCthqRW8sKH9jRxMbo2+4oBUED76yIjwVqCt4WZlh4pnfViRcmW84h7DxCmfA EUU+QMnPB+sS+rCg== 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 146F313A80; Tue, 8 Apr 2025 08:42:18 +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 +LYwAmrh9Gd6VgAAD6G6ig (envelope-from ); Tue, 08 Apr 2025 08:42:18 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Harry Yoo , Jonathan Cameron , linux-cxl@vger.kernel.org, Oscar Salvador Subject: [PATCH v2 3/3] mm,memory_hotplug: Rename status_change_nid parameter in memory_notify Date: Tue, 8 Apr 2025 10:41:53 +0200 Message-ID: <20250408084153.255762-4-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408084153.255762-1-osalvador@suse.de> References: <20250408084153.255762-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: F3BD4180002 X-Stat-Signature: xqgmnnpkz1oxk9b85fsej81u3wob3p8c X-HE-Tag: 1744101746-963891 X-HE-Meta: U2FsdGVkX1+5Hqhy6oQIQXwFN5+gVHAGaOmxGuxpifJTMXmm7lTGzth2cS9J5Tlw6JX5nQzcRacdX8aYo5MfQoUKlO6QrMYcyWN4KS01q9+0FXe7bRAGwFTjXKbkd1CLC+cmYtD5Q6o1OpSBEaeCxv5PaH1i0inttHZ9e2Uk/qAtD0/vi/rjDzpmDQzgCOPGWZZw/6LCjjGrxtpagNARSSfn2PzApFJ8/qlWOAA0JdifXYTsWOPiuBgKexaz+O+6zrYmXhPwXXQif7xAI1YJa38/S1JZ6OlzFmwSaK2FO4ftnYl0BvtHbQrzBN1caa7/G6kQZbfYECDUZ6iI1DiPc5pBTyv/13w3wQWzKDH3y9IYZw2PjQ+JMkdE5rKuhWWFHKQu7o77nLZxb6m2uDXcH6Pxaboa1stpVzLq8fWI9EigYJZ44GctFkA3iko2wAIWJ++x1egz8U97aiqMMYK7Xm2spaXalcvTYUsmLv4aBpkW6kQXPjzbldz22UuClslTdbi0brWq9v/s/ECkhEGJlSs3e2dLa+V2QJ6TI+eZoN+loAxVWWeXF+3E5HTR2Zpijb4alutL2pf1BlQ0u7osKe/b2ZwAaKcAsC6PT1NZ6rVJPlABBcHMOwQ3GARgPds16+YT/uX0d4BjdEI9HFjR74VK8YI9V4732uDJ0XJTwS140u4MkymCi5FgkSzl3hhRZcpueRy4iomYz+fps9F8UNuekdNrvWYfK+yhPS7wEuHUH0lwoF5Q6Z3yXZNMHje20KNuTgzBd8gSHgESMoeZndTeCMoeg/GReEa+R6kk7oTEQ1vPhTbUjwbG5rNOB5mIEhhjEkUW/Cw1vhaJWyDOlL7RlEgASrfpI7QaeMmpKxuJSAf2yUX4fWlEMBbCGS+v5peCpFfDZ2a7j7ac+WjXXdoI8eGiPwH/cvaKjLXhtvGYQH5aJ5poq9ZA27OLld9EVWd7vFlijFSB/wljTxY 1JPiJuHr ihTAnZkvnJjjhxv5er8JX4ghsjlQAo8OBMK4S2+6UaHykEpVTQdCSMdYVs1H79PieMEX3zHnqLkLkSDx0Fg6r8uhnJDvbmMGtTSiH8tvOb/A2PpXxP2ZrEOqz7VOHzKwFYV7dpngcyrrrEGrb0PPjrHHE1kIksl6oMz+h4yYtuXHUpRaSMqkKw4+tA037MOzsOieJoIdoNI2RYWpT6t7SvIynsPGCdKBUT+x4cgU00kNk90l2eWSLCm4WmKDVw1BP1LTL+8BbLx0E/Y3vmB7gEFB3jbPwfxTDB7IB70kQg2pf11zzLCoE/EdIX7W1JS1C0WJYqb+lhaP9r/o02JNEwtKeuGDJb80F/y+K 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 a5b8068cf182..241a98e31277 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 84248f2e36f8..19f2f8a08645 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) @@ -2018,6 +2018,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) { @@ -2029,7 +2030,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,