upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nvme: Supress noise messages

Browse source 
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)
This commit is contained in:
Warner Losh 2023-09-28 14:46:01 -06:00
parent 81b118e842
commit 3cd49bc5b3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/dev/nvme/nvme_qpair.c
View file

@ -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: