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 AF807C71155 for ; Mon, 16 Jun 2025 13:52:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DCF86B00BA; Mon, 16 Jun 2025 09:52:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48D0E6B00BB; Mon, 16 Jun 2025 09:52:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3564B6B00BC; Mon, 16 Jun 2025 09:52:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 231FE6B00BA for ; Mon, 16 Jun 2025 09:52:31 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AFE591203C9 for ; Mon, 16 Jun 2025 13:52:30 +0000 (UTC) X-FDA: 83561403660.18.079B756 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf04.hostedemail.com (Postfix) with ESMTP id 79B3D40012 for ; Mon, 16 Jun 2025 13:52:28 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=EUS3Ivth; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MgW6xC8E; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vfhUVOzq; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tIZobyKL; 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=1750081948; 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=p2+t4+dXvMTA5CnXZI8Rn7xukYSyQj30EDL91YRcHMwwmxmqHvYE1a448Fq/gWwjjz6kMP rCjLwEDmeyvg39fInPdyLLmkuo5MdRGxaSDnopwzCSOpKaBVhC/75iF2xvn2hwuiOfp6ql Ybu1OuNvzLV5IrxCEBP4iuULNw49qwU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750081948; a=rsa-sha256; cv=none; b=3+ZEA/ICa+tAFQ+q1yNlr+keg/bPBgyIZ94lOFb3RenyZO2CAGVzeYC5iPvLmq8tC5u6vp qu0z/L5pcnJ3PUmn+1Ib8EnkF6pq81BX73N1DWVI9/BY71EObHY+IrcgJnBcpmwRjNUdM5 j76uu3DpEpXF1qA4yvzlsJr71E6HZhM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=EUS3Ivth; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MgW6xC8E; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vfhUVOzq; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tIZobyKL; 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 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 367F31F79F; Mon, 16 Jun 2025 13:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1750081937; 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=EUS3IvthS1h/vWDgmXPGgkd1+FohlVD1FpXb4EP0jAR1oxycDpf7hW8k68N0E0A7KhDFFL 1C5EaRIaLoMdsi2FT9tJEIKnlihhsot32sUZmjJLMBmqVd6nWtfL2t28/ySzyon4LLcOWX BgxXkUQHcL2Tu4r9n+8m+PpDS1nMZ40= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1750081937; 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=MgW6xC8EBPtZcF8MOKpo3nXjmE/zDtIUVK+yvwx3V0z7mZF0u7ebFR6UkyaTCmdX1R8VPS JeH6MG8N4swPu/Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1750081932; 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=vfhUVOzqPfvtJEJyPcxsI03RAtyuaN+dH2aLXSJd8nX76rBGWH2YisZ+2JAVxaiBbvYZ2o GRnxeKnUTFqOXs8gNYEC8Ae0sV0Xs4AZolpQfpqevDvLXirw+DKXnr37cHGvA8WRnCuieP QO/pr+m6x6C/wgEkdy8lg/yo7Z3deO4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1750081932; 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=tIZobyKLJsT2uqjre24kAJHC2Z+Y4vwfLMgT1OzfiaFwtBEVBhOljYn61hv6WLoupcB8S5 kTp8LFXiJuynlmDA== 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 A0AB013A99; Mon, 16 Jun 2025 13:52:11 +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 AHegJIshUGhHLwAAD6G6ig (envelope-from ); Mon, 16 Jun 2025 13:52:11 +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 v7 02/11] mm,memory_hotplug: Remove status_change_nid_normal and update documentation Date: Mon, 16 Jun 2025 15:51:45 +0200 Message-ID: <20250616135158.450136-3-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250616135158.450136-1-osalvador@suse.de> References: <20250616135158.450136-1-osalvador@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 79B3D40012 X-Stat-Signature: igpd9bzkck1cb5abwcdqfnwqfi55imw1 X-HE-Tag: 1750081948-498624 X-HE-Meta: U2FsdGVkX1/nK9WZH1rghB7QD6zsDPYORjrpNYMkRGi4uPcZYB5wi3N1tSF8hoZ04opAgQOxC3f6l0QlxVlfxxKNs3K/Eudnlw+rdtczvQWTSCUO28zOdKoR2WbcvvFcZWZSvWy0dfTdJcKGRrUDTk19XdRDHotZzq4yzG2k0VGVuuWqdcos0X1Oxt1gYCX+D7xO49kKPenLBWgRwDgHGA5AhjMjbNtBJUWZ2tgtawkxgjsePdF9JFoTQg5HIt8w7Ds8Exy1EXwS2eD71Uv18TCav6yeVeMahcyXksU4GIo0y5UWwUln+mqy5OaLMjmzslDSUCHrtbmXRwKeFsN2jPAjCO2cI+c0lHK9N9BN/dVhBK7Pozvd5nBbUxfBI0DMsjwsyJ31PN3A+UhfYHm0hOz1dZq20o2LSIve+54mR6IVbTeapLK1lxD3KvHz5YoZuee4nudSmkOVpay0AphVmOoklnn4JKLmmM+LoU43AzYBAjrqT2KUWOtW/r1hzQ01EZtzdYLFRkCCK1PNgjdKIZeeVEOlui/m3zhNxHaWZCJWTYvNQX5qJGzYd2xzzJtk9AEvoXAqDgVLAcyaABri+qgTmb1d5Xi4nHGZeMrg8rRMg0hixnbVEygKkjE3tN2+kqFNBDNest/x/wsP07mgZG3exI4JCzeh5O9exFW0di9SDh+ygUy/2h5fkDAJJALVnSRjh8Ga0XerYtQsC7TQ342aCQ4L9b/JhzPCVx13kbYxXLVROGJLXgYYvjoAk1zf2LMh/fCicqxtz+2uKGFXiX6iXwiU7106vffW4HriLLb7GMBz5ZEWIsNaABpgbmNPc2jB4tu61t5lUsdCM8gYM10BBfpjFhV7+1VPL5vSE42lXua9TVivFWHGSPg/7cf7LQ+2cLWU47GO1WFX/uDWXGOfjqMo/HbdcvjdFu85QjSZ8WdkTcVVBVrWdZHZXiqkxO0RPM6klPwJV/jVJ6V Z+mp+VqZ a3GNk0s/9U6XnoZ+jsyHbjjMZTSkd+fjrDEzRX/JzcCSG2s2QH1rYCKDC+lZp61e1pq7AdEEMjspUZzYMWdfPZgdrVKGfUFXHX8FlFwMAiEgFiXltUwgTwOS7ks+fFYUUvMzRCgFS67gHkCQjXaKmV7vy5pjQMczB+Up42Mxbc+Io63ujgFAHPmQpZNEYP0lbGFe6V/bs6GdBJILGoLbDw2hfz6PQZaEok5HjBvOpA6N2cgnkn/u5y3aUxDw53NGQSw6hvdLNSuE7fN0FB5eqrGM4wE8oPFcZAKordkU8ZjoFLELvPnluM+0AzzWIYK5XuciPn2ceLccJxoKgPgVhtrhYMComgPT0oxKk2fWDmDei26C40JGlirQKFF8D5syMB+0TfxDhTG5UYNrsmd6WI+w4YcuI8z2HhnGEYSecXThuE7TGJW3Fk+9IPHfnaWhD8vDJjkb5voNvPrZ5NBuWa6mn9DwX6nCfA57/XhRWEZAvQQDLihowniUsdw== 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