* [PATCH 1/2] nvme-rdma: enhance timeout kernel log
@ 2024-01-07 0:29 Max Gurtovoy
2024-01-07 0:29 ` [PATCH 2/2] nvme-tcp: " Max Gurtovoy
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Max Gurtovoy @ 2024-01-07 0:29 UTC (permalink / raw)
To: kbusch, hch, sagi, linux-nvme; +Cc: Max Gurtovoy
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>
---
drivers/nvme/host/rdma.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 7c99c87688dd..a380bafbed08 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1946,9 +1946,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) {
/*
--
2.18.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] nvme-tcp: enhance timeout kernel log
2024-01-07 0:29 [PATCH 1/2] nvme-rdma: enhance timeout kernel log Max Gurtovoy
@ 2024-01-07 0:29 ` Max Gurtovoy
2024-01-08 8:25 ` Christoph Hellwig
2024-01-08 8:25 ` [PATCH 1/2] nvme-rdma: " Christoph Hellwig
2024-01-08 16:16 ` Keith Busch
2 siblings, 1 reply; 6+ messages in thread
From: Max Gurtovoy @ 2024-01-07 0:29 UTC (permalink / raw)
To: kbusch, hch, sagi, linux-nvme; +Cc: Max Gurtovoy
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>
---
drivers/nvme/host/tcp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 5056bcae2f39..b234f0674aeb 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -2425,9 +2425,9 @@ static enum blk_eh_timer_return nvme_tcp_timeout(struct request *rq)
int qid = nvme_tcp_queue_id(req->queue);
dev_warn(ctrl->device,
- "queue %d: timeout cid %#x type %d opcode %#x (%s)\n",
- nvme_tcp_queue_id(req->queue), nvme_cid(rq), pdu->hdr.type,
- opc, nvme_opcode_str(qid, opc, fctype));
+ "I/O tag %d (%04x) type %d opcode %#x (%s) QID %d timeout\n",
+ rq->tag, nvme_cid(rq), pdu->hdr.type, opc,
+ nvme_opcode_str(qid, opc, fctype), qid);
if (ctrl->state != NVME_CTRL_LIVE) {
/*
--
2.18.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] nvme-rdma: enhance timeout kernel log
2024-01-07 0:29 [PATCH 1/2] nvme-rdma: enhance timeout kernel log Max Gurtovoy
2024-01-07 0:29 ` [PATCH 2/2] nvme-tcp: " Max Gurtovoy
@ 2024-01-08 8:25 ` Christoph Hellwig
2024-01-08 16:16 ` Keith Busch
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2024-01-08 8:25 UTC (permalink / raw)
To: Max Gurtovoy; +Cc: kbusch, hch, sagi, linux-nvme
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] nvme-rdma: enhance timeout kernel log
2024-01-07 0:29 [PATCH 1/2] nvme-rdma: enhance timeout kernel log Max Gurtovoy
2024-01-07 0:29 ` [PATCH 2/2] nvme-tcp: " Max Gurtovoy
2024-01-08 8:25 ` [PATCH 1/2] nvme-rdma: " Christoph Hellwig
@ 2024-01-08 16:16 ` Keith Busch
2024-01-08 17:24 ` Sagi Grimberg
2 siblings, 1 reply; 6+ messages in thread
From: Keith Busch @ 2024-01-08 16:16 UTC (permalink / raw)
To: Max Gurtovoy; +Cc: hch, sagi, linux-nvme
On Sun, Jan 07, 2024 at 02:29:49AM +0200, Max Gurtovoy wrote:
> 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>
Thanks, applied both to nvme-6.8.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-08 17:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-07 0:29 [PATCH 1/2] nvme-rdma: enhance timeout kernel log Max Gurtovoy
2024-01-07 0:29 ` [PATCH 2/2] nvme-tcp: " Max Gurtovoy
2024-01-08 8:25 ` Christoph Hellwig
2024-01-08 8:25 ` [PATCH 1/2] nvme-rdma: " Christoph Hellwig
2024-01-08 16:16 ` Keith Busch
2024-01-08 17:24 ` Sagi Grimberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox