IB/hfi1: Add unique trace point for pio and sdma send

This allows for separately enabling pio and sdma
tracepoints to cut the volume of trace information.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/rc.c b/drivers/staging/rdma/hfi1/rc.c
index 351f136c7caac1cd7a6610b55a4f425efe68e8e7..0d7e1017f3cbbf8cf5b75bb27406f678d303b3aa 100644 (file)
--- a/drivers/staging/rdma/hfi1/rc.c
+++ b/drivers/staging/rdma/hfi1/rc.c
@@ -881,7 +881,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp,
                goto queue_ack;
        }
 
-       trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device), &hdr);
+       trace_ack_output_ibhdr(dd_from_ibdev(qp->ibqp.device), &hdr);
 
        /* write the pbc and data */
        ppd->dd->pio_inline_send(ppd->dd, pbuf, pbc, &hdr, hwords);

diff --git a/drivers/staging/rdma/hfi1/trace.h b/drivers/staging/rdma/hfi1/trace.h
index b8b44168e62d1ad7622f58d447f85408c01cc726..4d91c18fa6944036279094e8feb981b7ef686f48 100644 (file)
--- a/drivers/staging/rdma/hfi1/trace.h
+++ b/drivers/staging/rdma/hfi1/trace.h
@@ -530,7 +530,15 @@ DEFINE_EVENT(hfi1_ibhdr_template, input_ibhdr,
             TP_PROTO(struct hfi1_devdata *dd, struct hfi1_ib_header *hdr),
             TP_ARGS(dd, hdr));
 
-DEFINE_EVENT(hfi1_ibhdr_template, output_ibhdr,
+DEFINE_EVENT(hfi1_ibhdr_template, pio_output_ibhdr,
+            TP_PROTO(struct hfi1_devdata *dd, struct hfi1_ib_header *hdr),
+            TP_ARGS(dd, hdr));
+
+DEFINE_EVENT(hfi1_ibhdr_template, ack_output_ibhdr,
+            TP_PROTO(struct hfi1_devdata *dd, struct hfi1_ib_header *hdr),
+            TP_ARGS(dd, hdr));
+
+DEFINE_EVENT(hfi1_ibhdr_template, sdma_output_ibhdr,
             TP_PROTO(struct hfi1_devdata *dd, struct hfi1_ib_header *hdr),
             TP_ARGS(dd, hdr));
 

diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c
index 82097571aa85711595e98a72806d01154e8a871e..e605e09d80840097671283817169af11fc7bd6ad 100644 (file)
--- a/drivers/staging/rdma/hfi1/verbs.c
+++ b/drivers/staging/rdma/hfi1/verbs.c
@@ -891,8 +891,8 @@ int hfi1_verbs_send_dma(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
                if (unlikely(ret))
                        goto bail_build;
        }
-       trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
-                          &ps->s_txreq->phdr.hdr);
+       trace_sdma_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
+                               &ps->s_txreq->phdr.hdr);
        ret =  sdma_send_txreq(tx->sde, &priv->s_iowait, &tx->txreq);
        if (unlikely(ret == -ECOMM))
                goto bail_ecomm;
@@ -1067,8 +1067,8 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
                }
        }
 
-       trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
-                          &ps->s_txreq->phdr.hdr);
+       trace_pio_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
+                              &ps->s_txreq->phdr.hdr);
 
 pio_bail:
        if (qp->s_wqe) {