From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E14221DA327; Wed, 3 Jul 2024 11:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005963; cv=none; b=AVQqmBz02XPE+pub79b0zicocVH2EPU5jfLPOrr3ACGPAVpCSf4Oz54U8H3Z1fdxSnnWmkSP5XBlWBdVoU+DPen8PFtLtqB8+ZzFLW22ezSk42ZahTntP6BbX+gPcQXNIxz5BNJv4Q6oPAOT068P/rW7uf9e9Ag7W1ZHKXexmH8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005963; c=relaxed/simple; bh=FrVAIJ1pRk/cbvfojJ2VQlVgSPMcZu8lqfdXW9J5Nic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/sl7NtNdpIn3iS0Kiycv7XnWvNk4u/oYCw3yYzIijrt58zaVZnRd7NNzMiMT5i4V1Up/e1duWrHGtZOVwJnDWNwg8RDMG5fSbzJbX23KjlrVRdt0PLtdBlT3k9cAC5em4X89ZQtSb1jtmWRlIzoLjIXo4XEIqzEtNEUnn/Z+Qw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nq6go5qf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nq6go5qf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6523FC2BD10; Wed, 3 Jul 2024 11:26:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720005962; bh=FrVAIJ1pRk/cbvfojJ2VQlVgSPMcZu8lqfdXW9J5Nic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nq6go5qf7ixhkGJrQaqirV/IgWKA/Hp8ATQeJm75mJrnJE62DCqfiYCLaYqzdPopU K3vT09wD8K2WlTL8OQ9uZUWpxBJTTeiVtoYL4ok8ohP3/HysBk2yOfy1bDgdOzC5tR mdTCEFwjkeyt+GuC+w66yW47jlpfabuAeoiJzy2g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Narasimhan V , Jan Beulich , "Borislav Petkov (AMD)" , "Mike Rapoport (IBM)" , "Paul E. McKenney" , Sasha Levin Subject: [PATCH 5.15 255/356] x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() Date: Wed, 3 Jul 2024 12:39:51 +0200 Message-ID: <20240703102922.763942486@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102913.093882413@linuxfoundation.org> References: <20240703102913.093882413@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Beulich [ Upstream commit 3ac36aa7307363b7247ccb6f6a804e11496b2b36 ] memblock_set_node() warns about using MAX_NUMNODES, see e0eec24e2e19 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES") for details. Reported-by: Narasimhan V Signed-off-by: Jan Beulich Cc: stable@vger.kernel.org [bp: commit message] Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Mike Rapoport (IBM) Tested-by: Paul E. McKenney Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@kernel.org Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@suse.com Signed-off-by: Mike Rapoport (IBM) Signed-off-by: Sasha Levin --- arch/x86/mm/numa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 1a1c0c242f272..d074a1b4f976c 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -522,7 +522,7 @@ static void __init numa_clear_kernel_node_hotplug(void) for_each_reserved_mem_region(mb_region) { int nid = memblock_get_region_node(mb_region); - if (nid != MAX_NUMNODES) + if (nid != NUMA_NO_NODE) node_set(nid, reserved_nodemask); } @@ -642,9 +642,9 @@ static int __init numa_init(int (*init_func)(void)) nodes_clear(node_online_map); memset(&numa_meminfo, 0, sizeof(numa_meminfo)); WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory, - MAX_NUMNODES)); + NUMA_NO_NODE)); WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved, - MAX_NUMNODES)); + NUMA_NO_NODE)); /* In case that parsing SRAT failed. */ WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX)); numa_reset_distance(); -- 2.43.0