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.3 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 A2BA4C4361B for ; Sun, 7 Mar 2021 13:59:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A6096511D for ; Sun, 7 Mar 2021 13:59:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232019AbhCGN7D (ORCPT ); Sun, 7 Mar 2021 08:59:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:43982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231732AbhCGN6W (ORCPT ); Sun, 7 Mar 2021 08:58:22 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B1A3165101; Sun, 7 Mar 2021 13:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615125502; bh=jaUmMwmVYCRnp9svEsc7ZpSLfgL1jERqWvO9zwQYwuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JsZLcvZsCh0Zhwgp11aeF5Pe00GnmEwtA+YlaV30YTcx2QPMmJegGv854Y32qkywV ylcMI0Qsn3rYS87+P3mgsMjXv1G14/ro/scRJKCWrc1AaKa69B98LCHfeYqrWAC6Ep QFcJXg7/pm107lmpzaEX1wy9X4B+IVW7XEhc+oWCLg2XCj+o94Xww1zDQmEHzKnCAW gwj0MJg+wPge4YOOHmXyf1UxyJZQc8npGNM7szcXc8iMbWL5RLwC10g2ObQmFvpU9h 2rZqEjUzMLZh7ms/ahlzUXADp0ZmVdDKbD4i3Sv9qRz8yqoRHkx8Gwzr8GWCGX63M9 tDOUs+8xnZY4g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin George , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 3/3] nvme-fabrics: fix kato initialization Date: Sun, 7 Mar 2021 08:58:18 -0500 Message-Id: <20210307135818.967800-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210307135818.967800-1-sashal@kernel.org> References: <20210307135818.967800-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: Martin George [ Upstream commit 32feb6de47242e54692eceab52cfae8616aa0518 ] Currently kato is initialized to NVME_DEFAULT_KATO for both discovery & i/o controllers. This is a problem specifically for non-persistent discovery controllers since it always ends up with a non-zero kato value. Fix this by initializing kato to zero instead, and ensuring various controllers are assigned appropriate kato values as follows: non-persistent controllers - kato set to zero persistent controllers - kato set to NVMF_DEV_DISC_TMO (or any positive int via nvme-cli) i/o controllers - kato set to NVME_DEFAULT_KATO (or any positive int via nvme-cli) Signed-off-by: Martin George Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/fabrics.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index 05dd46f98441..e76137a02636 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -623,7 +623,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, opts->queue_size = NVMF_DEF_QUEUE_SIZE; opts->nr_io_queues = num_online_cpus(); opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY; - opts->kato = NVME_DEFAULT_KATO; + opts->kato = 0; opts->duplicate_connect = false; options = o = kstrdup(buf, GFP_KERNEL); @@ -828,6 +828,9 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, opts->kato = 0; opts->nr_io_queues = 0; opts->duplicate_connect = true; + } else { + if (!opts->kato) + opts->kato = NVME_DEFAULT_KATO; } if (ctrl_loss_tmo < 0) opts->max_reconnects = -1; -- 2.30.1