IB/rdmavt: Add trace and error print statements in post_one_wr

These trace and error print statements would help in debugging issues which
are caused due to messed up QP ring buffer pointers.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 522404ac7c3856843a9d5820b8e17ee8fdf9d9b9..d629911ab0abc75640a3f1fda6447c3617d755b0 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -1441,7 +1441,12 @@ static int rvt_post_one_wr(struct rvt_qp *qp, struct ib_send_wr *wr)
        /* check for avail */
        if (unlikely(!qp->s_avail)) {
                qp->s_avail = qp_get_savail(qp);
-               WARN_ON(qp->s_avail > (qp->s_size - 1));
+               if (WARN_ON(qp->s_avail > (qp->s_size - 1)))
+                       rvt_pr_err(rdi,
+                                  "More avail entries than QP RB size.\nQP: %u, size: %u, avail: %u\nhead: %u, tail: %u, cur: %u, acked: %u, last: %u",
+                                  qp->ibqp.qp_num, qp->s_size, qp->s_avail,
+                                  qp->s_head, qp->s_tail, qp->s_cur,
+                                  qp->s_acked, qp->s_last);
                if (!qp->s_avail)
                        return -ENOMEM;
        }
@@ -1510,6 +1515,7 @@ static int rvt_post_one_wr(struct rvt_qp *qp, struct ib_send_wr *wr)
        wqe->lpsn = wqe->psn +
                        (wqe->length ? ((wqe->length - 1) >> log_pmtu) : 0);
        qp->s_next_psn = wqe->lpsn + 1;
+       trace_rvt_post_one_wr(qp, wqe);
        smp_wmb(); /* see request builders */
        qp->s_avail--;
        qp->s_head = next;

diff --git a/drivers/infiniband/sw/rdmavt/trace.h b/drivers/infiniband/sw/rdmavt/trace.h
index d5b128118b731c37731909c1109f9a8327b2bfb7..6c0457db5499e6e04bc5fcc5e18a636d87b0a2ec 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/trace.h
+++ b/drivers/infiniband/sw/rdmavt/trace.h
@@ -54,6 +54,7 @@
 #include <linux/tracepoint.h>
 #include <linux/trace_seq.h>
 
+#include <rdma/ib_verbs.h>
 #include <rdma/rdma_vt.h>
 
 #define RDI_DEV_ENTRY(rdi)   __string(dev, rdi->driver_f.get_card_name(rdi))
@@ -108,6 +109,75 @@ DEFINE_EVENT(rvt_qphash_template, rvt_qpremove,
        TP_PROTO(struct rvt_qp *qp, u32 bucket),
        TP_ARGS(qp, bucket));
 
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rvt_tx
+
+#define wr_opcode_name(opcode) { IB_WR_##opcode, #opcode  }
+#define show_wr_opcode(opcode)                             \
+__print_symbolic(opcode,                                   \
+       wr_opcode_name(RDMA_WRITE),                        \
+       wr_opcode_name(RDMA_WRITE_WITH_IMM),               \
+       wr_opcode_name(SEND),                              \
+       wr_opcode_name(SEND_WITH_IMM),                     \
+       wr_opcode_name(RDMA_READ),                         \
+       wr_opcode_name(ATOMIC_CMP_AND_SWP),                \
+       wr_opcode_name(ATOMIC_FETCH_AND_ADD),              \
+       wr_opcode_name(LSO),                               \
+       wr_opcode_name(SEND_WITH_INV),                     \
+       wr_opcode_name(RDMA_READ_WITH_INV),                \
+       wr_opcode_name(LOCAL_INV),                         \
+       wr_opcode_name(MASKED_ATOMIC_CMP_AND_SWP),         \
+       wr_opcode_name(MASKED_ATOMIC_FETCH_AND_ADD))
+
+#define POS_PRN \
+"[%s] wr_id %llx qpn %x psn 0x%x lpsn 0x%x length %u opcode 0x%.2x,%s size %u avail %u head %u last %u"
+
+TRACE_EVENT(
+       rvt_post_one_wr,
+       TP_PROTO(struct rvt_qp *qp, struct rvt_swqe *wqe),
+       TP_ARGS(qp, wqe),
+       TP_STRUCT__entry(
+               RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
+               __field(u64, wr_id)
+               __field(u32, qpn)
+               __field(u32, psn)
+               __field(u32, lpsn)
+               __field(u32, length)
+               __field(u32, opcode)
+               __field(u32, size)
+               __field(u32, avail)
+               __field(u32, head)
+               __field(u32, last)
+       ),
+       TP_fast_assign(
+               RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
+               __entry->wr_id = wqe->wr.wr_id;
+               __entry->qpn = qp->ibqp.qp_num;
+               __entry->psn = wqe->psn;
+               __entry->lpsn = wqe->lpsn;
+               __entry->length = wqe->length;
+               __entry->opcode = wqe->wr.opcode;
+               __entry->size = qp->s_size;
+               __entry->avail = qp->s_avail;
+               __entry->head = qp->s_head;
+               __entry->last = qp->s_last;
+       ),
+       TP_printk(
+               POS_PRN,
+               __get_str(dev),
+               __entry->wr_id,
+               __entry->qpn,
+               __entry->psn,
+               __entry->lpsn,
+               __entry->length,
+               __entry->opcode, show_wr_opcode(__entry->opcode),
+               __entry->size,
+               __entry->avail,
+               __entry->head,
+               __entry->last
+       )
+);
+
 #endif /* __RDMAVT_TRACE_H */
 
 #undef TRACE_INCLUDE_PATH