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 X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 993DFC433E0 for ; Sat, 8 Aug 2020 23:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 673012053B for ; Sat, 8 Aug 2020 23:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596930223; bh=M7z37lMIBKjuXXT6srfcnRegDtH5UGdVUmG4jh/8MfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MJ7RbBLCLy0CA6EGRLPKsJRxLot+WdJ0WrVCrwWYRvkT693KdizsGaEyS/2+zqbz+ fMXVQZ4QEIzyk57VKmPENSg1WLXJPVqzn8ylp3imtmuIo5TzzUR2y7ArjL6HjeZ2Tm 7afTSG/0fEyID+FheUeCy2zCqbGmUQ6mH+xEDySQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728629AbgHHXnl (ORCPT ); Sat, 8 Aug 2020 19:43:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:54532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728129AbgHHXjj (ORCPT ); Sat, 8 Aug 2020 19:39:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 689D920829; Sat, 8 Aug 2020 23:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596929979; bh=M7z37lMIBKjuXXT6srfcnRegDtH5UGdVUmG4jh/8MfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BdGt5rKv7PKQnoggKyZzuHsYBxzEN92AQ3qi7WsQ3D5tbRcn4IUGqszn7Lqbi9NIu bR2XccA6aT2aagPU/l7hE1ko/n3EORHEZm4ptGLmZw7LjA3eMewOM2kJbRZopv199e 5NX+reykj8HS1OHE1Gn+j1NTA3LE3C08cN71fJaI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Wilck , Hannes Reinecke , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 39/40] nvme-multipath: fix logic for non-optimized paths Date: Sat, 8 Aug 2020 19:38:43 -0400 Message-Id: <20200808233844.3618823-39-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200808233844.3618823-1-sashal@kernel.org> References: <20200808233844.3618823-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Wilck [ Upstream commit 3f6e3246db0e6f92e784965d9d0edb8abe6c6b74 ] Handle the special case where we have exactly one optimized path, which we should keep using in this case. Fixes: 75c10e732724 ("nvme-multipath: round-robin I/O policy") Signed off-by: Martin Wilck Signed-off-by: Hannes Reinecke Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/multipath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 5433aa2f76017..38d25d7c6bca3 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -249,6 +249,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } + /* No optimized path found, re-check the current path */ + if (!nvme_path_is_disabled(old) && + old->ana_state == NVME_ANA_OPTIMIZED) { + found = old; + goto out; + } if (!fallback) return NULL; found = fallback; -- 2.25.1