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 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 610D8C10F1A for ; Wed, 8 May 2024 00:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NJbA0h1pl3xK3KSPL68OeGkw35vFHl6vWjNgOxy8D70=; b=qekn3fJSvXD2P7ehwY90VM0BPn fbe9x6gxu3EiLoCuP4FbN3lwhItI5kaJQOXLhJnUyTXUgHC3jhAkcjvrjfUf7M7GTJvaImYGGgGRM 5/Z9NRP/ONFd6Exj+YhytJ/H3V72wuTEqF4cjGuo4AzE5jPro9YiKCYDMG25BLF+w2T5A40LuZQ8n EtgOjcL1ZNgWP5uhFrTuzit465dCTPF/Xe/S/yQrPYpAdFHiIDbh8/oGzXlHe7Qu0wEgudIotIdM3 W8MKEJo9pV69Eziv39WZc77XPJbFH3h/9c/RIP+zKtI7Lxki/yr+dA4ZzTWHsWEMwbw0P4N5kXf7p h9TkKvjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4UyP-0000000DVFM-3Gh0; Wed, 08 May 2024 00:15:53 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4U16-0000000DD56-0yPh for linux-nvme@lists.infradead.org; Tue, 07 May 2024 23:14:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9BA9461A01; Tue, 7 May 2024 23:14:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F126BC2BBFC; Tue, 7 May 2024 23:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715123675; bh=NaNESS57i+/Yb9mqNOeglTPm9x3q0vcCjPQtoo5La+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gNN2dBaMXXvRFR0tLNzVWbfjXeC3CtTAgpIIBLRLOD6nUXhNtNGxvdYcUmrDS+lfL CJ7aqLT6IQUByyjdrzSVvL95jHaCRgW0tE9cJYrNrIDpw2cSGE1CtJ0rfHor2Simuh tWtZ5oPxDQ7x0oVBHOxMFArd8eByz8QN54fZG/UWVAmK92Awjy6V0+K+8O3Hqa8zFt wLA4HomT/r7VUxB36FMdPbn6zjd6MXIlTKaY2fnV0GhVhm/TgKX8hx1iFfYBK0elOy LoyKhpcC7UWo+tTcnpYJTUgueHvhvvBtc0zdhnlhdb56DxwWQrakke/oNK9bxfJ4em lmkiBduPvp6sg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nilay Shroff , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , Keith Busch , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 6/6] nvme: find numa distance only if controller has valid numa id Date: Tue, 7 May 2024 19:14:22 -0400 Message-ID: <20240507231424.395315-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240507231424.395315-1-sashal@kernel.org> References: <20240507231424.395315-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.275 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240507_161437_186116_7952257D X-CRM114-Status: GOOD ( 12.25 ) X-BeenThere: linux-nvme@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-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Nilay Shroff [ Upstream commit 863fe60ed27f2c85172654a63c5b827e72c8b2e6 ] On system where native nvme multipath is configured and iopolicy is set to numa but the nvme controller numa node id is undefined or -1 (NUMA_NO_NODE) then avoid calculating node distance for finding optimal io path. In such case we may access numa distance table with invalid index and that may potentially refer to incorrect memory. So this patch ensures that if the nvme controller numa node id is -1 then instead of calculating node distance for finding optimal io path, we set the numa node distance of such controller to default 10 (LOCAL_DISTANCE). Link: https://lore.kernel.org/all/20240413090614.678353-1-nilay@linux.ibm.com/ Signed-off-by: Nilay Shroff Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Reviewed-by: Chaitanya Kulkarni Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/multipath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 811f7b96b5517..4f3220aef7c47 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -180,7 +180,8 @@ static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node) if (nvme_path_is_disabled(ns)) continue; - if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_NUMA) + if (ns->ctrl->numa_node != NUMA_NO_NODE && + READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_NUMA) distance = node_distance(node, ns->ctrl->numa_node); else distance = LOCAL_DISTANCE; -- 2.43.0