nvme-rdma: enhance timeout kernel log
PATCH 1/2 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 <[email protected]>
--- drivers/nvme/host/rdma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/nvme/host/rdma.c +8 -3
@@ -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 ) {/*
Signature · 1 line
2.18.1
PATCH 2/2 nvme-tcp: 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 <[email protected]>
--- drivers/nvme/host/tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/tcp.c +3 -3
@@ -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 ) {/*
Signature · 1 line
2.18.1
Re: [PATCH 2/2] nvme-tcp: enhance timeout kernel log
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Quoted 4 lines · Max Gurtovoy
Print the
command_idalong side blk-mq's tag to help match commands with protocol wire traces and logs.Signed-off-by Max Gurtovoy <[email protected]>
Thanks, applied both to nvme-6.8.
FWIW, for the series
Reviewed-by Sagi Grimberg <[email protected]>