summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Gurtovoy <mgurtovoy@nvidia.com>2024-01-07 02:29:49 +0200
committerKeith Busch <kbusch@kernel.org>2024-01-08 10:09:45 -0800
commita5c1a87ce0876192d4343cdf5f0a22d737eb0ec3 (patch)
tree10cc2ab1ac30cd80024cb1e2634e26beb225db14
parent172fb49600c2b96a4ade255fbfc3fe7098b8afd3 (diff)
downloadlinux-stable-a5c1a87ce0876192d4343cdf5f0a22d737eb0ec3.tar.gz
linux-stable-a5c1a87ce0876192d4343cdf5f0a22d737eb0ec3.tar.bz2
linux-stable-a5c1a87ce0876192d4343cdf5f0a22d737eb0ec3.zip
nvme-rdma: enhance timeout kernel log
Print the command_id along side blk-mq's tag to help match commands with protocol wire traces and logs. Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Keith Busch <kbusch@kernel.org>
-rw-r--r--drivers/nvme/host/rdma.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index bc90ec3c51b0..2e77c0f25f71 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1941,9 +1941,14 @@ static enum blk_eh_timer_return nvme_rdma_timeout(struct request *rq)
struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq);
struct nvme_rdma_queue *queue = req->queue;
struct nvme_rdma_ctrl *ctrl = queue->ctrl;
-
- dev_warn(ctrl->ctrl.device, "I/O %d QID %d timeout\n",
- rq->tag, nvme_rdma_queue_idx(queue));
+ u8 opcode = req->req.cmd->common.opcode;
+ u8 fctype = req->req.cmd->fabrics.fctype;
+ int qid = nvme_rdma_queue_idx(queue);
+
+ dev_warn(ctrl->ctrl.device,
+ "I/O tag %d (%04x) opcode %#x (%s) QID %d timeout\n",
+ rq->tag, nvme_cid(rq), opcode,
+ nvme_opcode_str(qid, opcode, fctype), qid);
if (ctrl->ctrl.state != NVME_CTRL_LIVE) {
/*