Skip to contentSkip to conversation

nvme/pci: Don't mark IOD as aborted if abort wasn't sent

PATCH New Keith Busch 4 participants 4 messages Jan 24, 2017 – Jan 31, 2017 NVMe

lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 nvme/pci: Don't mark IOD as aborted if abort wasn't sent

This patch sets the aborted flag only if an abort was sent, reducing excessive kernel message spamming for completed IO that wasn't actually aborted.

Reported-by Jens Axboe <axboe at kernel.dk>
Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/nvme/host/pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/pci.c +1 -2
index 3d21a15..f88659b 100644
@@ -905,12 +905,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
 		return BLK_EH_HANDLED;
 	}
 
-	iod->aborted = 1;
-
 	if (atomic_dec_return(&dev->ctrl.abort_limit) < 0) {
 		atomic_inc(&dev->ctrl.abort_limit);
 		return BLK_EH_RESET_TIMER;
 	}
+	iod->aborted = 1;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.abort.opcode = nvme_admin_abort_cmd;
Signature · 1 line
2.5.5
maintainer
#1 lore raw

PATCH 1/1 nvme/pci: Don't mark IOD as aborted if abort wasn't sent

Quoted 6 lines · Keith Busch

This patch sets the aborted flag only if an abort was sent, reducing excessive kernel message spamming for completed IO that wasn't actually aborted.

Reported-by Jens Axboe <axboe at kernel.dk>
Signed-off-by Keith Busch <keith.busch at intel.com>

Looks fine,

Reviewed-by Christoph Hellwig <hch at lst.de>
maintainer
#2 lore raw

PATCH 1/1 nvme/pci: Don't mark IOD as aborted if abort wasn't sent

Looks good,

Reviewed-by Sagi Grimberg <sagi at grimberg.me>
#3 lore raw

PATCH 1/1 nvme/pci: Don't mark IOD as aborted if abort wasn't sent

In reply to Keith Busch
Quoted 3 lines · Keith Busch

This patch sets the aborted flag only if an abort was sent, reducing excessive kernel message spamming for completed IO that wasn't actually aborted.

Thanks for handling this Keith, applied.

Signature · 1 line
Jens Axboe