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 E4A9FC71155 for ; Mon, 16 Jun 2025 12:36:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 846BB8D0007; Mon, 16 Jun 2025 08:36:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F6E68D0005; Mon, 16 Jun 2025 08:36:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BE928D0007; Mon, 16 Jun 2025 08:36:02 -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 5703C8D0005 for ; Mon, 16 Jun 2025 08:36:02 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 071161C9CF0 for ; Mon, 16 Jun 2025 12:36:02 +0000 (UTC) X-FDA: 83561210964.29.B724B82 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 882884000E for ; Mon, 16 Jun 2025 12:35:59 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X9wlwaNC; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750077359; a=rsa-sha256; cv=none; b=HDEAmJ8XMDC/VWsGwPQryY4Hud8YVZ73dyl3y/wXm9lSNY0RzA/hpsUh+kRhNoG9dcjo6Q u4+6Qby4sXVu/hZAr1nkfuIaMf7jN8KIfZuyQz6rDYBKeQdZFreR0sYidhKId8oSoG25h4 6n7uDi2pm6tzdESFvEEZw6IDl8VXHUs= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X9wlwaNC; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750077359; 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=TEsiMOxT2FmOg/HQn0RlppUl66kt12m1IKYKF/f5J6c=; b=xI1AX5YZGR2dvVxlBMiy0JS6MBhTyoc/iK4JKxJ6fAkPPdVd6QltOi9JIc9/BdNUgonzXv JKCLUOgQ80yIODhzvwFoakC94h36IIxwajLZGk+Fq/2+xvuMEFy3xPhHDKvX9KF5FO8w5H e0k9xJKy+0nvoGqG/WnkXk6jbfx7SgY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750077358; h=from:from: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:autocrypt:autocrypt; bh=TEsiMOxT2FmOg/HQn0RlppUl66kt12m1IKYKF/f5J6c=; b=X9wlwaNCaQjcdM+/53iUeHazBG/MWJb6XVOxjmnNaztelshlQIVrQQ+2cJIZ/75+nYRyBU /SfzTb0bkM99zEXuxuQUVwvEmW/lNmM+ydbXPw5EFNlmeGRID+mfRJByLi9O24GFF1T6CT FUTvOlunIr0P8Esi3ql1kaao9XArv5U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-XOIgNy0fP3uS5zE_nDb5ig-1; Mon, 16 Jun 2025 08:35:57 -0400 X-MC-Unique: XOIgNy0fP3uS5zE_nDb5ig-1 X-Mimecast-MFC-AGG-ID: XOIgNy0fP3uS5zE_nDb5ig_1750077357 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450de98b28eso27903745e9.0 for ; Mon, 16 Jun 2025 05:35:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750077356; x=1750682156; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=TEsiMOxT2FmOg/HQn0RlppUl66kt12m1IKYKF/f5J6c=; b=dncZR1HciEA6LcLT7h8A9d+VB/Fwuc4+dX95MrBHq1wKNeT+ZgLYxGkNgNDp/KJX/t PArVYvnojfTvEBvlUslAPkjW6rnoosU+22Wj9Ao1Tmcb3GJ71N7QEIKTc05KxKE4hT9z kAT3347N+XCsro4FXKJ4FhYGyt3qCGwcGv3yOkMCDhCM8NMM6JtyLY5EokAZNr/SHHae /BjjLsgAdWqEjpdsHC85tGzC1t6SQ6TVra5EjqDDTYgUynbJWqsv2DFbKnYueQZ7Q5xw I5+hmmx4nPoL9Oqj2hX98eiWPHiCpcK3VZTMcrDPhxAnTE6AlVUWZMZgBNWZHK+CRZ1E tDpQ== X-Forwarded-Encrypted: i=1; AJvYcCUaIa42l5E1QFG6MFlMoZZ/pK16QfAgyLfu8C/Bo2MltFEQUwJFKksOoOcyYPw0e0Fti1VDLUJnwg==@kvack.org X-Gm-Message-State: AOJu0YzcCwH4X2kD/VuKAtOkAIL3qlydIqX0Th9LDntjxuuwReAZrbyC B3Vm8ZncB2g6qlc+K3PrFMe6WQ9ZqpCNcoHb3IE3ZrRVReZebUyPVAXwvKcXhwB5OD3iK6Zt+FE jbB5lqMnpViwoExO4iWpcr7WN857ITgTiW+F9ENaEx7pOuWQZj/Bw X-Gm-Gg: ASbGncvX8Z/5ZwYTmuoDUDPtMEE0BSEPleskTdNVbbqSLmQoD4UANheRxEC715dbA2w ubQEBK7XOTHVMG/DeqPcDVPSz6QDJqaJJmtlE/7DS4cBNY0okKKXCmmQdw6eyJp1ZoGf87ubT+c 7+BwpWmyzYGmxiXls9JrzsHaCQZRALBj1ImItfmfjZ4zzkigKaQV2hzTQNdo8pHU/i5g5gl/SsF Ddvhpr8Y/subXZAxk5hv8LA4s3O/kBqWaAw1ruxJR0wly8VhNNrJc/mQupRCY1dmc8eQ1fSyk5F KNo8Yh86luKv+9jYBwuaTET6jdsetEpapBdqbpEu4WedNxWvdhv0soU4nhHBWhjyWu9DoVDfOX1 HhU+O8ZxkXVRpldvt00WIG3atPLr0vwTEiwUAXdwNIb9sny0= X-Received: by 2002:a05:600c:2e51:b0:43d:5264:3cf0 with SMTP id 5b1f17b1804b1-4533b27222cmr64389475e9.11.1750077356523; Mon, 16 Jun 2025 05:35:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjXqMAbFmDiv4vkOMSIM0QV8w7A3uM/4KMu9kgqGmhwemN8e1AyYIVjbrkZHR0ngY7AGD7gg== X-Received: by 2002:a05:600c:2e51:b0:43d:5264:3cf0 with SMTP id 5b1f17b1804b1-4533b27222cmr64389295e9.11.1750077356170; Mon, 16 Jun 2025 05:35:56 -0700 (PDT) Received: from ?IPV6:2003:d8:2f25:bd00:949:b5a9:e02a:f265? (p200300d82f25bd000949b5a9e02af265.dip0.t-ipconnect.de. [2003:d8:2f25:bd00:949:b5a9:e02a:f265]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e13c19esm143647315e9.25.2025.06.16.05.35.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Jun 2025 05:35:55 -0700 (PDT) Message-ID: <400b4d5a-8973-4301-a86b-41e1b412a3da@redhat.com> Date: Mon, 16 Jun 2025 14:35:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 03/10] mm,memory_hotplug: Implement numa node notifier To: Oscar Salvador Cc: Andrew Morton , 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 References: <20250609092149.312114-1-osalvador@suse.de> <20250609092149.312114-4-osalvador@suse.de> <2bec8b53-f788-493e-a76e-1f804ed3aa0c@redhat.com> <10c87a0e-c9fe-48fe-9bbd-16afd244b4ec@redhat.com> <360f2f04-4542-4595-bf36-c45ed10335af@redhat.com> <23431108-b5b8-4c8a-8869-8f994371e7a5@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CcR8tZ_PjyT7QzBBmuduxSIpeRxLd-xu7VnfiOSxs-w_1750077357 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam01 X-Stat-Signature: umgq4mg6ujd61ydj8o83588if4m837xj X-Rspamd-Queue-Id: 882884000E X-Rspam-User: X-HE-Tag: 1750077359-790800 X-HE-Meta: U2FsdGVkX18tgQCkbgnq2gMDVgtaVlWk8fc9a5hpZHj3Ken5CP16kR+wt7TT1m9hmkgHfBFa3bgu0FSrD5LdOVPO8XfhBTFm6yHRSjfEpwrAdVvGwvaESxwE4E/bPr27i4v8CO4m3npl442TfSlcGklLJEEKcBgy3L6sXTrjIul4CjwgoozWEq6W8bGvd06UXF/Za05/uvMXBcTxYpbOn9qpXyPMtyNmi2wMhCEKGQlL9imhCnAXwtJ7J7Gmw7qbKBOGzuQSkBxgC7p8YrZGF3i1yC+L0rlXbwK8GZVjTQ74QJStck8Je2TJtiWkh0dHRExdzTP/VQZGEEK+t3ZVLoNpOvhN29aZNbvHmi35GvjcfUiAiIx7/Xt9hEYgviNeNQ0ckkfOOrnftpK8vfoV9ewsNVgsN9TIyxeQRTzeRI5bTjmjq7FWrWxEJ2Jx7y9/v/DCsaydz5nyXLFgnUQbO/aqMp1Da6FnsNTxT/QwZbs3MtT/xFn1MtbAYqUE2HbMoP2h3rwG2wuN9TYRMkDSBAxovgIbl6n7sD3tjNcRpGx0hCdF8j5TSunjTgceqrNvNUtZwYkMlwMtfP6KVmSneGugg2ANx/vh+zjAa8OTI0SGiexairWubC4Jjwvj9WQ+HtDMfxpO9sfXVpME8ZPc7tIYSQgkBYYrNPeYbFsm3ogYHBKXRszyilseUSDWGIWqRNU4Uy1BuvHbzMlTgfl9Q+TKuZ42+2aKuhSrDveYrBdGAQ35LE763sUFauX2mpAI71zbrPUQsK4lnrH7M6pR/SjYLtL4drm7uC+UgRSzvClTcZWUM3ZeRwqDuXJKpO5rHgH850EC0cWc7uMpCjJQ2G8YJXesv6GJmH2weMXqIYaf+iNQ5O8s4/t4YBEOs7XiIXlEOwAG+VuY/q4gU8xwfMIG7M/g9bPNIDsFt7OTmfZIkm8Eq0m+vsHyBks4mxUemRb0kZ9S/Rzg/MTJGbs d/nz7D83 VeeXgpq0PvyE+gEsSJ5CLzSUvUt1OUZvXPSzmAvZnMuehyGbYCRt0idfTJl4KgQwOH3ZELhh09MvZyUfnwcGWlfaIZXzXoEqdmdSrxM0BHrtwFSCdp7In1TW+dFuQP4ZCrZ89h0WlNhxr6RiWMxMAuMPnf2Fwhhcdk5qPjbAXiqddYc/qF+qGy7geLntlChBpmFRpVjhxcdCoivSuntY7UAD2LIOaaXWrLYgXpDhmPmvoqknfRmWVHcpgurao72Sc9ZWmpg9GI+B4G+Fg6Dzwymtw5oWXJTVRnScp5L25zoOQoHHfJdtEW3/VazXu95Q58iwdk2w7hu/3foFXsd8NM59UlF1rdXXkZmQQay0iJJo0qv8hk6fb58YDh+nVC2SuChYaG1hoZ9ZHA0x0eYcqJRDroOjFvl7ULsikn7vzpAUSRqGLxBF0wiGT+iXpMRSpjjrm+1ulSZ7wvKirgZPmZKfyb9BWpF7LRXTsh4kJ4flMnIiUwoKkWdOKFin0WbvTN4qpbfPRkL31BJE= 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: On 16.06.25 14:32, Oscar Salvador wrote: > On Mon, Jun 16, 2025 at 02:21:02PM +0200, David Hildenbrand wrote: >> Exactly. I recall I checked some of them in the past as well, when I >> stumbled over this behavior. > > Now, about simplying the cancel_{mem,node}_notifier_on_err. > It would look like this: > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index d6df85452c72..ff887f10b114 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1150,11 +1150,16 @@ void mhp_deinit_memmap_on_memory(unsigned long pfn, unsigned long nr_pages) > int online_pages(unsigned long pfn, unsigned long nr_pages, > struct zone *zone, struct memory_group *group) > { > - bool cancel_mem_notifier_on_err = false, cancel_node_notifier_on_err = false; > const int nid = zone_to_nid(zone); > int need_zonelists_rebuild = 0; > - struct memory_notify mem_arg; > - struct node_notify node_arg; > + struct memory_notify mem_arg = { > + .start_pfn = pfn, > + .nr_pages = nr_pages, > + .status_change_nid = NUMA_NO_NODE, > + }; > + struct node_notify node_arg = { > + .nid = NUMA_NO_NODE, > + }; > unsigned long flags; > int ret; > > @@ -1173,21 +1178,16 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, > /* associate pfn range with the zone */ > move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_ISOLATE); > > - node_arg.nid = NUMA_NO_NODE; > if (!node_state(nid, N_MEMORY)) { > /* Adding memory to the node for the first time */ > - cancel_node_notifier_on_err = true; > node_arg.nid = nid; > + mem_arg.status_change_nid = nid; > ret = node_notify(NODE_ADDING_FIRST_MEMORY, &node_arg); > ret = notifier_to_errno(ret); > if (ret) > goto failed_addition; > } > > - mem_arg.start_pfn = pfn; > - mem_arg.nr_pages = nr_pages; > - mem_arg.status_change_nid = node_arg.nid; > - cancel_mem_notifier_on_err = true; > ret = memory_notify(MEM_GOING_ONLINE, &mem_arg); > ret = notifier_to_errno(ret); > if (ret) > @@ -1249,9 +1249,8 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, > pr_debug("online_pages [mem %#010llx-%#010llx] failed\n", > (unsigned long long) pfn << PAGE_SHIFT, > (((unsigned long long) pfn + nr_pages) << PAGE_SHIFT) - 1); > - if (cancel_mem_notifier_on_err) > - memory_notify(MEM_CANCEL_ONLINE, &mem_arg); > - if (cancel_node_notifier_on_err) > + memory_notify(MEM_CANCEL_ONLINE, &mem_arg); > + if (node_arg.nid != NUMA_NO_NODE) > node_notify(NODE_CANCEL_ADDING_FIRST_MEMORY, &node_arg); > remove_pfn_range_from_zone(zone, pfn, nr_pages); > return ret; > @@ -1899,13 +1898,18 @@ static int count_system_ram_pages_cb(unsigned long start_pfn, > int offline_pages(unsigned long start_pfn, unsigned long nr_pages, > struct zone *zone, struct memory_group *group) > { > - bool cancel_mem_notifier_on_err = false, cancel_node_notifier_on_err = false; > unsigned long pfn, managed_pages, system_ram_pages = 0; > const unsigned long end_pfn = start_pfn + nr_pages; > struct pglist_data *pgdat = zone->zone_pgdat; > const int node = zone_to_nid(zone); > - struct memory_notify mem_arg; > - struct node_notify node_arg; > + struct memory_notify mem_arg = { > + .start_pfn = pfn, > + .nr_pages = nr_pages, > + .status_change_nid = NUMA_NO_NODE, > + }; > + struct node_notify node_arg = { > + .nid = NUMA_NO_NODE, > + }; > unsigned long flags; > char *reason; > int ret; > @@ -1970,20 +1974,15 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, > * 'nr_pages' more. If so, we know that the node will become empty, and > * so we will clear N_MEMORY for it. > */ > - node_arg.nid = NUMA_NO_NODE; > if (nr_pages >= pgdat->node_present_pages) { > node_arg.nid = node; > - cancel_node_notifier_on_err = true; > + mem_arg.status_change_nid = node; > ret = node_notify(NODE_REMOVING_LAST_MEMORY, &node_arg); > ret = notifier_to_errno(ret); > if (ret) > goto failed_removal_isolated; > } > > - mem_arg.start_pfn = start_pfn; > - mem_arg.nr_pages = nr_pages; > - mem_arg.status_change_nid = node_arg.nid; > - cancel_mem_notifier_on_err = true; > ret = memory_notify(MEM_GOING_OFFLINE, &mem_arg); > ret = notifier_to_errno(ret); > if (ret) { > @@ -2087,9 +2086,8 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, > failed_removal_isolated: > /* pushback to free area */ > undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); > - if (cancel_mem_notifier_on_err) > - memory_notify(MEM_CANCEL_OFFLINE, &mem_arg); > - if (cancel_node_notifier_on_err) > + memory_notify(MEM_CANCEL_OFFLINE, &mem_arg); > + if (node_arg.nid != NUMA_NO_NODE) > node_notify(NODE_CANCEL_REMOVING_LAST_MEMORY, &node_arg); > failed_removal_pcplists_disabled: > lru_cache_enable(); > > > Not sure if I like keeping the cancel_* stuff. > Strong opinion here? Feelings? :-) Looks cleaner to me at least :) -- Cheers, David / dhildenb