From nobody Thu Oct 09 12:21:38 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 4cj8BC2LJrz6BqZb; Thu, 09 Oct 2025 12:21:39 +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 4cj8BB6lWXz3RQ3; Thu, 09 Oct 2025 12:21:38 +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=So3bAjjfoOnVEhuCXVhiYkOT40EpLzdnJZfTG4qLdbc=; b=IZ9Kyeh393CNkCkJYvso0MxTw46AuzCuyp9wRDaaRlcWD3axmx6co35C/vBteLP+sLTU7Y blumbHvROWLaedGemht1chiYWXpPfIsr4upJZl9szhxT9IXNLwBtp3LrUU/0vFMUtPDt3U zsQNqskybwnXtCZHM9blBP65EPrChTUlTQdAwQq96ZDgYBX7jUOyIG1BDO/j1PBZMkluHh YvyJjOZJuG/k+B8l5Y01bLko7vFeNONeUBiucDbVger/Qu0hn3TmblBFOx4AN+das4VEEy Dveua4Iyx6QVsTlg1wYeSqL162a3/ads1C9sAG79mSeZqsMxbKPy+Lolxi46/Q== 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=So3bAjjfoOnVEhuCXVhiYkOT40EpLzdnJZfTG4qLdbc=; b=SFpRoiBCOhbKb3Xg4hmIP/Lae1j6niAcJXYXWPVM1C+zimF+N2l+rU1N2roMVUplnhUtDf opv3nr0D0jJBFDFwngZdn3BmiYMU8akd8CXGurtANze9DLZ9r1Y4yXxsBezuYtIdr3R96F 9j8Dmmecem6plmhqCZkFr3shmX2jlPKENt7wuW3quhlLLaa3gZLJIPsiPVK6XT96hZyU4C urVpgJJQXaZB8ux5el2tkGMDnR3rNOV8n06Yvn09xFPgSSmK31zhHr7Zugoit2VjFDy7U7 J3xiM7R/4R9gBVfo/os1uV0HtQsbvX8Nm18223SfNHeOL5V/7TRK14SiwNthTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012499; a=rsa-sha256; cv=none; b=ZXL37xtxGo6ufpEkf8Qbtx19SEZG3TXad4D9nNoPJNuYDzKF3+r2mlv9jVl5x+15WIooJB 6vl/LgXv3CgMZ1/QA7qcvm/CA3CwKcZHCz98zFynhANNnhhny8b7nMw1Yk65/aupN2PeCE wqw39C/KAU0F4UmvXYnzJjcFA0xu8t0Oi0uAFju/j6drxdIGKPOn8cx0r/jaixrKaSYg5k oYBpVm4XDT5WZKPhEkhF8BZ+87gC1K1XFFcRTdLrw3uZF9DbsbeJFBFJKLJYbqfIuGX1rm Kndk+pL+51JpcTeNYJrQYxM6GKAlYf0ZsJ6OTWU9HM1snsHatq9OlUHYLqvArA== 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 4cj8BB60k1z2DL; Thu, 09 Oct 2025 12:21:38 +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 599CLcgp048767; Thu, 9 Oct 2025 12:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLcDm048763; Thu, 9 Oct 2025 12:21:38 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:38 GMT Message-Id: <202510091221.599CLcDm048763@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: 296156264072 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 29615626407279b9c995ffe9aa0f577de4752634 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=29615626407279b9c995ffe9aa0f577de4752634 commit 29615626407279b9c995ffe9aa0f577de4752634 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-08 10:07:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:16:05 +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 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); } }