From patchwork Wed May 29 17:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13679309 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ECB34C25B75 for ; Wed, 29 May 2024 17:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xAF1KFG8cpGfX6mUpbrHwkP/qZofeMx0qGluHZDomlI=; b=ovLwxLqGYoPvyt n0M+w7y3cZtCgVs7hsB32Nvd6+z5Vxm+bbXrh3G7RMXBFlPERtvogcXgPKh1nPAfRVhCosbo8FG6V uzim6+to5cQV3rH4juh2Vy3nB5K0bCIgfi79b335teZLs5KHI3hcWkgbgOSlAKsf18+cWKF/wum/T 4d4h9mVfS4uNluJhyN4Ir5836si90MQ2y0+uR/ejkuCCGBvtBUII3cUOoMLvMfZRv5CkCg6kudCNN 2lncb7n9grsPRwdxDa76KGbbcC7NO/JKqmzIYaSPrxINIK4Rs9CYpaG/Ue/hoD5/ikexEXVtezjHL 4EiKdgj3mn8YmDp3allA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCMtP-000000052G8-3CLG; Wed, 29 May 2024 17:15:15 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCMtM-000000052FE-1Bhi for linux-arm-kernel@lists.infradead.org; Wed, 29 May 2024 17:15:14 +0000 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4VqGB66sVPz6J9y8; Thu, 30 May 2024 01:11:10 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 8666A1400CA; Thu, 30 May 2024 01:15:10 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 May 2024 18:15:10 +0100 From: Jonathan Cameron To: Dan Williams , , , Sudeep Holla CC: Andrew Morton , David Hildenbrand , Will Deacon , Jia He , Mike Rapoport , , , , Yuquan Wang , Oscar Salvador , Lorenzo Pieralisi , James Morse Subject: [RFC PATCH 5/8] arch_numa: Make numa_add_memblk() set nid for memblock.reserved regions Date: Wed, 29 May 2024 18:12:33 +0100 Message-ID: <20240529171236.32002-6-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240529171236.32002-1-Jonathan.Cameron@huawei.com> References: <20240529171236.32002-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml500001.china.huawei.com (7.191.163.213) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240529_101512_554880_74F49666 X-CRM114-Status: GOOD ( 11.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Setting the reserved region entries to the appropriate Node ID means that they can be used to establish the node to which we should add hotplugged CXL memory within a CXL fixed memory window. Signed-off-by: Jonathan Cameron --- drivers/base/arch_numa.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c index 0630efb696ab..568dbabeb636 100644 --- a/drivers/base/arch_numa.c +++ b/drivers/base/arch_numa.c @@ -208,6 +208,13 @@ int __init numa_add_memblk(int nid, u64 start, u64 end) start, (end - 1), nid); return ret; } + /* Also set reserved nodes nid */ + ret = memblock_set_node(start, (end - start), &memblock.reserved, nid); + if (ret < 0) { + pr_err("memblock [0x%llx - 0x%llx] failed to add on node %d\n", + start, (end - 1), nid); + return ret; + } node_set(nid, numa_nodes_parsed); return ret;