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 A0F7DC83038 for ; Tue, 1 Jul 2025 12:09:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B3E66B009C; Tue, 1 Jul 2025 08:09:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 18BB56B009E; Tue, 1 Jul 2025 08:09:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07A856B009F; Tue, 1 Jul 2025 08:09:15 -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 ECD416B009C for ; Tue, 1 Jul 2025 08:09:14 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C3FE914036D for ; Tue, 1 Jul 2025 12:09:14 +0000 (UTC) X-FDA: 83615575428.13.A974C13 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 40C6F18000D for ; Tue, 1 Jul 2025 12:09:12 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JlfQ2LkV; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.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=1751371752; a=rsa-sha256; cv=none; b=7huACZtBa5AdCudokGSEh88ArxZKk3pG3zxoML15buLEqcZtCPQvse4WojXXCP2fMnOwxY W0wyciW06aIE/qVz8IXgKOv7Db7aJEd5+DCz6Zf78FU9gclZrs9BDVRCpCV6dpMXGsa+o6 EbC/Y4qse8hOc1WpQnwNqRFV+2ZO9EU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JlfQ2LkV; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.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=1751371752; 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=UeueX1j6qu7I56Apj3I1tMz7FSRLzqaeup01UuRfMcw=; b=Hj2Sl+pY/I8pVjYQgLY158FJevGEPvW6rUrM9rF++1wlkaFL82EnsJUeE8JDnQ177ZRrOA ChWnq7wvJQsIYIE54EpQcCxg/+bm8nJgES+5El+Jr6MKWRHdHiAfXxibVRXrHOXzPWf9Yt tEkYlltqopQuQ4MmH16or5l+NHS480M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751371751; 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=UeueX1j6qu7I56Apj3I1tMz7FSRLzqaeup01UuRfMcw=; b=JlfQ2LkVEQS/ohqM+E4WGeoXIK4Wz3uTpTBUYDPGx9BcnNIQSyMZ7IRWXR9XeF+g1aKQtm GLmBtUJDgcQvoHmHqfUGsG+E78sZSvzFu/Fi5LKP2/AU0KX4wWpd7TX9rokWkzlrHcxMVS hCWeLLkzgDTLHuk0I1o8UC5gRlTfCVE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-306-baz9CSRANEqkGJQNKc2QNA-1; Tue, 01 Jul 2025 08:09:10 -0400 X-MC-Unique: baz9CSRANEqkGJQNKc2QNA-1 X-Mimecast-MFC-AGG-ID: baz9CSRANEqkGJQNKc2QNA_1751371749 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-45311704d1fso19621665e9.1 for ; Tue, 01 Jul 2025 05:09:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751371749; x=1751976549; 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=UeueX1j6qu7I56Apj3I1tMz7FSRLzqaeup01UuRfMcw=; b=BV5tY6/g7Ca6oK7XE0kQAzLHBK//Dlh5HgtK+BgOftYMFioGiV0JfpsXOgM912/lqn 0KuVUwjxynl/4bsc7Ycm/dfc/rwFtK0xJbzZZYdYtgSy30KR6fIzN91teAqWRhKTy5IM DrgtFV0V+uu3c/pmTuKhOgT4jhOKH3bbzM9rMM4QZxdkMuCPIsXtThcgZjH4P+mvpcjF HTQdy61z0g9j1/KFgNBfoRr/uGTcBaIaTZa2FXFcibrU5WrJqfecgHejkPYB8WsjD8Kg 9iI5hjglOtUBb4sFjZ2rC6K/XyqRvbfq6oS+brqY5BCgmrRF+JXzKYZA/+tckogPro2y pZwQ== X-Forwarded-Encrypted: i=1; AJvYcCUxZWqjk0JGRa949XxJohWsrg4wpMG+paXYquuVECpWbJeBvD87vN4JO1S0ojm15PbGXZCIFbr4Iw==@kvack.org X-Gm-Message-State: AOJu0YxXNjn0Ktaau8TIUc6HddkBZ9AcVbNy/xbQZpLhh/gk17bk/dGt hdJzJpBUh8IcIeztqPF72zqyPQ5lYEeMsM43D60NpfJW/mxZdzsV0D0XeyjL4uAdY1ElkUYidPh BBzq60naDa0CSvF82Fh9yPcFUGy9H0uO3jI73HxW1V50Goqk25/sa X-Gm-Gg: ASbGncvb3ysn2sMVGcEu1Dki8vwAzV7JqXasZ0sUgz2Rf1Vz2n8kClbI+fFEW1F6E/J 6xSQQBnb8e9l2XGQqIbosBd8b0KEaFJZMY/d0Gr3DrwNXiqv1f94MG8tp3cC9ujc0/DIDxmKjEW PrAQB+oVpKrzunFK27NodF3oJPFEuu0whZeds10hAfHOrkRJlgVrbeLQcRMSQr2mYxrmjruculA Hm2i+ZyV2vRLxeLFxvFOa8uS6SwZbruWFG4+XAOBVOrMhWKngPPDV3OrpGaM0TPsR73qiDbgAsZ D0EVduQQG9kh7WAYRpCIw8Q7k13V9HjBeFdiEaNmYWUjoF063UOpFDIXes51slhTqrLvDfdqd6A Z3WbjUqjeyJQ2yMi6D5YtvzED4y9Cmy5LjpsO/ZqLyW0DTN8OMw== X-Received: by 2002:a05:600c:c4a7:b0:43c:ea1a:720a with SMTP id 5b1f17b1804b1-45391b6b961mr146554635e9.1.1751371748861; Tue, 01 Jul 2025 05:09:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpXgWiN/VorXxH8v2e+K88ufv0HQ/DCTuBzOGrMXCLMj6LYx2Nat8+hFmMQYiilMDCcf4cfw== X-Received: by 2002:a05:600c:c4a7:b0:43c:ea1a:720a with SMTP id 5b1f17b1804b1-45391b6b961mr146554045e9.1.1751371748162; Tue, 01 Jul 2025 05:09:08 -0700 (PDT) Received: from ?IPV6:2003:d8:2f18:7500:202e:b0f1:76d6:f9af? (p200300d82f187500202eb0f176d6f9af.dip0.t-ipconnect.de. [2003:d8:2f18:7500:202e:b0f1:76d6:f9af]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453823b913esm190389795e9.33.2025.07.01.05.09.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Jul 2025 05:09:07 -0700 (PDT) Message-ID: <58715af1-2fe1-46a1-a5fe-3ee0e126bf63@redhat.com> Date: Tue, 1 Jul 2025 14:09:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] mm/memory_hotplug: activate node before adding new memory blocks To: Hannes Reinecke Cc: Oscar Salvador , linux-mm@kvack.org References: <20250701114155.16452-1-hare@kernel.org> <20250701114155.16452-3-hare@kernel.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250701114155.16452-3-hare@kernel.org> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: y9vESc4Kso_tY8CLaggqmVur9HLKmOnEB4q3destdDw_1751371749 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: tyyyrioqfh191asj37xig87rf7fw467j X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 40C6F18000D X-Rspam-User: X-HE-Tag: 1751371752-512736 X-HE-Meta: U2FsdGVkX1+Ur7C0d+0OG4Pmv0z49ygs+fipPrtnWdSVBe+FLVezttmqSwaZ8ihpsHZN80CUAuajY4dXS6ScH61DfgH+6G+T3I35YKVkZWE/lMJiVGrsXDwz79KQ5eyR0FHSt3eWfGIkYZkqUTRUlaR4g9S5Io6HuQpQ67/UkLOvB5WKIrTgxeN4j9jMMMNHGvIH8Cr7OQjwO4ZQKTfMBcXfrFwOD1L6VXmbA889jeOYL2acRWpbbUvBN3oA9A/2ZvWqxHxEx+oP74LWNcz3Cufgn58ot8MlIk219eMqDwugi1xtO1jH3wfZMnMi5rCM4dC/1XgPwJtVrGulAOEqD945vOdlm2Cke0R31gJd0TcNVgDVTUUjq2agoe8W66Lm33C5wY1qnk5zIW5AbJYVCZq1yFuAi3+LGEk9eLt9+7ZT5nRs+8wYeLxB3qS1BDW77ej2Jtg82xp/w7lPBmP0menxEamJP937eWOWKERkMp4zngs0xriiOVAA+bKtMMuymPji+GvcT3ePeQsZLqwVKCrYYQWwVpruWKSuh7xM8FreIJSg8n/1JhQWhZ4Sq/vs5A7mV0BOS+/fKRjeWSoGKUobsWKRPan0S5CLq6DvpPiUo2ZGWAjf9E2Q1PUmvIaJwp/L3I3uhQxe+M9LT74CcNPyMhi9DgqdJ0sav3cY8Hm3mNhtouz6opKytl/k7RJwW6b2il+Ji0raIOIe8u7YdLJ+/9Q1QmnUyXqxOak8O3JlUGyE5A8rNmoK0+oZ75uUDG/8+3ZmD5r4Kw7RvGnNbKIljJ3vv1xC7fNXFUh0jqZLVlhqmKbezmXQ2g1jm3TPxJxpIWQlmihVz6WLL+KG79MKAl3ZU8KNdsrc6ntOJbotk8huWNrKjsMs2BmasMknbDMjZcMEAdlmgTtA5EdZn1Xv8Aqr5KtWkJkt2seHfIrMTkYwXVvKd3+jMQ210nWAJKuj7y3jlbssNJv0l3J ee0mPwds WAprPkxgOLCny5DX8Zt+KC0zTqZGpzSZ5LIDdhvQN3hT1xCiseTIrRoV3jgex7kdkqqKwEiW0IcWZ7sr3wALgO3Y5lB01ROJlRHRndXooHZ67JbRL/AETCJUJPHrZ+WxiSe9WH4ilM4DBzWeP2c35MVMQsBf0FA1pjvuEvH5zw9t9DqT/Us2wHwaj3utE3Dx9Dy8u31BOiH0XbrvWlMuAN3SE1hx2IaBiG5Yk38S3bS4IVGKlAFGzCJ6LbbE8kpRvQ09HuxLCUsgcUy5gKMIwdHS9+TpnSfOFlBnjAgaRD6semXQ6+ZuofNN9FFEn3wAJLjNsBDXqXf3cBJWUTLofGPVTScwVX6rQhxZGmoVbOVdVh5cpc3GwXsN3ipFFyE4DeIn2TIG+Ad1HpZ5fHBqiHc6CCRs24C30e2undABzfOyKPI/TBwkd7FJeLYO7yR/oTiTCF04dpUjhJVI81DS2ZvnApsyUixqm2bWA6c+azmTiyZ6GFgPihMNpoOhf+JnCkrRb5G9s93hdQ+cVhez8Vq/+Znrc/phSQXtVDwejkwS67aqxP+aeTkex403wSgwU+/Du 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 01.07.25 13:41, Hannes Reinecke wrote: > The sysfs attributes for memory blocks require the node ID to be > set and initialized, so move the node activation before adding > new memory blocks. This also has the nice side effect that the > BUG_ON() can be converted into a WARN_ON() as we now can handle > registration errors. I think this should work. > > Signed-off-by: Hannes Reinecke > --- > drivers/base/memory.c | 19 +++++++++---------- > include/linux/memory.h | 2 +- > mm/memory_hotplug.c | 32 +++++++++++++++++--------------- > 3 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 2b951e5f8a27..d24a90e0ea96 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -810,15 +810,14 @@ void memory_block_add_nid(struct memory_block *mem, int nid, > mem->zone = early_node_zone_for_memory_block(mem, nid); > else > mem->zone = NULL; > + /* > + * If this memory block spans multiple nodes, we only indicate > + * the last processed node. If we span multiple nodes (not applicable > + * to hotplugged memory), zone == NULL will prohibit memory offlining > + * and consequently unplug. > + */ > + mem->nid = nid; > } > - > - /* > - * If this memory block spans multiple nodes, we only indicate > - * the last processed node. If we span multiple nodes (not applicable > - * to hotplugged memory), zone == NULL will prohibit memory offlining > - * and consequently unplug. > - */ > - mem->nid = nid; In stead of that, I suggest we do something like this now, because the function no longer makes any sense for hotplugged memory: diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 5c6c1d6bb59f1..fb501df920cec 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -769,21 +769,22 @@ static struct zone *early_node_zone_for_memory_block(struct memory_block *mem, #ifdef CONFIG_NUMA /** - * memory_block_add_nid() - Indicate that system RAM falling into this memory - * block device (partially) belongs to the given node. + * memory_block_add_nid_early() - Indicate that early system RAM falling into + * this memory block device (partially) belongs + * to the given node. * @mem: The memory block device. * @nid: The node id. - * @context: The memory initialization context. * - * Indicate that system RAM falling into this memory block (partially) belongs - * to the given node. If the context indicates ("early") that we are adding the - * node during node device subsystem initialization, this will also properly - * set/adjust mem->zone based on the zone ranges of the given node. + * Indicate that early system RAM falling into this memory block (partially) + * belongs to the given node. This will also properly set/adjust mem->zone based + * on the zone ranges of the given node. + * + * Memory hotplug handles this on memory block creation, where we can only have + * a single nid span a memory block. */ -void memory_block_add_nid(struct memory_block *mem, int nid, - enum meminit_context context) +void memory_block_add_nid_early(struct memory_block *mem, int nid) { - if (context == MEMINIT_EARLY && mem->nid != nid) { + if (mem->nid != nid) { /* * For early memory we have to determine the zone when setting * the node id and handle multiple nodes spanning a single @@ -836,7 +837,7 @@ static int add_memory_block(unsigned long block_id, unsigned long state, /* * MEM_ONLINE at this point implies early memory. With NUMA, * we'll determine the zone when setting the node id via - * memory_block_add_nid(). Memory hotplug updated the zone + * memory_block_add_nid_early(). Memory hotplug updated the zone * manually when memory onlining/offlining succeeds. */ mem->zone = early_node_zone_for_memory_block(mem, NUMA_NO_NODE); diff --git a/drivers/base/node.c b/drivers/base/node.c index bef84f01712f3..6cfda015fdea6 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -786,7 +786,8 @@ static void do_register_memory_block_under_node(int nid, { int ret; - memory_block_add_nid(mem_blk, nid, context); + if (context == MEMINIT_EARLY) + memory_block_add_nid_early(mem_blk, nid); ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj, &mem_blk->dev.kobj, diff --git a/include/linux/memory.h b/include/linux/memory.h index 40eb70ccb09d5..bc805205ed258 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -202,8 +202,7 @@ static inline unsigned long phys_to_block_id(unsigned long phys) } #ifdef CONFIG_NUMA -void memory_block_add_nid(struct memory_block *mem, int nid, - enum meminit_context context); +void memory_block_add_nid_early(struct memory_block *mem, int nid); #endif /* CONFIG_NUMA */ int memory_block_advise_max_size(unsigned long size); unsigned long memory_block_advised_max_size(void); -- Cheers, David / dhildenb