[PATCH] nvme-pci: print the command name of aborted commands

[PATCH] nvme-pci: print the command name of aborted commands

[Christoph Hellwig]

To allow for slightly better debugging, print the command name when
aborting an command.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvme/host/pci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e465902e0b752..1f229dabbe7aa 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1434,8 +1434,10 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
 	cmd.abort.sqid = cpu_to_le16(nvmeq->qid);
 
 	dev_warn(nvmeq->dev->ctrl.device,
-		"I/O %d QID %d timeout, aborting\n",
-		 req->tag, nvmeq->qid);
+		"I/O %d (%s) QID %d timeout, aborting\n",
+		 req->tag,
+		 nvme_get_opcode_str(nvme_req(req)->cmd->common.opcode),
+		 nvmeq->qid);
 
 	abort_req = blk_mq_alloc_request(dev->ctrl.admin_q, nvme_req_op(&cmd),
 					 BLK_MQ_REQ_NOWAIT);
-- 
2.30.2

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Keith Busch]

On Mon, Jul 18, 2022 at 07:13:57AM +0200, Christoph Hellwig wrote:
> To allow for slightly better debugging, print the command name when
> aborting an command.

Good idea, looks good.

Reviewed-by: Keith Busch <kbusch@kernel.org>

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Chaitanya Kulkarni]

On 7/17/22 22:13, Christoph Hellwig wrote:
> To allow for slightly better debugging, print the command name when
> aborting an command.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---

Definitely useful, looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Sagi Grimberg]

> To allow for slightly better debugging, print the command name when
> aborting an command.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>   drivers/nvme/host/pci.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index e465902e0b752..1f229dabbe7aa 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -1434,8 +1434,10 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
>   	cmd.abort.sqid = cpu_to_le16(nvmeq->qid);
>   
>   	dev_warn(nvmeq->dev->ctrl.device,
> -		"I/O %d QID %d timeout, aborting\n",
> -		 req->tag, nvmeq->qid);
> +		"I/O %d (%s) QID %d timeout, aborting\n",
> +		 req->tag,
> +		 nvme_get_opcode_str(nvme_req(req)->cmd->common.opcode),
> +		 nvmeq->qid);

I want that for rdma/tcp/loop as well.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Christoph Hellwig]

On Fri, Jul 22, 2022 at 01:20:48AM +0300, Sagi Grimberg wrote:
> I want that for rdma/tcp/loop as well.

We don't ever send an abort from those currently.

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Christoph Hellwig]

We'll need to fold this in to fix the modular build:

diff --git a/drivers/nvme/host/constants.c b/drivers/nvme/host/constants.c
index 6973c2a17c13d..e958d50155857 100644
--- a/drivers/nvme/host/constants.c
+++ b/drivers/nvme/host/constants.c
@@ -177,6 +177,7 @@ const unsigned char *nvme_get_opcode_str(u8 opcode)
 		return nvme_ops[opcode];
 	return "Unknown";
 }
+EXPORT_SYMBOL_GPL(nvme_get_opcode_str);
 
 const unsigned char *nvme_get_admin_opcode_str(u8 opcode)
 {

Re: [PATCH] nvme-pci: print the command name of aborted commands

[Sagi Grimberg]

>> I want that for rdma/tcp/loop as well.
> 
> We don't ever send an abort from those currently.

I meant on timedout requests.