RDMA/efa: Extend admin timeout error print

Add command id to the printed message for additional debug information.

Link: https://patch.msgid.link/r/20250703182314.16442-1-mrgolin@amazon.com
Reviewed-by: Yonatan Nachum <ynachum@amazon.com>
Signed-off-by: Michael Margolin <mrgolin@amazon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/efa/efa_com.c b/drivers/infiniband/hw/efa/efa_com.c
index bafd210dd43e86087160e1715c50709b6006e0a9..e6377602a9c41d3031504bb95daf006382434df8 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_com.c
+++ b/drivers/infiniband/hw/efa/efa_com.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
 /*
- * Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #include "efa_com.h"
@@ -30,6 +30,7 @@ struct efa_comp_ctx {
        struct efa_admin_acq_entry *user_cqe;
        u32 comp_size;
        enum efa_cmd_status status;
+       u16 cmd_id;
        u8 cmd_opcode;
        u8 occupied;
 };
@@ -333,6 +334,7 @@ static struct efa_comp_ctx *__efa_com_submit_admin_cmd(struct efa_com_admin_queu
        comp_ctx->comp_size = comp_size_in_bytes;
        comp_ctx->user_cqe = comp;
        comp_ctx->cmd_opcode = cmd->aq_common_descriptor.opcode;
+       comp_ctx->cmd_id = cmd_id;
 
        reinit_completion(&comp_ctx->wait_event);
 
@@ -557,17 +559,19 @@ static int efa_com_wait_and_process_admin_cq_interrupts(struct efa_comp_ctx *com
                if (comp_ctx->status == EFA_CMD_COMPLETED)
                        ibdev_err_ratelimited(
                                aq->efa_dev,
-                               "The device sent a completion but the driver didn't receive any MSI-X interrupt for admin cmd %s(%d) status %d (ctx: 0x%p, sq producer: %d, sq consumer: %d, cq consumer: %d)\n",
+                               "The device sent a completion but the driver didn't receive any MSI-X interrupt for admin cmd %s(%d) status %d (id: %d, sq producer: %d, sq consumer: %d, cq consumer: %d)\n",
                                efa_com_cmd_str(comp_ctx->cmd_opcode),
                                comp_ctx->cmd_opcode, comp_ctx->status,
-                               comp_ctx, aq->sq.pc, aq->sq.cc, aq->cq.cc);
+                               comp_ctx->cmd_id, aq->sq.pc, aq->sq.cc,
+                               aq->cq.cc);
                else
                        ibdev_err_ratelimited(
                                aq->efa_dev,
-                               "The device didn't send any completion for admin cmd %s(%d) status %d (ctx 0x%p, sq producer: %d, sq consumer: %d, cq consumer: %d)\n",
+                               "The device didn't send any completion for admin cmd %s(%d) status %d (id: %d, sq producer: %d, sq consumer: %d, cq consumer: %d)\n",
                                efa_com_cmd_str(comp_ctx->cmd_opcode),
                                comp_ctx->cmd_opcode, comp_ctx->status,
-                               comp_ctx, aq->sq.pc, aq->sq.cc, aq->cq.cc);
+                               comp_ctx->cmd_id, aq->sq.pc, aq->sq.cc,
+                               aq->cq.cc);
 
                clear_bit(EFA_AQ_STATE_RUNNING_BIT, &aq->state);
                err = -ETIME;