From nobody Thu Sep 28 21:10:21 2023 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 4RxR2j52f8z4vbwJ; Thu, 28 Sep 2023 21:10:21 +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 4RxR2j2TKFz3F4M; Thu, 28 Sep 2023 21:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695935421; 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=mUmxq7qabnEl98pXyv0T+ap3nHUcB6pI2YruL2Ghb6o=; b=QtYGJt/yvAzzR7vAKt3T8hgylBL1Nuo2zQwshz9R+qRxufWokkkCeOoEFSTT3h5bJ6KZsI V14tJLpdia/0cNFuCs+JxHBSaaTe8cEppxhRHY3zo2r4WoKTEceTnTNCdvjq25PBBKOiIu AgK3TQubgY0Bixx3O9WtyTQMZVC/2z8tXX5RA12ZlDfgYy1Yty4lV9Hdta/vy3wD1rXSEX 51fhjaJhGJt5Ezt7Ft2cPgk8bWG4i4KEKlWJwj/XzHTprsZjGxpf1KvkucrHaTCY4iQgCy ODEx0prAauxGqNZqRupF8aOR6nd/sFGt7hME+YU5iv1MRwwkpC3Zr2n6hxh2Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695935421; a=rsa-sha256; cv=none; b=aDz1HBffAO98m+F9A4rtBa5YL7eVKeW9jrRgrX42KgQ/MB3Fjw3XE0Y+uCn4CeFXqeTc6P 8Buk2QFXxgSFogORw1+qhGig4Q1RtiaUn0O60gu7yi7p39BNUCe3C4534/TlR8D8RJFMa2 cRmq0LTgjeUnQEkIa+Aq7jed6rSUg9XU6mWpjVZ7Cn2EiMDLvzGW6G9266ty/XNy6uejbq 42KBuvcsJcitA7EdBHTs6d8c6JJHnKQqsFv3C9Qs7uZbk3ElP9yO92+Q11QflSy5eRBPGl ESvHTtfeSalmG130v8u7lUb/b+wNXBvFIdlI9bm+4U2Xik8yMRCBPVj8yOFWGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695935421; 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=mUmxq7qabnEl98pXyv0T+ap3nHUcB6pI2YruL2Ghb6o=; b=rwNwMIJOGtTAdPLyakb9Z1sH7oFGi5GVyMFL9Y+xvV2umAKOjbwP0ELL3Yl/b+eYoBAGA+ 6ke/ycaGvZLJpD3hNWK54WvLy5jW1AepOcdZnJklRdSyNmoghhpXXMliNH5tCyHxGfw0k7 ynkzBSX7LyEzO23D20VqBrKGYUhUxtRS9V8PNNUw+oYy+FSOCYu8kThhNTTXWGsNFfyaWW bvyqjgoKnWOu6oZiCYmF+f7ERh3dyngHYu2HX+T7QwHpfWzlP9VDdRzii8BJYK181Va2RJ ey++0mVnnlfn4cejbxVAqncO7sggNIiFfJGRTx/CI4bxjIuBxsUcGcMUaCAP2g== 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 4RxR2j1VJCzdGx; Thu, 28 Sep 2023 21:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38SLALLo048757; Thu, 28 Sep 2023 21:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SLALDD048754; Thu, 28 Sep 2023 21:10:21 GMT (envelope-from git) Date: Thu, 28 Sep 2023 21:10:21 GMT Message-Id: <202309282110.38SLALDD048754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3cd49bc5b33f - stable/14 - nvme: Supress noise messages 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3cd49bc5b33fed7c305bfbf4b0c014520e65bc02 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd49bc5b33fed7c305bfbf4b0c014520e65bc02 commit 3cd49bc5b33fed7c305bfbf4b0c014520e65bc02 Author: Warner Losh AuthorDate: 2023-09-28 20:46:01 +0000 Commit: Warner Losh CommitDate: 2023-09-28 21:05:15 +0000 nvme: Supress noise messages When we're suspending, we get messages about waiting for the controller to reset. These are in error: we're not waiting for it to reset. We put the recovery state as part of suspending, so we should suppress these as a false positive. Also remove a stray debug that's left over from earlier versions of the recovery code that no longer makes sense. Sponsored by: Netflix (cherry picked from commit 1d6021cd72689f54093af4ed77066a2f8abde664) --- sys/dev/nvme/nvme_qpair.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 9806096de81d..cd0057f444b8 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1104,13 +1104,20 @@ nvme_qpair_timeout(void *arg) nvme_printf(ctrlr, "Resetting controller due to a timeout%s.\n", (csts == 0xffffffff) ? " and possible hot unplug" : (cfs ? " and fatal error status" : "")); - nvme_printf(ctrlr, "RECOVERY_WAITING\n"); qpair->recovery_state = RECOVERY_WAITING; nvme_ctrlr_reset(ctrlr); idle = false; /* We want to keep polling */ break; case RECOVERY_WAITING: - nvme_printf(ctrlr, "Waiting for reset to complete\n"); + /* + * These messages aren't interesting while we're suspended. We + * put the queues into waiting state while + * suspending. Suspending takes a while, so we'll see these + * during that time and they aren't diagnostic. At other times, + * they indicate a problem that's worth complaining about. + */ + if (!device_is_suspended(ctrlr->dev)) + nvme_printf(ctrlr, "Waiting for reset to complete\n"); idle = false; /* We want to keep polling */ break; case RECOVERY_FAILED: