From nobody Thu Sep 28 22:28:13 2023 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 4RxSmY4JM1z4vhqW; Thu, 28 Sep 2023 22:28:13 +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 4RxSmY30lGz3QVF; Thu, 28 Sep 2023 22:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695940093; 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=KHsg3zvPg/WP9W4crtdb9YCGnin7CFj6DF2lr3hbMNI=; b=KJJPKeXF/4E5TMeAzL9J+96reLpjM8Qfu5y3G18BqH8CVx9wOI14n0R1HgLAQxNJqXcf6U 80JjH8MqUb2gAUUb1xWP9B4HsZHre66ky6ULqsipFthEgm/YGxjQpJ9IEJ7yOgr8FnOP6V E4oEeyrf8TovN/S+jduywQgPJyYpK+WeE72y9Yq3vD9LSllYc4DYtq4Gmqxh4ZpaeaRDB0 rQJFpEvzB55ycPYNCr4RPecHTBZaxgFYWuDJlvwJ1CFneLYNpnSO1s/nuqORqAn4jj/q9z Nu+5Zi+b/kHZCz/DY99OYsib49Zlu1GkNepNUDjGkQpgMREbCiDOImeuIWw1zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695940093; a=rsa-sha256; cv=none; b=MlspUfGMRzRCIvW/o9aeDjul/IGxAF2YpSUzTqfz3YZdpMLWTgK+KFrDavzRbCK/U5iXe0 Y4+GyAlkXiK/TM59lZbJQgpeGf5mK11hSLB0CVLc5QE4IflW+kQI0enU2qDIi7EYVt8Dp8 jU56bR8fnKQ89HLNmQP0sfYxTfj/n2bNNe82JezU+ml2SjTKEC5L5uwATbOY3VJupBVzrw 5SVEEOqG6uHMnfWgo4LesZkgvlpt434B27SBGmEn9A5bjzlR8p8qMTKrhxY4qvviEjsssP xdTyoCLfr8Zgy2yVaPxTj0vDsGbAkE2uR6EZKiUtFAhKHZ8dh/p5JEqEINIGvg== 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=1695940093; 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=KHsg3zvPg/WP9W4crtdb9YCGnin7CFj6DF2lr3hbMNI=; b=jUI6eEGNrxEZZU3/EFCzOTjNfFBwVIq7F8yP2wE6IDz8rnDDPlRMeVeqv/k6QS6W2X1Eb1 PkRA77g/aMXO5YcN1SsyFkrQahhuTTrBkUgHNLHTeYagKUYInEmWoLOkiC+sMPOQZsOxtK oUrwUV9GYOblA8G42PFqZebSsGJIfv9QrC58i4NWUflJUIMSD52z99Oe8dm2eZBiCDd47Y sCoUO/i9XqRq+P75Gu2CxIWiDDExo1cBL/VZPaMEhOaPbaiwjNFrL7X2rufLY4xujYbm/E 7zj2bqy5YbK2Gvi2pytXq06NBfYKfFf+G/CbmZf//xE/uXd0SgCFJPkNanNsBQ== 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 4RxSmY219wzgQD; Thu, 28 Sep 2023 22:28:13 +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 38SMSDHl073845; Thu, 28 Sep 2023 22:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SMSDVa073842; Thu, 28 Sep 2023 22:28:13 GMT (envelope-from git) Date: Thu, 28 Sep 2023 22:28:13 GMT Message-Id: <202309282228.38SMSDVa073842@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: eeac591b1289 - releng/14.0 - nvme: Supress noise messages 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: eeac591b12890436983c0ce4a5d3269a4b77ca3a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eeac591b12890436983c0ce4a5d3269a4b77ca3a commit eeac591b12890436983c0ce4a5d3269a4b77ca3a Author: Warner Losh AuthorDate: 2023-09-28 20:46:01 +0000 Commit: Warner Losh CommitDate: 2023-09-28 22:26:17 +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) (cherry picked from commit 3cd49bc5b33fed7c305bfbf4b0c014520e65bc02) Approved-by: re (cperciva) --- 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: