From nobody Wed Oct 8 10:07:29 2025 X-Original-To: dev-commits-src-main@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 4chTFs5Hk5z6BjWn; Wed, 08 Oct 2025 10:07:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chTFs4Ydvz3kNy; Wed, 08 Oct 2025 10:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759918049; 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=7/smh0PWsiCnkz2EdXiNfxzwSyiuN5Qu/W0XugtP0Qo=; b=WHVFaWQCQaO60nB/IDVUUIn5L3qmDNZrW307z03n1eJkWY9+JdevNGkPiY3/EdJtU3Qt5I Rofdq09Ocp+sjnTmqaqUOWXpBDSo3olNlVWJktDents3IC7z+IgGowPhY4FZ9IiNm651oo odO1CSqFwtoZNr5PNWbI/jSA0+boQntCk5jB66JiAm4xTFvVlyuFLvOmJg1fcluyjtI++O IynMvBchJy8LWl//IcObwh+6Kmg5NLwBjYwPL/U4i2RwUhqxi76HZfCeDS9wtNEWDBLfqT 0sBNCMerd6dM6SPV02sXvVQh/VJYe5Sb1IGVWwQHeSvDsaYPJdXenJ5uxxCfFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759918049; 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=7/smh0PWsiCnkz2EdXiNfxzwSyiuN5Qu/W0XugtP0Qo=; b=LaKHLLuILYXzuvxAn8KTel7UAnjVTnShyXZEiyH/QO/LByTYFJ93zMooSVAFgKAkK3mi7O eAu6y4ONAgItcIuvz/AiAbYrWWl2QCRmBZCN4CmgpGl5ba3wWPF8manLZZ4mlSKtFy1L84 rOFa3j3kJDkTscoU0o9jH7vwh1P25wLVIaDlxrv/sVH2xFW+RtzZNZtkwmPdugveI30Zu8 W/MjuDWWYYEzd7DdCekg2JTwaLl3IRKAG3+bQsKGckkQr18kd1rSIUs7vMwCpe3xIx3PDS QUZNET5t2qrwAlG7G+Vb3kP/OpzAAHBvCOpDAHX6ut3P7DeRHb/UF6Kvh4KGcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759918049; a=rsa-sha256; cv=none; b=soms/7hbmmL0ZAz0WOEGnLz8K+juNhCVNoy46LpyhnbyqkhZp9JQgWFKUenaXWtMrMD9RM 14SIU7toVcJCREl2tEmDlJxqETi2N95d23MLAMPqUUhSVF+ErMsytQADDYm6/Y9Lta6HHa XHjCdZpwKcOGgYaC73DiGfQdpeokdusXhOFs9rEtxSnM2YFS+mzbrZJ2nACCpMgKfqRlKW muYoUFcYtxoiyFv0UCWfw01H6hwCj8/bzpI8yiR0Foufp/n+78f7mET3WbKeczqV8Z9ZDr zVPXa9dNWdBeGI3eEtC37wTmluL+hI73BnZ1DvDB/KfGXYDMmt7NraRr3NvATA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chTFs47FhzBSd; Wed, 08 Oct 2025 10:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 598A7TLY076057; Wed, 8 Oct 2025 10:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 598A7Twi076054; Wed, 8 Oct 2025 10:07:29 GMT (envelope-from git) Date: Wed, 8 Oct 2025 10:07:29 GMT Message-Id: <202510081007.598A7Twi076054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4070ae0e9a60 - main - nvme: Tweak completion timeout loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4070ae0e9a60715199f83004e7ebdfb169fc8cfc Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4070ae0e9a60715199f83004e7ebdfb169fc8cfc commit 4070ae0e9a60715199f83004e7ebdfb169fc8cfc Author: Dag-Erling Smørgrav AuthorDate: 2025-10-08 10:07:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-08 10:07:13 +0000 nvme: Tweak completion timeout loop * Rename delta_t to avoid misleading simplistic syntax highlighters * Simplify the increment calculation Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D52973 --- sys/dev/nvme/nvme_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 52f9e12f8f9a..52e9fcbbebcd 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -463,13 +463,13 @@ static __inline void nvme_completion_poll(struct nvme_completion_poll_status *status) { int timeout = ticks + 10 * hz; - sbintime_t delta_t = SBT_1US; + sbintime_t delta = SBT_1US; while (!atomic_load_acq_int(&status->done)) { if (timeout - ticks < 0) panic("NVME polled command failed to complete within 10s."); - pause_sbt("nvme", delta_t, 0, C_PREL(1)); - delta_t = min(SBT_1MS, delta_t * 3 / 2); + pause_sbt("nvme", delta, 0, C_PREL(1)); + delta = min(SBT_1MS, delta + delta / 2); } }