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 E4FFEC5B543 for ; Thu, 5 Jun 2025 14:23:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D50028D0059; Thu, 5 Jun 2025 10:23:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D02368D0007; Thu, 5 Jun 2025 10:23:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C16168D0059; Thu, 5 Jun 2025 10:23:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9F2278D0007 for ; Thu, 5 Jun 2025 10:23:49 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1F33B5BC1B for ; Thu, 5 Jun 2025 14:23:49 +0000 (UTC) X-FDA: 83521565778.16.897AA7C Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf04.hostedemail.com (Postfix) with ESMTP id E50FC40011 for ; Thu, 5 Jun 2025 14:23:46 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=wMJQdNQe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=M2tk8Jzw; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=wMJQdNQe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=M2tk8Jzw; spf=pass (imf04.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=1749133427; 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=SmSyjhZyv9opvDAxMx9rc8iOlerhOsuhbkuJ00p6FnE=; b=xNiSprND6GUpY1cZ8F0iBxRsL5xwRe85mWK1xXqUzFEJtdgAeYBYuInL6g+Jwn8XWAFK5p 67v6/1lq2sHVSpz7S/OOkBxYjnmmPBTmnYrwXUv4iExpfsYDGcPzwGQTdPtLrgrc2163+z T+rcvml7P2OCFXL94MJ2PySVnnVMBqU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=wMJQdNQe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=M2tk8Jzw; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=wMJQdNQe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=M2tk8Jzw; spf=pass (imf04.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=1749133427; a=rsa-sha256; cv=none; b=53Ljt540Wk7qKKPERqS+8Xp+6ok116uMt+fBwmrxnb5S2R7T34EXtX5v5MS2Tu/860ffEX 5Uw1JHCV7A3M0GQg9qeLgtO/7GnJCMy+aqpcb6zlvA1H/lqHQQffPpF7jXA0f7npK9Bx+B zcqpkSHlGD1UAnn+YMHL1CpfxGH7fD4= 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-out2.suse.de (Postfix) with ESMTPS id BCEC41FDC9; Thu, 5 Jun 2025 14:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749133401; 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=SmSyjhZyv9opvDAxMx9rc8iOlerhOsuhbkuJ00p6FnE=; b=wMJQdNQe2CHkW3QhzHzBnRYpS6r79wY6Pzjenus1EwRVLCfJUnO6VIwHrNUhU5LymiO4Fg Ym85LVtpiJdusifKnEB8uQPfGD/x80AcyEEsrMZCOsgg0EUiRCEwLjJNCOHFeRewkORAiQ shAxpREEx6LV5r+wEWl7OoeM80agUvI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749133401; 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=SmSyjhZyv9opvDAxMx9rc8iOlerhOsuhbkuJ00p6FnE=; b=M2tk8Jzw7FwcP9Zi/OpZUDNmqXkw0odqrNWc7yDoFQWfFTjqFZjCwPRTGUglVS4LU/mTJt Y5ah8jcpV+DTVCAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749133401; 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=SmSyjhZyv9opvDAxMx9rc8iOlerhOsuhbkuJ00p6FnE=; b=wMJQdNQe2CHkW3QhzHzBnRYpS6r79wY6Pzjenus1EwRVLCfJUnO6VIwHrNUhU5LymiO4Fg Ym85LVtpiJdusifKnEB8uQPfGD/x80AcyEEsrMZCOsgg0EUiRCEwLjJNCOHFeRewkORAiQ shAxpREEx6LV5r+wEWl7OoeM80agUvI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749133401; 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=SmSyjhZyv9opvDAxMx9rc8iOlerhOsuhbkuJ00p6FnE=; b=M2tk8Jzw7FwcP9Zi/OpZUDNmqXkw0odqrNWc7yDoFQWfFTjqFZjCwPRTGUglVS4LU/mTJt Y5ah8jcpV+DTVCAA== 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 23A81137FE; Thu, 5 Jun 2025 14:23:21 +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 gPv7BVmoQWipRwAAD6G6ig (envelope-from ); Thu, 05 Jun 2025 14:23:21 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Vlastimil Babka , Jonathan Cameron , Harry Yoo , Rakie Kim , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH v5 10/10] mm,memory_hotplug: Rename status_change_nid parameter in memory_notify Date: Thu, 5 Jun 2025 16:23:01 +0200 Message-ID: <20250605142305.244465-11-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250605142305.244465-1-osalvador@suse.de> References: <20250605142305.244465-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E50FC40011 X-Stat-Signature: x1qdtq9n8jbex6ubozmj4mkos5bxoxrc X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1749133426-452301 X-HE-Meta: U2FsdGVkX1+NJ2+ivoGcEjdoqC9wZJblr8J/TWWFQ6WrhbAUNYXXjWquLbceHigQHj5wml9BxN1+2VRCeTZBULYiaw+L5rIZVfKOmovLo2gGNP1s5HpGBkrM6uJfrdF/XUXnJVDQjcTkfzutw3G6RhdatiJZ59o4xhfw7ZfYPsyLDop5pRoac9liC1tnquuklnfT+ENw0mBa8juPzu7Yv3/4aHVrP3BQOhT8bDpY3Xcgyv0MMZs8mpBlfsIme6V+RXZAxABtCR2f96jKRdizDdMLAZC0918JEPKeBo2orPJodWAzAWiryy2vwt5fhmhGGzZrE3C6IcEgIDYgCU+180uaYK6a1Vy6ovYeRz6XhQicEgo5CkiwHwWCtV86eBd0pFIfDbixi49Lv0B3jqvqtEMKbPV33I2ueJFKSq29AWeyCsOeZYoNymt/nM5k/pSD8SQuRqlvj/cJbawz8wSJ49f/kwDvM9107m3lQZEJeZNxA0bFOjyoZjdSC0+8O2VSrPFqdj1BfClinmeBWhNgfXfcEHH0NhFeEEdGYmJWGLDRtHADoxMwG1ulBxOQDmBm0NtLjCFYTgaX2Q23mAccC3gpJWRgn0OMp2cMRD48WFnfr2u+mWlJQ7HgK8aaQpoAt/uPrr5n9Cn84RKjGbyzv1y0A15LWpJxLvzc+SSJkEQvRjf/B5SMj0aKw2Aph/JDWK+1+VNKiJ7AFydJhftZxxYTWY+hpgw1L0ePhQuER59qhbsrKd9ANXIc/XgVb/3taifi6zSwnelhn3M9Tc6hKWzg0fxTSUfVetOjPwS4/0GwafoCbghBXqxHXjUVo45MIPgIqGsB7f6tTu4TKHO7nEK0efvEIzxlTYGimXplcUnh4LwNADPecHdC/2zwbkQXCAV91tjTRK99oEMkntt+ZY5NMH56lyNxegh6CpDt1ghtncar0IOPUURKQAHHZeQrAf2XfdHBrzvvKBg87HW +1cXOXNU qzVsx6OSBsTo4QVGXtA7koZixjh/UZugZls1XMWX7efwksTaEl4LC4v9mQcQLcx/PPLmPSdq/Zz13D4+86GTA2M/s97ucfjuOp2ZNjbLXOc4iF/W2cZ/kbZq+X0T4367sADvegogK2UkWrknUHqb7uJy0tTRzxOem1e3TnahOz649W0GQ4S/f5TWFT1ihBEWHlBxunHCubsPK3dI0f1fpYIt/KMS6JmKSOh7Xs750/N+Fhlwy0TAq307IT7VdlbvD4ZmL/eKQ55O4IVJSDMsPGf8My/gLCRSPi3+P0IBQHYSAk6ZOFoKJLh6yL61v5fg610VovinHWyoanFc/XcKna/6XJQK955R72vbYoAgH2KZHWx/1GZ2z4Df62hl8aSCHzosWmO6ZfA4SXqa5yDtUIZrv7b241fgVtnetAQeqAEuskss= 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'. Reviewed-by: Harry Yoo Reviewed-by: Vlastimil Babka Signed-off-by: Oscar Salvador --- Documentation/core-api/memory-hotplug.rst | 9 ++------- include/linux/memory.h | 2 +- mm/memory_hotplug.c | 4 ++-- mm/page_ext.c | 12 +----------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Documentation/core-api/memory-hotplug.rst b/Documentation/core-api/memory-hotplug.rst index b19c3be7437d..97efb7b651ac 100644 --- a/Documentation/core-api/memory-hotplug.rst +++ b/Documentation/core-api/memory-hotplug.rst @@ -59,17 +59,12 @@ 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; + int 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. +- nid is set to the node id, where the memory we are adding or removing belongs to. 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..918c65ecf299 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -109,7 +109,7 @@ struct memory_notify { unsigned long altmap_nr_pages; unsigned long start_pfn; unsigned long nr_pages; - int status_change_nid; + int nid; }; struct notifier_block; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0550f3061fc4..bccbc02ed122 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1186,7 +1186,7 @@ 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; + mem_arg.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 +1987,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.status_change_nid = node_arg.nid; + mem_arg.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..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