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 335CDC83030 for ; Fri, 4 Jul 2025 06:34:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCEAC6B800F; Fri, 4 Jul 2025 02:34:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7FDF6B800A; Fri, 4 Jul 2025 02:34:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A95E66B800F; Fri, 4 Jul 2025 02:34:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 98CA66B800A for ; Fri, 4 Jul 2025 02:34:37 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 53D87161D9B for ; Fri, 4 Jul 2025 06:34:37 +0000 (UTC) X-FDA: 83625618594.09.2E4596E Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf27.hostedemail.com (Postfix) with ESMTP id CE3D640005 for ; Fri, 4 Jul 2025 06:34:35 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="cexl/oMt"; spf=pass (imf27.hostedemail.com: domain of hare@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=hare@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751610875; 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=i+hYmpsWeFHzUr9i/rTsATOjbUjxWznQl7yJUgJFSoA=; b=rzuvR/jjhNljKEDX0bjW6sZzu/A58kJoFaVLcOELst+VfKi3q33IVObd/6apMnLQRgYnml xLtRo+Q8Ag5SrW72aOwo3LsfpiG0WmqDPo4x1dvvQS325TRzcLASH+AnXGo0WDTXimIRmq jJzTmO+RoZjWe2r5VXO4bAKmxfzXv80= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="cexl/oMt"; spf=pass (imf27.hostedemail.com: domain of hare@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=hare@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751610875; a=rsa-sha256; cv=none; b=vF61jjdvKcjBUZQw06htlMT+VpTuJavZZTx8v/6vo+CnSCAqFcs17EgDx4Qd9lCoMUoIIi 67IPxbtqcE5GbIiThDf+C0QTrkuK64XTRpyaadTNJcgNTijm7LZq+xx+FVjXntEybLUoMX UX0x2kofsxo7Ak/eGoTZv4zmU7NsnKU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5313561455; Fri, 4 Jul 2025 06:34:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B441CC4CEE3; Fri, 4 Jul 2025 06:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751610875; bh=hElxvrZPbD8hIHn9k0ooxHEHjwdskaD4GGa01exKFvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cexl/oMtg8bOK9pGvi1NoCaRj+PEghpZGWWZLMdGB0WGxv6V4sKCx0aH5t3HsGdbM zMpuL1xlOPR9FN78IrHXg9OVeN6XVxLxHMngaYYIABayeS4dnerzaZOhEq4+tgLSip HiQWK/H5a7tf6goEZ/+C0/zez3oSCBK+ask5Z9TLCOYxjyoaBa9JTpyXPFI+sLeLMe uLyCzI7lDwB0WIMX85axJHcdLbv0Q14caUV78PH8lF7odECG48te3OnR9/5vQX9sQb x5hwmg1BgHgCkRTfRnnDrqAv65tEKxlu/RRXyvAJoGJDeYzjHkoch4iDqyTe5rcRo+ 3RjNys8cCKGXw== From: Hannes Reinecke To: David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org, Hannes Reinecke , Donet Tom Subject: [PATCH 1/3] drivers/base/memory: add node id parameter to add_memory_block() Date: Fri, 4 Jul 2025 08:34:02 +0200 Message-ID: <20250704063404.27495-2-hare@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704063404.27495-1-hare@kernel.org> References: <20250704063404.27495-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: rs5uarkm1i119zi7ddw9uh7gxdyc8xej X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CE3D640005 X-HE-Tag: 1751610875-528104 X-HE-Meta: U2FsdGVkX19HPJ08aRGgT2Zv/tz0ro9e8rMedMUxwaIJbmbopjXRa4fgjbydArz4aPG74mBjzeEEwks1r0LXztrMvANfYFuPfSTvC8hy+UY+u91ybNsly9oKOTVF2RlbNduqj3p0/bMhZHt2jEWx4oj/+mH6A+sfi8Blkl7Kwu+6qzjonhjEXhbfuh9qZWATVi6x/iKvq4q/Rca3WBPNrZWchEqRLZdSgmQ5tIrPI0EChJtMTDJYDwnzjymjqpoBSFmGcKDNN7vmgwzJGUAorHsnSmeSQRbrFGBT64N91cqXijSyY4uTRYC63PxccA61/ByKNvC0+GF+rHeW+8j1eFSNjcSUSpLlzyaSeIlxSSRimW6VFcR9+rReM9WtHdbTg6gWV4qzm9M/MwbC4TQ1Gc5EMdciZVpGKUSi/JSEf9sHH+ekiyUuOMCZveHe5R6f4ozIwSnceLnn4077tYnh91NNqWmSR8w6Ux6tIemq+GbRY/NO0u9DtBftBxNPupDzJZY1gp1uNKVGoUhCHOBIe9PWboPqPU/5cjUjFTTGY3Jpr25ETEekbD+Cm0Bm9F++ZeS7TGjUoFDlG59SBalqgwwSfYZ21x9V6MQb8ouGFb8VV92/RNmElHmP0w8nygcO0luCZ98zex4kN9cZytKis120qS7+Grw1y2/2/TkiV/FYD7lmxXpE8CHi3lRMrU5tJO2ZKeKQyA4orcMWsjqK5lKmfOt2QL1R568OGDcaY+8SFDWrLCHiV63j7IbgBhacEIFl6/37HtdrDhFEz0WKU68xy4WpU43Iazd7WUN462oDHOVn2zzKJ7/bYK0PSmFPpWeYxezhQX/9/n2E9jXEiqVdwbmDSqJ2iYI9EMaxvgdIaRWquHq+HiMXOSZyRIM+5t6BDdudbUhnoBfIazgtOU57CS3cEuBJdcQCvREColdFbhWfDf42gnEbqoOE8xCa71K/0ItlklIPrygYcME koXzGILQ ZU+nJgzY9xdUdaktNnwGsuP/LQ9Xda7u1IsGFGS/ksENehwJA4ySbBgu95yqrF1XJXpmRw9xlo8bWolHNPhlLcWuABuTgY+DGZZFYdyG2vbP1FJ4ua162w8dNP/Jm6qbPtN3F3+uN0wn9qjfCHKtR9m88iyUr+y0O5eL97ifs524R5idcemhtrMnqONS/XUmQ6ALlcUkBO0ChrcJZm5ZV/iT008B/8Dc/+kqWAsGccTtIc0gnFYVAcCQgkt8X5o6C27yuLMCntj/TQ+60H+Y07qPZGn9lqmKKL3nPonIOCYUWF4/nAHFzmFyiGVGrbVxIy+XX92JhJ897cS8vplSL1JO7JpskfDtKhN5Y 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 Reviewed-by: Donet Tom --- 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