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 99B16C5AE59 for ; Thu, 5 Jun 2025 14:23:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D9496B018A; Thu, 5 Jun 2025 10:23:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33E6D6B018D; Thu, 5 Jun 2025 10:23:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22A6E8D0007; Thu, 5 Jun 2025 10:23:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0195A6B05AC for ; Thu, 5 Jun 2025 10:23:25 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A0D135CF1A for ; Thu, 5 Jun 2025 14:23:25 +0000 (UTC) X-FDA: 83521564770.04.D660FDB Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf18.hostedemail.com (Postfix) with ESMTP id 6C87F1C0007 for ; Thu, 5 Jun 2025 14:23:23 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="TIg/cWVZ"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BEmc0EXF; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="TIg/cWVZ"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BEmc0EXF; spf=pass (imf18.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=1749133403; 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=5GT2CYRiAr+9AmbzTZ+VtvFRriYDWDxy/TDg03PmFt0=; b=Zcn/3lao43Di6VCvtfej06bR9+ZCmWFPAuOg9lRDBXqFVFohhnMvbE5hQfk+8/Q1+vk8kL 1DZxLYs3u23UsUdtjure+TpGaWbsp2uXVOCSYE0DOXrpHQwMlkItKhKvXJCIlYwCw2PNUu wx9nTqk+HmLo9Muehnm4r7sIKPTGTWQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="TIg/cWVZ"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BEmc0EXF; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="TIg/cWVZ"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BEmc0EXF; spf=pass (imf18.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=1749133403; a=rsa-sha256; cv=none; b=24GBWLdAZv/t6GkH83N22eZ9QyVRMs0fgyaqfHORQWsP3RsqJlmgFlD1tBg4uoHTiSRmEd /aEbszVSL76GNhxg/gDVnO49h6HYlYfV0rbhR/adX1TTAJ+KZdUnvNFFqxDC4Fjxzq+7Sx LerRf7mwby4t7T27ekFVSJn9Wc/KwnE= 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 4EABE218D5; Thu, 5 Jun 2025 14:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749133396; 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=5GT2CYRiAr+9AmbzTZ+VtvFRriYDWDxy/TDg03PmFt0=; b=TIg/cWVZfbbsOi6mQWQAesLErovvbFuIkBT+J/SxUgGxlQakyokC0KibOEmTXoYy6trHQN LHYtpk52rSM9Cl4x4T3lz7oORTFz8Wl/wynN3O+4Eb+1HhfAcdaMRM9t7gZuikOlpdeNZR LJrpUVO2OX0Tl8xbx/R5lFNgukuG6c4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749133396; 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=5GT2CYRiAr+9AmbzTZ+VtvFRriYDWDxy/TDg03PmFt0=; b=BEmc0EXFuVmIzTbWsv9mMnoY4fBNWobI/YlZt848YZx9L6XPyGJpPjDeUpguUGmJIeaJUy 7yyujm1ccKSt3SDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749133396; 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=5GT2CYRiAr+9AmbzTZ+VtvFRriYDWDxy/TDg03PmFt0=; b=TIg/cWVZfbbsOi6mQWQAesLErovvbFuIkBT+J/SxUgGxlQakyokC0KibOEmTXoYy6trHQN LHYtpk52rSM9Cl4x4T3lz7oORTFz8Wl/wynN3O+4Eb+1HhfAcdaMRM9t7gZuikOlpdeNZR LJrpUVO2OX0Tl8xbx/R5lFNgukuG6c4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749133396; 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=5GT2CYRiAr+9AmbzTZ+VtvFRriYDWDxy/TDg03PmFt0=; b=BEmc0EXFuVmIzTbWsv9mMnoY4fBNWobI/YlZt848YZx9L6XPyGJpPjDeUpguUGmJIeaJUy 7yyujm1ccKSt3SDA== 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 B47B1137FE; Thu, 5 Jun 2025 14:23:15 +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 mEAJKFOoQWipRwAAD6G6ig (envelope-from ); Thu, 05 Jun 2025 14:23:15 +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 02/10] mm,memory_hotplug: Remove status_change_nid_normal and update documentation Date: Thu, 5 Jun 2025 16:22:53 +0200 Message-ID: <20250605142305.244465-3-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6C87F1C0007 X-Stat-Signature: tem66mbws4hrzxgfjeboq7c6mubwhyt4 X-Rspam-User: X-HE-Tag: 1749133403-456759 X-HE-Meta: U2FsdGVkX19dUloQHgnUYshaOcEbZxlVjplsluuVa4tuDkDPdQl/6kMyv6Ccccv0AA1PZEkw/+eoNv1CWp8yeuKj2wRcCNRlb/AieFoiIDmnYR8knzplLT9hOYIKmJ3UTSHinNVU8ZfSOp6/eNlgO4imdWgesSyEH+8SX71YoJ6R6ZDZ26qpYyOrmUeDeBX1t7Y3pt2pyPXaSjicOTT4zVwYlaW/87NRfhWyBiul7VeECabOpjs0Vc4eN7axrpBECkJ3Qg/kAkxORNZGHHyqcr1BwEv3UrJ6KlsnZIZ1r0tzJLQKTyjVG0gFaZKBP9N7Hm8hpWIyb5Gh5WItKlVR4i1CPGYijkd38l+ujI1aW21WKghL1gbyQGAIShz/UExx5zW2vKLP+dE7w7s5QXIJgJ0nceph+/pbEQ3WokDxe/pIFUjCfHHr0TxNsndgKme/Y10v+35DRj0lTSm3bqaLkN2uCJBonrf6wcEm1jD2F+EcBR7+ka5yI4OtJ0jMtMH43Ur2V0Cm5LPS+sZRncF04DKKDRc7Rcj9yMxQQodlG/T/QrEVRFzfPiueYjeE0wvK+3wnifuaQ3NwAjIY2XLgZsijZykTQBNZ/PKi14xn+X2jW60VLONGqpyhDfc3PA+Iib6CeQZjdZrwi2Ckh8bYmk9FYar6KTp69vZJwpYfqYi7zI0Es2idLEQbt/BM1c0/CTek1ITsi+Mc2dvMKi/oA1XkaMpL/guRksgmaXhI2VVnb+HLe5M4YfnIYAz/n4xaef2k7SLV0QUGl1w/TxWF5gqhAM1MeDqHW6X9tC9jmjngQuWzMJFyKeckR//PJzKOwZxHRhSX0tuTlz382Ek9qA9U1wgTQKWFK3HENDZFdq7+aCUoNT74aAlcqoNFPskMRNBwu/vAcodL/Go674p0BGxv/dhouN95dLrZiVhdQCf/lZ1lwiNJNW3bwiLSJxpTuQOxCU2zGbhw6p60Xec JV8uT3WS Q50c/i/5W6l7Q7/Q39r5vAnA1hc2zhdTaCjnDujBA0A4g6av6fRIN1uCx9qpdkZwKXy7K6tqzyJH2bpEw7dEBBSk2OPpmPgIHTEQuDoa/vOcj1KSGfJiQ/S+aO6/rFsyP186ew28NmjPUV9c9eMzL9klpmD+blTZGrvdhGAA6tiqQo5dQ4ed87l4rWwxpImIrP2sHuBY2A+CPZCfQAbgMOvSdWVIqLylZmb6V1onbHzG2zwuf8JLFHbzeiLESVKPUfszFadKksREXnWbhBE/LsgQkTt9aWPjuAhlMOYAsf8fTSVkutyjuYzQFFFWL2BpRk0SDAK/0Za0ZcqNEtItByAs2iBFqSf5hEulaODitbjYMzMYqj27cllWuisZMIumyPVrf0/HMjJ+iEQnAIbsbCUWC4Jm+KjF7oal4jWEgjk1364XFdzL6vD8Jlw== 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 --- 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