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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham 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 15431C433E9 for ; Wed, 3 Mar 2021 19:32:30 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F3B564EE3 for ; Wed, 3 Mar 2021 19:32:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F3B564EE3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LV3mRnJBWrpSSw/8QNWbtT8CRDSYl5vGTdKqzbkdWsA=; b=TebuYdVGKnKuCIJEoEybsg6WC zYIAsifvONo1f1J5QH/VnX5zytKXtvMjJwEdFeJWjWkdDRADY3q5uCA3VikueP5Tnl0p88cAuqiqR DM8d9O8hy7wQDpsuLKRQEgap5ODx4pOX9yL3SNU5exqepxwHe+k91CmnHkEaq5zuVj5ClAE+7n3x0 bfNi4aqLi2pF1Zio3pzH5bYqF2D72PaAkujPFe1aw+lIiwptcdcc6navWR9WvRe4agOaQfha4Rixt 4ijhRNR5ukIce6ovuLDd8JZzfM4vLUuO0eoXFXDAdOAiA6uVlWYAYcRpDJtSk/rj2kb16Wh9AJ2C4 FKJkjlWfA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHXEG-006EGi-Fj; Wed, 03 Mar 2021 19:32:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHT3Q-005I3L-Gd for linux-nvme@desiato.infradead.org; Wed, 03 Mar 2021 15:04:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=gIlGWJWnvXREgICNM4lizkmIQyjVLl8sbjBjiBZM+yg=; b=sn9vcg4N8GyevOMx/0TD/ETyHW c3c0h6oTb3+i9dsqUyVW/BJMciNzgafsKMs1A7ADGqEo1T8fYMdYgWVaHzNaSoWcBI9rpL4jnRPnY 4I02ctibqLmpIfb6fAXcMTA1vkXP87ZskJdJBzqZJMeMkw12uXfi3dmjJEmQSakXgsJkPzMxz2/ch Uk2j95L/r4jZGBwZUFOahUV5eS8BnLLb2oltvoRKqEsJNGzesIDjaqLTj9c+FEgBMmZpj5tw6EM22 Ibq79PMbM7+HgecrDNn3dF+0rIs+Kz62Py9AMBAfpBI9dKf1u8Vmt+DC/dGib7OnuGwYYZOlD6HUq hnyRectA==; Received: from verein.lst.de ([213.95.11.211]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHQnd-002ZXB-Lq for linux-nvme@lists.infradead.org; Wed, 03 Mar 2021 12:40:22 +0000 Received: by verein.lst.de (Postfix, from userid 2407) id 7491168B05; Wed, 3 Mar 2021 13:40:18 +0100 (CET) Date: Wed, 3 Mar 2021 13:40:18 +0100 From: Christoph Hellwig To: Chao Leng Cc: Hannes Reinecke , Christoph Hellwig , Sagi Grimberg , Keith Busch , Daniel Wagner , linux-nvme@lists.infradead.org Subject: Re: [PATCH 2/3] nvme: sanitize KATO setting Message-ID: <20210303124018.GC28477@lst.de> References: <20210302092644.80701-1-hare@suse.de> <20210302092644.80701-3-hare@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210303_124022_918205_5C3141B8 X-CRM114-Status: GOOD ( 15.94 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Wed, Mar 03, 2021 at 04:53:58PM +0800, Chao Leng wrote: > > > On 2021/3/2 17:26, Hannes Reinecke wrote: >> According to the NVMe base spec the KATO commands should be sent >> at half of the KATO interval, to properly account for round-trip >> times. >> As we now will only ever send one KATO command per connection we >> can easily use the recommended values. >> This also fixes a potential issue where the request timeout for >> the KATO command does not match the value in the connect command, >> which might be causing spurious connection drops from the target. >> >> Signed-off-by: Hannes Reinecke >> --- >> drivers/nvme/host/core.c | 9 ++++++--- >> drivers/nvme/host/fabrics.c | 2 +- >> drivers/nvme/host/nvme.h | 9 ++++++++- >> 3 files changed, 15 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c >> index f890b310499e..6d096d41a82f 100644 >> --- a/drivers/nvme/host/core.c >> +++ b/drivers/nvme/host/core.c >> @@ -1223,7 +1223,8 @@ static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status) >> startka = true; >> spin_unlock_irqrestore(&ctrl->lock, flags); >> if (startka) >> - queue_delayed_work(nvme_wq, &ctrl->ka_work, ctrl->kato * HZ); >> + queue_delayed_work(nvme_wq, &ctrl->ka_work, >> + NVME_KATO_DELAY(ctrl->kato) * HZ); > * HZ and then >> 1 is a better choice. do like this: NVME_KATO_DELAY(ctrl->kato * HZ). Also there is no reason to not include the "* HZ" in NVME_KATO_DELAY, as all callers do it anyway. Also please turn NVME_KATO_DELAY into a normal inline function using normal lower case naming. Alternatively we could also just do a helper for the whole queue_delayed_work, which might actually end up even cleaner. _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme