From nobody Tue Sep 26 04:24:13 2023 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 4Rvmpk1XWqz4vYQd; Tue, 26 Sep 2023 04:24:14 +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 4Rvmpk12d6z3Z3J; Tue, 26 Sep 2023 04:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695702254; 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=mfP8lYzZv+I90EyWXqI47fTRyJEV4YWdXT4YytqjShM=; b=rm9eAkkLCzZXXVjZBYZo6HTqW+J+xCQ0Yn9zif0CEyE7F0wJLmWH3FGNakkRI24Z0Zm2IZ 4U5x8+TCkd+QpcbbH0EgvIVW41d1QN4/NZDvQ9/ds6e8w/HHV1zorei72/ReJABtqm8jEF mS/CJ4RAN6IDaqLlg32AflHFXVHKf8bS4iQE4GM9GA4XsYQVv6IGUtG3vg0NFVL4izB3lu deHiM0ts/+A4xoU+o4b/3sjMoYzj1txjnVv3C+1tjnqRCzzgB2FTjEvsE+mv7f+UWts7H2 KkH4sZ8dGJ4NUrrfS3nydANHQPhV66Sfh6XRZ7PPEyG5fiXU471OUY6TciUDkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695702254; a=rsa-sha256; cv=none; b=wVYPnGmYV0Vz4kU6I7tHHBcixLHwehYMWDUVSzTxfD9/przvANJrpLU2RWptJENVtpEjCX 5gSQ1bf2gY+5rsBnjVCMSDEur2XGE8D8IXN3p00Of+eMg4+AjSVrvSamGiJrdvBQNv4Eoc oNpFrH3vLzvoFf8WdtTER1pVJOlynvkDAb3ulLK8QVl4raAkaocwh9cd6smThMmOIh3TKO VmTT8yY2sKIgQKrGSigZngREjzaixGuq+PEH8Ldd6UJBFeK8u7BKRXE9E/kZe+56GVTVoh MZ/RYsr6RuVVmEdgItJqFQYAMw8LCEiSFirFSjY7y7eL7Febt4ryQIDzxAosBw== 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=1695702254; 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=mfP8lYzZv+I90EyWXqI47fTRyJEV4YWdXT4YytqjShM=; b=tB0trvJkL0kpHs+nu8NenECAjmFHwsNyFcGciM8uQsot+5/iBcq0Wxi4BKzkxFqdCBTRyL MHQiaeLRpKOBl5VCNrd8vKK/4VCDcHS8rLvu35b3znBHp4E30Q7IKuMFYbKz539Ff/iKQh uS7qUpV6PlrZXqncZcXKIwx9sDyEv1CAV17HnMnuMex92rSIYTf6mgFI+keM+q9jE0pYCe 54WyWW+yUv2cSHgBnPzssXCsWN/VwJ9IiXbAcVfnjA26fWWHJS8jiFps/yH4zUJTS8innZ 0jHgMwRiYkzKrCBtgdRJwlbOeoNNxLdQ4dl9q/LXrRYOGVU40vCRAQttbhI+uQ== 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 4Rvmpk04zwzj1V; Tue, 26 Sep 2023 04:24:14 +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 38Q4ODEN090895; Tue, 26 Sep 2023 04:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38Q4OD6S090892; Tue, 26 Sep 2023 04:24:13 GMT (envelope-from git) Date: Tue, 26 Sep 2023 04:24:13 GMT Message-Id: <202309260424.38Q4OD6S090892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d6021cd7268 - main - nvme: Supress noise messages 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1d6021cd72689f54093af4ed77066a2f8abde664 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d6021cd72689f54093af4ed77066a2f8abde664 commit 1d6021cd72689f54093af4ed77066a2f8abde664 Author: Warner Losh AuthorDate: 2023-09-26 04:08:52 +0000 Commit: Warner Losh CommitDate: 2023-09-26 04:21:58 +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 --- 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: