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 A4B2219FA95; Thu, 6 Jun 2024 14:12:18 +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=1717683138; cv=none; b=mFK1bJV4ckPtpenmpNZVMDWrBP+UNa9ysPC21B7CkvH0SXFvfW78Bysbiu3FEzP57QlXcJAAFeV10brcXBXSW62lpZ1CyyNeEc5BI11SyUnBLVgeOLuIWcfABpcy6Hy/lRLS2/dyoWvIcBRWIrYKUZ2IimBui2EAcKreLECDmZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683138; c=relaxed/simple; bh=G0xLfDaogFDAzfdyEWSxqVXDwJED8NRoU0YkbEiQ+tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jlT7opmlq40iFnsaxy8IFfIypj+HrIBH1SsEGOiB3Ium7PeF/mh1R0pjHOBEo69jTkd3X/DYagN0N66/4JpP3S497VK1zY+cWL6fApTtJ6CgjP6341mEjzCfZWxsvEAU6Ej5V00YQ5Z5TicgXcVXQiSvlcP2VovwwKY43g9ytuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=toshSg9C; 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="toshSg9C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 830A2C2BD10; Thu, 6 Jun 2024 14:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683138; bh=G0xLfDaogFDAzfdyEWSxqVXDwJED8NRoU0YkbEiQ+tU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=toshSg9Cq61RUkkW88S5omw+zsZn1TLSW1JJfuF7CcTuNxG1eoYU1B9MH5VSFDhVJ mdtQU1+uq8LupJbWogfQ+Z/K1piwKB0EAIF00RytdTvF89O0DL1ZWxavos1U551e6k Mof0cjK5KXC6ON91Te5M8qK4DJ510Ctg4gH0Ndes= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nilay Shroff , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , Keith Busch , Sasha Levin Subject: [PATCH 6.6 084/744] nvme: find numa distance only if controller has valid numa id Date: Thu, 6 Jun 2024 15:55:56 +0200 Message-ID: <20240606131735.090417284@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 0a88d7bdc5e37..b39553b8378b5 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -246,7 +246,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