From nobody Tue Oct 11 18:57:30 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mn4lv22rnz4fCGX; Tue, 11 Oct 2022 18:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mn4lv1C7Pz3Lsp; Tue, 11 Oct 2022 18:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665514651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gP+91xC+BPi1nPGOhbI3FwE5E/vlY29D+zBD3o9ZLw=; b=Y/kBCk8vZuM2pJ1s40cr+QXuq0mFlrb+XeZpA17pzXTAlwA0lI4XqmlwIpKsiPk4M9SGEk u0kxUmoRVRw01aZ4rrzzoPrqOD/ButM7wplRgDkmK1hxkMA42TwLXyglp2OzG7HYRffRHo 0H6h+dnziZSIGSL0SBKGsw1Mnot7JgEC1qHQBR89kYm1ecVeBCnPmL6O2UZXKNXEGq8916 jhnHYCBk/HJ2Ocg4lcq4Uto+lxi/iGs9q+xRxzrsdCNBbrI/BHgxOVuU8a8wka1Lunj5Ep ln+eoh8qOOPNrD8eYV4CGz9v/rV/9WEgaXbTXWJ7X7k57Q3gAaJqDAIc82xvgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mn4lv0Dmxz13J0; Tue, 11 Oct 2022 18:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29BIvUTn074204; Tue, 11 Oct 2022 18:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BIvUdo074203; Tue, 11 Oct 2022 18:57:30 GMT (envelope-from git) Date: Tue, 11 Oct 2022 18:57:30 GMT Message-Id: <202210111857.29BIvUdo074203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4982884b99e8 - main - nvme: Always set deadline to max List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4982884b99e894ea21a35d2599791f5d98e5785e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665514651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gP+91xC+BPi1nPGOhbI3FwE5E/vlY29D+zBD3o9ZLw=; b=x72RqYqPxg7Wcq9qCHulQ6n/qEtymyp4eAPh1EbdbtebUMUtAUZllu5XfxQ9RUYi/1Gei6 bgmowctHGPY0SNmpJ1jnEYB2v5I7Tpywd0FTYqoPbv3uKYPc0rULfEEnbNj7AG3XuaqZUz eyNnL1RlFEsbxXmzqVqTWwZqc6lyn6bbS5IC3b+gctlRH6rkcUrlFL3gG65+kjC/cRjXAf g5mZ3HWiobw49x1v8/oTCroYwgwW/8c7Mg/qMA22AUH0PPZhjKi6FnvOQW97HcGC9Xlt1K yBZTcAJVVQdflJp97uBzfK+O4PYG7zogP0+0AmD+fSMS1JEBoZXzhfyY7N1j2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665514651; a=rsa-sha256; cv=none; b=xmj2W9vVs1aHlvBz3fXD+DOmggG3rT5FK5V8nJTy04FTL+gmLMMznq+8SRjXLm49fJ/njJ ngWcDWgj132mXSSEt6fgv7Ggj2Sl/CnATbJjcNkd5Ej3aJZh2EjPuxzyOZ54kC4qExa2jV LhZd5QfcWe+WYf8ZppWaZUNRDiWv+6KBtQ/vhX8r6mn/3D1r2K9+ai7jCnl0zwQAc70sMN ZJoMo+Vn2kgxodweW8yfN7vobZXV8/Edy0RKCY4O6Q/7SVByg8mnuy34PZbkQ/JQm+8Uzx 93ehqbtmX5EmjzbPrLdm9CzBBGBwQqlJTp/t83x5TriSufYZOPtr8WRYyF7vDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4982884b99e894ea21a35d2599791f5d98e5785e commit 4982884b99e894ea21a35d2599791f5d98e5785e Author: Warner Losh AuthorDate: 2022-10-11 18:51:32 +0000 Commit: Warner Losh CommitDate: 2022-10-11 18:51:32 +0000 nvme: Always set deadline to max When a transaction is on the outstanding list, it needs to have a valid timeout value, so set it to infinity before placing it on the list. Place before we put it on the list, even though the list is protected by the qpair lock. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D36920 --- sys/dev/nvme/nvme_qpair.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index e0b3517529d5..b81f4c4bc3c9 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1175,8 +1175,7 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) TAILQ_REMOVE(&qpair->free_tr, tr, tailq); TAILQ_INSERT_TAIL(&qpair->outstanding_tr, tr, tailq); - if (!qpair->timer_armed) - tr->deadline = SBT_MAX; + tr->deadline = SBT_MAX; tr->req = req; switch (req->type) {