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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 E2480C433F5 for ; Mon, 6 Sep 2021 01:21:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD8CD61101 for ; Mon, 6 Sep 2021 01:21:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239308AbhIFBWS (ORCPT ); Sun, 5 Sep 2021 21:22:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:37876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238786AbhIFBVU (ORCPT ); Sun, 5 Sep 2021 21:21:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4CC261076; Mon, 6 Sep 2021 01:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630891216; bh=fdSGnyx4gstkhSKuoXc7lYXqj42Gf2IBpghzFdPw4/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a+8i5dl7P1CyrIh8mx0oeMB0+0ARrL04Gsahaed256kzUpfdLOSXteRNUzwcwFCkg defUbNpKBGz+1pEoeSj0aDtssLyzg6M+NnLWiJsVdXyrbKUJm7rvE/SE/mEQRQZPVP 85ATXqqa/QGVq1kSEZU9msyQsxIj+dZXMIVgXNouaA9dNzSaFd8rH6qGcyrqPT0Crk e8/VjjN/B9xxhCczir0hcRZZlVnU6nd5TOl81dxJNuQkfD5X56/7wkCVSvZKgtzci8 j7C4vieKIE3ycAw1LMcSaxuvGWLDCvKOlEGMnY3M973bSNJmq+13FDMvD9PIzzpeNA uI2FJ2STKFiFA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ruozhu Li , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.14 20/47] nvme-tcp: don't update queue count when failing to set io queues Date: Sun, 5 Sep 2021 21:19:24 -0400 Message-Id: <20210906011951.928679-20-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210906011951.928679-1-sashal@kernel.org> References: <20210906011951.928679-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ruozhu Li [ Upstream commit 664227fde63844d69e9ec9e90a8a7801e6ff072d ] We update ctrl->queue_count and schedule another reconnect when io queue count is zero.But we will never try to create any io queue in next reco- nnection, because ctrl->queue_count already set to zero.We will end up having an admin-only session in Live state, which is exactly what we try to avoid in the original patch. Update ctrl->queue_count after queue_count zero checking to fix it. Signed-off-by: Ruozhu Li Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 8cb15ee5b249..18bd68b82d78 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1769,13 +1769,13 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) if (ret) return ret; - ctrl->queue_count = nr_io_queues + 1; - if (ctrl->queue_count < 2) { + if (nr_io_queues == 0) { dev_err(ctrl->device, "unable to set any I/O queues\n"); return -ENOMEM; } + ctrl->queue_count = nr_io_queues + 1; dev_info(ctrl->device, "creating %d I/O queues.\n", nr_io_queues); -- 2.30.2