Page MenuHomeFreeBSD
Files F174713318

D42065.id128526.diff
No OneTemporary
Actions

D42065.id128526.diff
View Options

diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -727,6 +727,10 @@
mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF);
mtx_init(&qpair->recovery, "nvme qpair recovery", NULL, MTX_DEF);
+ callout_init_mtx(&qpair->timer, &qpair->recovery, 0);
+ qpair->timer_armed = false;
+ qpair->recovery_state = RECOVERY_WAITING;
+
/* Note: NVMe PRP format is restricted to 4-byte alignment. */
err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev),
4, ctrlr->page_size, BUS_SPACE_MAXADDR,
@@ -792,10 +796,6 @@
qpair->cpl_bus_addr = queuemem_phys + cmdsz;
prpmem_phys = queuemem_phys + cmdsz + cplsz;
- callout_init_mtx(&qpair->timer, &qpair->recovery, 0);
- qpair->timer_armed = false;
- qpair->recovery_state = RECOVERY_WAITING;
-
/*
* Calcuate the stride of the doorbell register. Many emulators set this
* value to correspond to a cache line. However, some hardware has set
@@ -891,6 +891,9 @@
{
struct nvme_tracker *tr;
+ mtx_lock(&qpair->recovery);
+ qpair->timer_armed = false;
+ mtx_unlock(&qpair->recovery);
callout_drain(&qpair->timer);
if (qpair->tag) {
@@ -1039,6 +1042,19 @@
return;
}
+ /*
+ * Shutdown condition: We set qpair->timer_armed to false in
+ * nvme_qpair_destroy before calling callout_drain. When we call that,
+ * this routine might get called one last time. Exit w/o setting a
+ * timeout. None of the watchdog stuff needs to be done since we're
+ * destroying the qpair.
+ */
+ if (!qpair->timer_armed) {
+ nvme_printf(qpair->ctrlr,
+ "Timeout fired during nvme_qpair_destroy\n");
+ return;
+ }
+
switch (qpair->recovery_state) {
case RECOVERY_NONE:
/*

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 6, 10:21 AM (1 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40292554
Default Alt Text
D42065.id128526.diff (1 KB)

Event Timeline