Skip to contentSkip to conversation

nvme-pci: fix timeout request state check

PATCH Applied Keith Busch 3 participants 3 messages Jan 18, 2023 – Jan 23, 2023 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 nvme-pci: fix timeout request state check

From: Keith Busch <[email protected]>

Polling the completion can progress the request state to IDLE, either inline with the completion, or through softirq. Either way, the state may not be COMPLETED, so don't check for that. We only care if the state isn't IN_FLIGHT.

This is fixing an issue where the driver aborts an IO that we just completed. Seeing the "aborting" message instead of "polled" is very misleading as to where the timeout problem resides.

Fixes bf392a5dc02a9b ("nvme-pci: Remove tag from process cq")

---
v2->v3: changed state check to explicitly look for not IN_FLIGHT

 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
index a2553b7d9bb8e..1ff8843bc4b36 100644
@@ -1362,7 +1362,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)
 	else
 		nvme_poll_irqdisable(nvmeq);
 
-	if (blk_mq_request_completed(req)) {
+	if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT) {
 		dev_warn(dev->ctrl.device,
 			 "I/O %d QID %d timeout, completion polled\n",
 			 req->tag, nvmeq->qid);
Signature · 1 line
2.30.2
maintainer
#2 lore raw
In reply to Keith Busch
Quoted 25 lines

From: Keith Busch <[email protected]>

Polling the completion can progress the request state to IDLE, either inline with the completion, or through softirq. Either way, the state may not be COMPLETED, so don't check for that. We only care if the state isn't IN_FLIGHT.

This is fixing an issue where the driver aborts an IO that we just completed. Seeing the "aborting" message instead of "polled" is very misleading as to where the timeout problem resides.

Fixes bf392a5dc02a9b ("nvme-pci: Remove tag from process cq")

---
v2->v3: changed state check to explicitly look for not IN_FLIGHT

  drivers/nvme/host/pci.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +0 -0
index a2553b7d9bb8e..1ff8843bc4b36 100644

drivers/nvme/host/pci.c static enum blk_eh_timer_return nvme_timeout(struct request *req) · line 1365

Quoted 5 lines
drivers/nvme/host/pci.c +1 -1
@@ -1362,7 +1362,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)
  	else
  		nvme_poll_irqdisable(nvmeq);
 
-	if (blk_mq_request_completed(req)) {
+	if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT) {

I think that this change also applies to nvmf_complete_timed_out_request no?