xprtrdma: Add trace points to instrument memory invalidation

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index 7336cdc173edf29e275b187f2735537c7d09210a..fadb4b687595da699f5eadcd98155f525cbe01ff 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -201,6 +201,41 @@ DECLARE_EVENT_CLASS(xprtrdma_frwr_done,
                                ),                                      \
                                TP_ARGS(wc, frwr))
 
+DECLARE_EVENT_CLASS(xprtrdma_mr,
+       TP_PROTO(
+               const struct rpcrdma_mr *mr
+       ),
+
+       TP_ARGS(mr),
+
+       TP_STRUCT__entry(
+               __field(const void *, mr)
+               __field(u32, handle)
+               __field(u32, length)
+               __field(u64, offset)
+       ),
+
+       TP_fast_assign(
+               __entry->mr = mr;
+               __entry->handle = mr->mr_handle;
+               __entry->length = mr->mr_length;
+               __entry->offset = mr->mr_offset;
+       ),
+
+       TP_printk("mr=%p %u@0x%016llx:0x%08x",
+               __entry->mr, __entry->length,
+               (unsigned long long)__entry->offset,
+               __entry->handle
+       )
+);
+
+#define DEFINE_MR_EVENT(name) \
+               DEFINE_EVENT(xprtrdma_mr, name, \
+                               TP_PROTO( \
+                                       const struct rpcrdma_mr *mr \
+                               ), \
+                               TP_ARGS(mr))
+
 /**
  ** Call events
  **/
@@ -382,6 +417,12 @@ TRACE_EVENT(xprtrdma_wc_receive,
 );
 
 DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_fastreg);
+DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li);
+DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li_wake);
+
+DEFINE_MR_EVENT(xprtrdma_localinv);
+DEFINE_MR_EVENT(xprtrdma_dma_unmap);
+DEFINE_MR_EVENT(xprtrdma_remoteinv);
 
 /**
  ** Reply events

diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c
index 7f2f2b774076c1a3118583fe7dfb1a1e829d6dfb..d5f95bb39300e61ac2e3e4f9ddd83e947135473f 100644 (file)
--- a/net/sunrpc/xprtrdma/fmr_ops.c
+++ b/net/sunrpc/xprtrdma/fmr_ops.c
@@ -148,6 +148,7 @@ out_release:
        pr_err("rpcrdma: FMR reset failed (%d), %p released\n", rc, mr);
        r_xprt->rx_stats.mrs_orphaned++;
 
+       trace_xprtrdma_dma_unmap(mr);
        ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,
                        mr->mr_sg, mr->mr_nents, mr->mr_dir);
 
@@ -273,6 +274,7 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
        list_for_each_entry(mr, mrs, mr_list) {
                dprintk("RPC:       %s: unmapping fmr %p\n",
                        __func__, &mr->fmr);
+               trace_xprtrdma_localinv(mr);
                list_add_tail(&mr->fmr.fm_mr->list, &unmap_list);
        }
        r_xprt->rx_stats.local_inv_needed++;
@@ -285,8 +287,6 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
         */
        while (!list_empty(mrs)) {
                mr = rpcrdma_mr_pop(mrs);
-               dprintk("RPC:       %s: DMA unmapping fmr %p\n",
-                       __func__, &mr->fmr);
                list_del(&mr->fmr.fm_mr->list);
                rpcrdma_mr_unmap_and_put(mr);
        }

diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index afbeb9b442bf978a7feeddca7a584b996bbc86da..90f688f19783d089fe90fffc40f104bb6e43a94c 100644 (file)
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -182,9 +182,11 @@ frwr_op_recover_mr(struct rpcrdma_mr *mr)
        int rc;
 
        rc = __frwr_mr_reset(ia, mr);
-       if (state != FRWR_FLUSHED_LI)
+       if (state != FRWR_FLUSHED_LI) {
+               trace_xprtrdma_dma_unmap(mr);
                ib_dma_unmap_sg(ia->ri_device,
                                mr->mr_sg, mr->mr_nents, mr->mr_dir);
+       }
        if (rc)
                goto out_release;
 
@@ -307,16 +309,16 @@ frwr_wc_fastreg(struct ib_cq *cq, struct ib_wc *wc)
 static void
 frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc)
 {
-       struct rpcrdma_frwr *frwr;
-       struct ib_cqe *cqe;
+       struct ib_cqe *cqe = wc->wr_cqe;
+       struct rpcrdma_frwr *frwr = container_of(cqe, struct rpcrdma_frwr,
+                                                fr_cqe);
 
        /* WARNING: Only wr_cqe and status are reliable at this point */
        if (wc->status != IB_WC_SUCCESS) {
-               cqe = wc->wr_cqe;
-               frwr = container_of(cqe, struct rpcrdma_frwr, fr_cqe);
                frwr->fr_state = FRWR_FLUSHED_LI;
                __frwr_sendcompletion_flush(wc, "localinv");
        }
+       trace_xprtrdma_wc_li(wc, frwr);
 }
 
 /**
@@ -329,17 +331,17 @@ frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc)
 static void
 frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc)
 {
-       struct rpcrdma_frwr *frwr;
-       struct ib_cqe *cqe;
+       struct ib_cqe *cqe = wc->wr_cqe;
+       struct rpcrdma_frwr *frwr = container_of(cqe, struct rpcrdma_frwr,
+                                                fr_cqe);
 
        /* WARNING: Only wr_cqe and status are reliable at this point */
-       cqe = wc->wr_cqe;
-       frwr = container_of(cqe, struct rpcrdma_frwr, fr_cqe);
        if (wc->status != IB_WC_SUCCESS) {
                frwr->fr_state = FRWR_FLUSHED_LI;
                __frwr_sendcompletion_flush(wc, "localinv");
        }
        complete(&frwr->fr_linv_done);
+       trace_xprtrdma_wc_li_wake(wc, frwr);
 }
 
 /* Post a REG_MR Work Request to register a memory region
@@ -457,6 +459,7 @@ frwr_op_reminv(struct rpcrdma_rep *rep, struct list_head *mrs)
        list_for_each_entry(mr, mrs, mr_list)
                if (mr->mr_handle == rep->rr_inv_rkey) {
                        list_del(&mr->mr_list);
+                       trace_xprtrdma_remoteinv(mr);
                        mr->frwr.fr_state = FRWR_IS_INVALID;
                        rpcrdma_mr_unmap_and_put(mr);
                        break;  /* only one invalidated MR per RPC */
@@ -492,9 +495,7 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
                mr->frwr.fr_state = FRWR_IS_INVALID;
 
                frwr = &mr->frwr;
-
-               dprintk("RPC:       %s: invalidating frwr %p\n",
-                       __func__, frwr);
+               trace_xprtrdma_localinv(mr);
 
                frwr->fr_cqe.done = frwr_wc_localinv;
                last = &frwr->fr_invwr;
@@ -536,8 +537,6 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
 unmap:
        while (!list_empty(mrs)) {
                mr = rpcrdma_mr_pop(mrs);
-               dprintk("RPC:       %s: DMA unmapping frwr %p\n",
-                       __func__, &mr->frwr);
                rpcrdma_mr_unmap_and_put(mr);
        }
        return;

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index cfa3c03288786698708f84409c866494075ce02d..0e89e5529d6cbb1546f326a65bbb8df7715d56d2 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1349,6 +1349,7 @@ rpcrdma_mr_unmap_and_put(struct rpcrdma_mr *mr)
 {
        struct rpcrdma_xprt *r_xprt = mr->mr_xprt;
 
+       trace_xprtrdma_dma_unmap(mr);
        ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,
                        mr->mr_sg, mr->mr_nents, mr->mr_dir);
        __rpcrdma_mr_put(&r_xprt->rx_buf, mr);