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 7683FC8302F for ; Tue, 1 Jul 2025 11:42:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 022576B00A6; Tue, 1 Jul 2025 07:42:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3AF96B00A8; Tue, 1 Jul 2025 07:42:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2A046B00A9; Tue, 1 Jul 2025 07:42:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D34336B00A6 for ; Tue, 1 Jul 2025 07:42:05 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 88FA9124186 for ; Tue, 1 Jul 2025 11:42:05 +0000 (UTC) X-FDA: 83615507010.10.2C85229 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf15.hostedemail.com (Postfix) with ESMTP id DCB07A000E for ; Tue, 1 Jul 2025 11:42:03 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=B21ysZQ+; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf15.hostedemail.com: domain of hare@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=hare@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751370124; a=rsa-sha256; cv=none; b=C9+KXvRcQNhovS8NeecNNBnYn/zx7lwACHPXk2KlTsjKtNt1bYfPkuwweRB/7HhXx6cbjq ajZSm7fX4cOFSMqrpDfcCIIU+9ECR9XyQs6i8GAeWWSdynaoWwC4c4XD51d0STdILiHs2D FfrIyglj5UN9A+qyjJUL/dgEuP6/mT4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=B21ysZQ+; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf15.hostedemail.com: domain of hare@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=hare@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751370124; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QXJIZrfHWO+QMqB+2yK9TeShCr5IFI3MFrT7lymZ8GQ=; b=VYdRYP2LZDEtPITlPpR4IuK/xZwLym4UA86Ae/kqtySntho1uEQIgoPeTN4nGMWLbZxgjL w9jY2LmasHIwhZtodsEzfxLeq7e+m8lLBBk3IN5X4EkqKsXBmRC1bjuhs7vO5tlHl+7lkK jNtSQnUx+A/V4E1ujITCLyv73wTts7M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 73F46442B3; Tue, 1 Jul 2025 11:42:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E262C4CEEB; Tue, 1 Jul 2025 11:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751370122; bh=8MMHAjOcAX2NZ+JUT8dF/7YWZYYlW0j6xXQNk7RtfrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B21ysZQ+8pK5eX0PiBb12+qSPrzl6ItFypd0s0/jafmmqUIAfLCqooWnUKOjLBpgR sOTMXMgZRqQ1JP8LPOBpx+XBnh3QhUzmkLzzi/zaKw+QdMPfrWRRkNj6e3bMELyY4F ufIiqGVLw0k8XBFcsI0ZTE5Z6N7Wz53/ozGQb2OUCzwUUB0s2ejFDO1C4GIyKisAn1 iA/xs32m+mOcc0v48i7ok9PKu2FQb85a+QdbN+uwjNaV3e5v/LeFh7kRtFVLx4apxn YPaIqK058ENxH9dEslDHvxLmd1G1Vkd9a2C1UmN1lLgahKYmW5hY+NuQv27KqQCBYu jYVs9+HMkMQFA== From: Hannes Reinecke To: David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 1/2] drivers/base/memory: add node id parameter to add_memory_block() Date: Tue, 1 Jul 2025 13:41:53 +0200 Message-ID: <20250701114155.16452-2-hare@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250701114155.16452-1-hare@kernel.org> References: <20250701114155.16452-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: DCB07A000E X-Stat-Signature: k1en13ykde9s651wccigmris9ybprwr3 X-Rspam-User: X-HE-Tag: 1751370123-77066 X-HE-Meta: U2FsdGVkX1/eRixb4b7cy7rGRe7IpYIK90zFSEIX5r8Y54HgyBTBKDwytVboxL9DCko8j5TW3ekOcnBRvSrefYjNOfGSsK3Cl89YWxDRIahSvvewclGflwV+lLIXNB/T8fCbGgOmW0+cVlS/tgLrBs/VU939eFJzVVaRhuIebIVlIqSibgOZkI5M7+zgkMJGVQ1AaODTHwdPYhcPVBHAzrNPP137AkS9+VrnMaQjMLcZqTiVNsz64ppFKtZkGTOJ4LLA9TfGXo4wXUkyd44sjFvRBz6i+uIEIQAzJLBy/yTrTLAvB/KhKgua5Z0Sr0zkRHItMJT8NWUVYUKutq0LcwNKaMqzhLFtPV1NHE+sJcJPNqHgVFrkA7Aw2EPBwQ60UvpCMux5GKrouyZJ9zveuxThEQeotGNivx13WNey8dQIiy4AgD9oVmGvz25lE/ECKfrdZUe0xJTGyNP2X6objjkLQe5GRBccUerXWUjkMO2cBidD1QVqY+nL87O3CRaTxKKIoRGRDfK9nBNxyqvHl/e/biU4o30Wy7f1foFO54HzJKibtKniEkuo4YzCtVQAfbBYVdzSZtEcGYBejOMIdT7u0AS07uVRXVuQfmcJ2VOjR0OSQMQslRNgDQUSmfBbPgRG1LLojmw8upzJLrNuF7d8dUvAHQm1NavoTBAEjNbJBFwpxm8vRZw1jC1H1qfw3gZigEKI8IrO3Ex2mimY0m+5PsQVD7zIkkmycnT64rWtqRuuDdB7guRe0MjTKJ5U5Vcbs7fI9pqkUvZeITENasJdluLGLkjhmdsYnGIjoMXSzdcBYnC7q2NflFebpTYvDAYQeEuWmDsM/VvytrnGZeX5amvCUcOWRA7K+pRdeQv5BuEOCu391LXxLge3nxGqxaX5BuwEQ3pOGEIUEypmbN7I3wJnCYVldp3Uw/Ps2go5YXb0Us0BjN7HVpkaTWyCAy0sBB7WXHuU/MKzhqy EC77Udsq jWzgB8HLx3nCi3EAS7x/KIBJsyk+P36HM9eohA4E2TW+7iZr6uOK7Qyon/P1GLDe00CnbF0xdrKsV5Ru5fTxxiLMHIxEwnejbKI4kWC7QOtx7QNTZTaqxmTbm8i2e051ikVc8bzPkOenKODeh2MndMjwqQT3d6LX9d5SkU8GNW5682EW1cCMvmYF+hdsf4QM6THadB24U1uhlx0lPxNvJHM3wJIqT0rS+dIQ0tvfGcePP03mTTFznIjn0kYhzPnEi7qqojLxWuye8RSn9IJrTiBg+DvTvDgIrzAbMTZjGUC9hB616hR8Pzbd7KA== 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: Add a 'nid' parameter to add_memory_block() to initialize the memory block with the correct node id. Signed-off-by: Hannes Reinecke --- drivers/base/memory.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index ed3e69dc785c..2b951e5f8a27 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -822,7 +822,7 @@ void memory_block_add_nid(struct memory_block *mem, int nid, } #endif -static int add_memory_block(unsigned long block_id, unsigned long state, +static int add_memory_block(unsigned long block_id, int nid, unsigned long state, struct vmem_altmap *altmap, struct memory_group *group) { @@ -840,7 +840,7 @@ static int add_memory_block(unsigned long block_id, unsigned long state, mem->start_section_nr = block_id * sections_per_block; mem->state = state; - mem->nid = NUMA_NO_NODE; + mem->nid = nid; mem->altmap = altmap; INIT_LIST_HEAD(&mem->group_next); @@ -867,13 +867,6 @@ static int add_memory_block(unsigned long block_id, unsigned long state, return 0; } -static int add_hotplug_memory_block(unsigned long block_id, - struct vmem_altmap *altmap, - struct memory_group *group) -{ - return add_memory_block(block_id, MEM_OFFLINE, altmap, group); -} - static void remove_memory_block(struct memory_block *memory) { if (WARN_ON_ONCE(memory->dev.bus != &memory_subsys)) @@ -913,7 +906,7 @@ int create_memory_block_devices(unsigned long start, unsigned long size, return -EINVAL; for (block_id = start_block_id; block_id != end_block_id; block_id++) { - ret = add_hotplug_memory_block(block_id, altmap, group); + ret = add_memory_block(block_id, NUMA_NO_NODE, MEM_OFFLINE, altmap, group); if (ret) break; } @@ -1018,7 +1011,7 @@ void __init memory_dev_init(void) continue; block_id = memory_block_id(nr); - ret = add_memory_block(block_id, MEM_ONLINE, NULL, NULL); + ret = add_memory_block(block_id, NUMA_NO_NODE, MEM_ONLINE, NULL, NULL); if (ret) { panic("%s() failed to add memory block: %d\n", __func__, ret); -- 2.43.0