nvme: delete the I/O queues in the system shutdown path
ClosedPublic
Actions

Authored by seuros on Sep 13 2026, 9:19 AM.

Details

Reviewers

imp
adrian
dab

Commits

rG22f50379ab93: nvme: delete the I/O queues in the system shutdown path

Summary

A normal shutdown deletes all I/O submission and completion queues
before setting CC.SHN, as the suspend path already does. The
device_shutdown path went straight to the shutdown notification with
the queues live, which some drives take slowly or record as an
unclean stop. Skipped the deletion for failed, removed, or
never-initialized controllers.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 76823
Build 73706: arc lint + arc unit

Event Timeline

seuros requested review of this revision.Sep 13 2026, 9:19 AM

seuros created this revision.

Harbormaster completed remote builds in B76823: Diff 186572.Sep 13 2026, 9:19 AM

seuros added a parent revision: D59631: nvme: honor CRTO for the controller ready timeout.Sep 13 2026, 10:06 AM

seuros added a project: drivers.

seuros added a child revision: D59634: nvme: do not complete a command when its Abort is not performed.Sep 13 2026, 10:49 AM

I love it... if it works. You may need to move it later for my suggested test to success.

sys/dev/nvme/nvme.c
55	This might need to be in a shutdown handler. The way to test is to see if we can still take a kernel crash dump to an NVMe drive on panic... Use the sysctl to panic knob to test :).

seuros marked an inline comment as done.Thu, Sep 24, 5:08 PM

seuros added inline comments.

sys/dev/nvme/nvme.c
55	No move is needed. `nvme_shutdown()` already runs inside a `shutdown_final` handler, wich is after `doadump()`, and on the panic route it does not run at all. It only run on reboot/shutdown(8).