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 787F5C5B552 for ; Mon, 9 Jun 2025 09:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F27C6B009C; Mon, 9 Jun 2025 05:22:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A2CF6B009D; Mon, 9 Jun 2025 05:22:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5FB46B009E; Mon, 9 Jun 2025 05:22:16 -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 C35F26B009C for ; Mon, 9 Jun 2025 05:22:16 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 890981604B7 for ; Mon, 9 Jun 2025 09:22:16 +0000 (UTC) X-FDA: 83535321072.22.CF3A5FE Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf11.hostedemail.com (Postfix) with ESMTP id 4EF4F40009 for ; Mon, 9 Jun 2025 09:22:14 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DWA2Ps0M; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dg1Zauj7; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DWA2Ps0M; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dg1Zauj7; spf=pass (imf11.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=1749460934; 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=9ORTOaEJ/0V7ulfpgFNty+PVV14XRbqmPaznEqXnqKg=; b=tZ72gmr/b/omKUWVklitYoQSlQR032yLGAES1QXf8zTH/KXI+vy6S+G1gbUpFguegKaXqC 19KZlb+BRVm9lFvg357DOy5ZIyB9l/+s89MRnKoXMQ1YQxeRWoVEdjdqK0D0ObUZFi7vtS H1N5zt8h+0EZIxPzLwfhRacnjY0/z3g= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DWA2Ps0M; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dg1Zauj7; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DWA2Ps0M; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dg1Zauj7; spf=pass (imf11.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=1749460934; a=rsa-sha256; cv=none; b=L1/PG7KG6CPqlYqkSJyFaGSUfxoUc/FyIhO5G3UWJEeIFAWMhJnjE2lIzCz24IIhnQXROa 7dqAUzw4CYPLM1GHTtDJfZ8YMJ00hnV4hCXmAKbeznBLtWvspqi+C1Dv3qUjzAe6ZWdXYG 1Ogb0yV8T0llNmwXTKoYrlNjm2NJgs4= 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-out1.suse.de (Postfix) with ESMTPS id DEB25211A5; Mon, 9 Jun 2025 09:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749460921; h=from:from:reply-to: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=9ORTOaEJ/0V7ulfpgFNty+PVV14XRbqmPaznEqXnqKg=; b=DWA2Ps0Mq8BHtX7URDH0Z1wbj95rxQNYtJVncjbijp4F+PZzn7PCwshiB1MoNSuOVBzJtE kvmRLLDO+zSKOPI531hZwQzvXNbhl59QVUaIoigchEBA0zxHdzqy4SKAbQaMFVxmSed7e6 Sc/KY35fM+aMOk4j/lvjGevjHwAnPUc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749460921; h=from:from:reply-to: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=9ORTOaEJ/0V7ulfpgFNty+PVV14XRbqmPaznEqXnqKg=; b=dg1Zauj7HdRyKBqj4WGzVEEunEzKtEMOpU5/c/Xl1eONnYeKbuPmU1ipeJUEhl/n13jBhM OqCNauLzmw0vTVBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749460921; h=from:from:reply-to: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=9ORTOaEJ/0V7ulfpgFNty+PVV14XRbqmPaznEqXnqKg=; b=DWA2Ps0Mq8BHtX7URDH0Z1wbj95rxQNYtJVncjbijp4F+PZzn7PCwshiB1MoNSuOVBzJtE kvmRLLDO+zSKOPI531hZwQzvXNbhl59QVUaIoigchEBA0zxHdzqy4SKAbQaMFVxmSed7e6 Sc/KY35fM+aMOk4j/lvjGevjHwAnPUc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749460921; h=from:from:reply-to: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=9ORTOaEJ/0V7ulfpgFNty+PVV14XRbqmPaznEqXnqKg=; b=dg1Zauj7HdRyKBqj4WGzVEEunEzKtEMOpU5/c/Xl1eONnYeKbuPmU1ipeJUEhl/n13jBhM OqCNauLzmw0vTVBQ== 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 43A16137FE; Mon, 9 Jun 2025 09:22:01 +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 uPLEDbmnRmjJGAAAD6G6ig (envelope-from ); Mon, 09 Jun 2025 09:22:01 +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 02/10] mm,memory_hotplug: Remove status_change_nid_normal and update documentation Date: Mon, 9 Jun 2025 11:21:39 +0200 Message-ID: <20250609092149.312114-3-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 4EF4F40009 X-Stat-Signature: z5t9ngc1aohrj4que9oj1535xtn97pzq X-Rspam-User: X-HE-Tag: 1749460934-871764 X-HE-Meta: U2FsdGVkX1+PPQ0SS0dV96t1vwEMa+ErcLmeVObF+5LaIsdQNtlj4ZHFuDvu8iN+nuxp83lx5HtsiUFai0uCbdc0xE3q7+AqtWBFw4JptDPxb7ibuwQvRl4MUQ0IIxHapDASqAiAt/CPyQK+TYClKbwmBKg5l3s7vP5T3wcDjzPx/YQY4Py0tsXUiVTDO75HtQ6btzalbLEhCun62R/RCy3UVxsf8AXQUyAbuhTc49BR2lPVbHEEqMeQPl6+SaTxcHyEDffxTkBb81r5j3szDos5z0s04WTjaIPrf+MLJKStHt9lg0n4+pBngx7m2kAB9mmz51Nr3lIfu8/UTkES+esgxzih0wdA6yMDP+wpaHXqHIihzCcSorccVJCsdYIkSnLju9jHbHnT3xPOw2G1dzJlnDeCC6NK8kluyQdYd9Oz6RSRTBFNC453ko+2EmS9V9e7+qSd7/6Es6X/G/9374tqciI2qbzTVBZi3ySelgMjF5UeoSI5RuW05ynkCANjQLA4jVR5Kaj3uOUrJfmX1BH6VFuXOgEmWJQXqBrO72xCXIADfMIWCgIuRmesVZkA4tYcXaM3ZFbpNs0ZL0Kddkc6KONQgXkJEqnAABC9+SiQv2lYuxb11V0fJUpHEJq24oc1XbgmryqpJz/7X7bVKzDEGEDmOzWR2zwzsERqDDxVLZTnhYeDWcad6T0bcFFRY6n+N2KjkPr20nU5KCp5UQ0BuN1YO6YRjMe0C0n7fVvRU8kGNVMTT5fd9TvUrKTavw2P3IBKyYhSGJ3CMyu8rof1pTh5IOkkSZOnodL9ZsK59TTim1WQWDLP/Ma4K1NwjcYZJIkDVsLSlD9r6Y7wEt6fZHILl0DHw8rcp+/Ok3RDJvhjVEyrc5yfPbsTsY1Yjtvg4cIdaRfIZ2liO9QHBSLrJzKr32EWx8jg8g/7MQ3qsEt17ur8gaV45qWXl3tyDMQBcJTuswC2xLsUlEZ /Bl47t2j SR79U0vGKNt1svuPZYut9zM+BOVMmbz6cQvsLF6QlRlRvCocRPR0DvLJdFbtg9boboKMJoBiA05W+kAhVk1QErQYk9ojVvVfRFjiidqQCOj06aeqkDo7lnfio3Fxsxb28WuVSbgIwnb0EuS2qZZozbzv23BAlplm88yCI6CGWHzCsTl++8KnqhobgvZka9TvIEXVDBUIbk5j1ZqeLA5FiTSACryrTB9Uucr+iivM5XPWMWP/R+6LpxH8gxqS9BE8uhYxWeZH7d+T8e5PVwxGznPlFRp/iLxk+8FYN4i0H5YMvrhDzOh6w89+4f3aRZrbFL4rfzt+XitTrIQCO7MvXJdpnlw4ZBO8pUirW9mNdfHrmPu/QQqiHzswKsRQgOdzwO87QzG4uJQfaolQ8ww6Z6JbNLMKfeLKnMi7SDHaTib2+Eexnmwo+I5RhsnXBDd4r5cGj2LuZakaZGS9rCRMoTLD+RyGhOJG96qljgHPx53Nn6tM5iAEfPL/Wrg== 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: Now that the last user of status_change_nid_normal is gone, we can remove it. Update documentation accordingly. Signed-off-by: Oscar Salvador Reviewed-by: Vlastimil Babka Acked-by: David Hildenbrand --- Documentation/core-api/memory-hotplug.rst | 3 --- .../translations/zh_CN/core-api/memory-hotplug.rst | 3 --- include/linux/memory.h | 1 - mm/memory_hotplug.c | 12 ------------ 4 files changed, 19 deletions(-) diff --git a/Documentation/core-api/memory-hotplug.rst b/Documentation/core-api/memory-hotplug.rst index 682259ee633a..d1b8eb9add8a 100644 --- a/Documentation/core-api/memory-hotplug.rst +++ b/Documentation/core-api/memory-hotplug.rst @@ -56,14 +56,11 @@ 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_normal; 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_normal is set node id when N_NORMAL_MEMORY of nodemask - is (will be) set/clear, if this is -1, then nodemask status is not changed. - 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. diff --git a/Documentation/translations/zh_CN/core-api/memory-hotplug.rst b/Documentation/translations/zh_CN/core-api/memory-hotplug.rst index 9b2841fb9a5f..c2a4122ae221 100644 --- a/Documentation/translations/zh_CN/core-api/memory-hotplug.rst +++ b/Documentation/translations/zh_CN/core-api/memory-hotplug.rst @@ -62,7 +62,6 @@ memory_notify结构体的指针:: struct memory_notify { unsigned long start_pfn; unsigned long nr_pages; - int status_change_nid_normal; int status_change_nid; } @@ -70,8 +69,6 @@ memory_notify结构体的指针:: - nr_pages是在线/离线内存的页数。 -- status_change_nid_normal是当nodemask的N_NORMAL_MEMORY被设置/清除时设置节 - 点id，如果是-1，则nodemask状态不改变。 - status_change_nid是当nodemask的N_MEMORY被（将）设置/清除时设置的节点id。这 意味着一个新的（没上线的）节点通过联机获得新的内存，而一个节点失去了所有的内 diff --git a/include/linux/memory.h b/include/linux/memory.h index 5ec4e6d209b9..a9ccd6579422 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_normal; int status_change_nid; }; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b1caedbade5b..94ae0ca37021 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -706,19 +706,13 @@ static void node_states_check_changes_online(unsigned long nr_pages, int nid = zone_to_nid(zone); arg->status_change_nid = NUMA_NO_NODE; - arg->status_change_nid_normal = NUMA_NO_NODE; if (!node_state(nid, N_MEMORY)) arg->status_change_nid = nid; - if (zone_idx(zone) <= ZONE_NORMAL && !node_state(nid, N_NORMAL_MEMORY)) - arg->status_change_nid_normal = nid; } static void node_states_set_node(int node, struct memory_notify *arg) { - if (arg->status_change_nid_normal >= 0) - node_set_state(node, N_NORMAL_MEMORY); - if (arg->status_change_nid >= 0) node_set_state(node, N_MEMORY); } @@ -1895,7 +1889,6 @@ static void node_states_check_changes_offline(unsigned long nr_pages, enum zone_type zt; arg->status_change_nid = NUMA_NO_NODE; - arg->status_change_nid_normal = NUMA_NO_NODE; /* * Check whether node_states[N_NORMAL_MEMORY] will be changed. @@ -1907,8 +1900,6 @@ static void node_states_check_changes_offline(unsigned long nr_pages, */ for (zt = 0; zt <= ZONE_NORMAL; zt++) present_pages += pgdat->node_zones[zt].present_pages; - if (zone_idx(zone) <= ZONE_NORMAL && nr_pages >= present_pages) - arg->status_change_nid_normal = zone_to_nid(zone); /* * We have accounted the pages from [0..ZONE_NORMAL); ZONE_HIGHMEM @@ -1927,9 +1918,6 @@ static void node_states_check_changes_offline(unsigned long nr_pages, static void node_states_clear_node(int node, struct memory_notify *arg) { - if (arg->status_change_nid_normal >= 0) - node_clear_state(node, N_NORMAL_MEMORY); - if (arg->status_change_nid >= 0) node_clear_state(node, N_MEMORY); } -- 2.49.0