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 66D31C8303C for ; Wed, 2 Jul 2025 07:39:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6B8B8E0005; Wed, 2 Jul 2025 03:39:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF4E08E0001; Wed, 2 Jul 2025 03:39:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F93B8E0005; Wed, 2 Jul 2025 03:39:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 870598E0001 for ; Wed, 2 Jul 2025 03:39:26 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 19A5280751 for ; Wed, 2 Jul 2025 07:39:26 +0000 (UTC) X-FDA: 83618524332.13.228A11D Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf01.hostedemail.com (Postfix) with ESMTP id 86D8940005 for ; Wed, 2 Jul 2025 07:39:24 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kWqem6h+; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of hare@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=hare@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751441964; a=rsa-sha256; cv=none; b=SjX4VjqCX9qk0j2CeOydM5NbbBMqKWLhSrQa4m5B28xhoO/QDE3IaUYOORZ2CMSuGhBmQN 3vRVLcykIVQ9dqrpmreIUL3iVKcxySudUy/4s1smVjYnMalmShu9sxBxatp9OMLjbj6+7X Sv5Tw/qwU0i0BuPqT4ZydBPgAihu6go= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kWqem6h+; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of hare@kernel.org designates 172.105.4.254 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=1751441964; 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=z59Bm4RMBvIueTQ00gVcraZmmDQLmZK8M5rfcMbWfbw=; b=jG62GjH6vvOAy8/EWxV9oDXyMneHGhlQEYi0DRnFgNpP4Ub5Id9kj20f2yC1VGk+FD5Pt5 uL0m8bYMZaA81RX/nOEanqzZLLSULoNw8GOIC1I6NK5XubOnfLt156kyuURkgogTr/vLum jt+7Ga41nJosU/CmZQC9Ix8d8Fy0HaA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 17D5561424; Wed, 2 Jul 2025 07:39:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96480C4CEEE; Wed, 2 Jul 2025 07:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751441963; bh=tyUEmDaHupKKwUU2gjRGWvjaEXgh6XZxRhsOHVvD2k8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWqem6h+GSM8m0mglBtell3tNZL/JRxL1+bS676Kdz5EWhEZaYZmUS2Zy1SpFVJZq tracsO4Q7VbdFB+0KnS7uyxVFWkciJglI3mQZAvYffeVE9tSX8wHCXeja4SXApExm2 E+CQDT+QZvHP3BWjhRq/v5AOvzHxPvyU7Gjt481fillXRKCuooVr2SX+eb4PgxZQnL 5WhDiwmb4gItNwrSppLq5e2CjbjWtwbhM6to6YtchuS1kgYFrYQWh0tEh0x3fHbHQ8 8v1TXnzIHhYBQ2Fos39EvoosNEHz6fxWRIk1OAkYnlnWfbkwzcHuDv5boNvuXsqaDz 8NDZeyuxBZV6w== From: Hannes Reinecke To: David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 1/3] drivers/base/memory: add node id parameter to add_memory_block() Date: Wed, 2 Jul 2025 09:39:11 +0200 Message-ID: <20250702073913.58247-2-hare@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250702073913.58247-1-hare@kernel.org> References: <20250702073913.58247-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: bez8yp9hjdzao44k1d799temtu1kb4a4 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 86D8940005 X-Rspam-User: X-HE-Tag: 1751441964-476554 X-HE-Meta: U2FsdGVkX18cHy4lN00/hFkai898SvX5g4+VbHoBbLwi/j7F65lX+z1fpcHhhbkYC6QKpwf5njtQoZN7EI+z51MEE8hBI9X/jgggNZ7dQH8l91nvugoikHUrnPP4+ivlfQSxFdGS5bi9OVd/LhK6QNsE+L7ednxqgOLVd3DwJzPVGz1oK5KvrPCfjvqKRQTt7i+Gvq3H5vNLZMVj5bgrazldTesXq/i9GZNJ5U/P+NoD4yfNHQJ1gC4hZZn3xOHI/mGM4opY9sCUQuZBXZIVpAcqdsr+OPy+bS/AIscZTTzDmy5I/tzeVrWjayzThCZDn/u9IlRH5Hnnk2qy4R2axpaOlepNFw3KtUXFVau86XHIV0QZPCoowi55WQILzDmVys5nI7YPR3rnR2YJ7VsAhcncpzIVqRjlibA7w1wCiB7RUWiS2JZN2TEuzvUYU2ZPkSovp2EPnSJDr3lKmGnkCB//1Cbw6BskAvy3gp6EozS3rgKZ4jshCDysk2nX2fSth85oLMAa8JeEWtqhkVQMSu8C6CNY85JWdJAoFxbsnUFMeKWdGvY/9CkoP2grSkmEkxLDC4KPHFdt+zeuh1MDFDoelzez/gdB66+hY+LDTrkq0CtMKdTtK5E/tm2Sj6xiN2A5jsv1Jb0OKeRs0gF7aghZBlPB6eg6BJ2INCkRTrZmwjWxPbAL1RD9dyOYSeOmjly9FT3yJ7YX3dPB5Q/1TV6s60PEKieZUkHa70laSTH33GyHEfmzWfO1xxoXkzctf7X0bGWmE/qBikhFYLHb5RCMLdXPAjMRrlW6lUEakjWbd7Nj+ZUIBWFh/KF0+KwEnMvOg6ghzbvNv557ApWHxqnDLjGWxWZ0It/3cwyTvoLjjtmGPwQ3oXatBp+aF3x7Do7mEe4yJC+trhxDhAB84MVMlW5u55WwUakR1lCyUpFZv2gJ32ImTMWWV3bgs09IXVcxgNj3v5/qWvN5lx5 IeWe8WKw J0TG1a9vBqDP9fhcby6EqBlgtRrH/OsEAI4RFTFSW5EiUejg1fBLDkD/c6eIF8LUGvdPj+5djzwtAv0/RlzJcla8DRxYoEZlht3C743Fig1b8k+OGeV2aYoZ2F9JagQ1PiQ0UDAjHUAdAZ36lkE+YcCH3J+babYl9US5IwPxEZ3YQsIZIWlvJnCKOKjnkvvmgN9eVH7SZqRiIv1m2+MTlCF18AT9Gnt8OYyP4bc3N/ObQdozXMz/RA9vdyWc/HmAfr/UfEdV5YmzjaRcZegP3Z/SzmbJkcd0jh4+bqDF5V8yC8gfVpg7Cg6+II01+rj6+SSlfMPn3ixtmc/g= 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 Acked-by: David Hildenbrand Acked-by: Oscar Salvador --- 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