From nobody Thu Oct 09 12:21:39 2025 X-Original-To: dev-commits-src-branches@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 4cj8BD2lPQz6BqGX; Thu, 09 Oct 2025 12:21:40 +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 4cj8BC64hPz3RYD; Thu, 09 Oct 2025 12:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012499; 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=kmO5spVdICCy7qYUwXmkgLMfefYVSgBlrsn7EEuvnNU=; b=J5ZwBTljaAzYx9waRcYD6jfBPBMY/eqvXXuHQYW6fIEOKh/fBgRmz1zB/93Ag0i9BU9BH+ ZHdzystzaL69v46m2TCn9cm4qq2Moo1fY28suwd4uYuroZaoevwKJ9GVH4tvhDCCIfoMfF 7/lXjwCwcWdpGH7RzpS9GOweXXLsWWRg+Q8UQDWZeP+V69FBrkgdD7D+PQZGVMSVcOb7vA /U8LGEDMNCuAMqIl9QDU7ts6Bxa1HAJ9P5XyiwG3I6oW0TPQksBY4uCteevOY/EYxQ6am3 iRq/YnCvpdrH9jo9vuivR3StrU0xt9O3l009V8ngswgndHb8Apc+/XxGxjIcTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012499; 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=kmO5spVdICCy7qYUwXmkgLMfefYVSgBlrsn7EEuvnNU=; b=YQKEq+iUr1O/k1Kc3YmCvqvLcVc7FjntDbPnheiPrG+eoczpQ1vDSjYGFxjaxno7Wz2P8Z yoxj1j4GrgZM5nRKrxOn4Wx9DPPnrO7nKTlTi4hYeJz6JzH/P1h8Cyzls+IoFyogypGqsQ BehCAQtCBo/KT3w579gAAlKe0jmEvM1wQnHSGJ1DJM1RuyxoqQQWGLQ3WRAFfJg+FJkV7M O4wG5XCFBrXF4Rw0CknVCB3qvdSEC7D+gpJcUdQidbFKm2Rj52MwSPzzrVjv8KIMhq/nby 8gBfFZThPY2n60qubw6epo3Z94VW5E1z0F2x9YAzVMSIfdqmCyKolIyZc0udZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012499; a=rsa-sha256; cv=none; b=NvW73G7aOHeB5aNIgNI0F3Tcfgix4LgfnzFgZN8D3AJplYIeCAfr17ddU2eoIh8F4HhM0o 4KfQOMd1bf4oeS7aGwsj1OVzGL2nDj0yVvBegxNmEcIi+xh2wpLyArXxfqCpgEtAT9TcaN kZoiwgby6Zlq/+rydHUAcpAIFCxr5bSTCSSFzvsC8byBI2KrTaLGeaXEUGTCgSE/MrVAH/ 11YVHkglF8UE011T1xzHedf8NnQqH1hcseXGa9tfQjulmL2aPZ0vT/HnN9M9GT6IsB0rUy katCTso724BAUQk3vcV4tkj80D8hohinNPyGrbY2KwB9s3rXP1/ivzTx/EY+yA== 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 4cj8BC5XCYz20J; Thu, 09 Oct 2025 12:21:39 +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 599CLd2s048800; Thu, 9 Oct 2025 12:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLdCv048797; Thu, 9 Oct 2025 12:21:39 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:39 GMT Message-Id: <202510091221.599CLdCv048797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c2fd9060f32d - stable/14 - nvme: Tweak completion timeout loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c2fd9060f32d21f60195af010973e5bc8d4d81ee Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c2fd9060f32d21f60195af010973e5bc8d4d81ee commit c2fd9060f32d21f60195af010973e5bc8d4d81ee Author: Dag-Erling Smørgrav AuthorDate: 2025-10-08 10:07:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:20:53 +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 (cherry picked from commit 4070ae0e9a60715199f83004e7ebdfb169fc8cfc) --- 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 26dc75ba4141..36e04ceb7f31 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -463,13 +463,13 @@ 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); } }