xprtrdma: Introduce Receive completion IDs

Set up a completion ID in each rpcrdma_rep. The ID is used to match
an incoming Receive completion to a transport and to a previous
ib_post_recv().

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 d5e66428e27eeefab20282e58a73f13030214ad9..1c91c8e721e71373f07ed0d802ecc1c8f721bbac 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -771,15 +771,17 @@ TRACE_EVENT(xprtrdma_post_recv,
        TP_ARGS(rep),
 
        TP_STRUCT__entry(
-               __field(const void *, rep)
+               __field(u32, cq_id)
+               __field(int, completion_id)
        ),
 
        TP_fast_assign(
-               __entry->rep = rep;
+               __entry->cq_id = rep->rr_cid.ci_queue_id;
+               __entry->completion_id = rep->rr_cid.ci_completion_id;
        ),
 
-       TP_printk("rep=%p",
-               __entry->rep
+       TP_printk("cq.id=%d cid=%d",
+               __entry->cq_id, __entry->completion_id
        )
 );
 
@@ -845,6 +847,8 @@ TRACE_EVENT(xprtrdma_post_linv,
  ** Completion events
  **/
 
+DEFINE_COMPLETION_EVENT(xprtrdma_wc_receive);
+
 TRACE_EVENT(xprtrdma_wc_send,
        TP_PROTO(
                const struct rpcrdma_sendctx *sc,
@@ -876,40 +880,6 @@ TRACE_EVENT(xprtrdma_wc_send,
        )
 );
 
-TRACE_EVENT(xprtrdma_wc_receive,
-       TP_PROTO(
-               const struct ib_wc *wc
-       ),
-
-       TP_ARGS(wc),
-
-       TP_STRUCT__entry(
-               __field(const void *, rep)
-               __field(u32, byte_len)
-               __field(unsigned int, status)
-               __field(u32, vendor_err)
-       ),
-
-       TP_fast_assign(
-               __entry->rep = container_of(wc->wr_cqe, struct rpcrdma_rep,
-                                           rr_cqe);
-               __entry->status = wc->status;
-               if (wc->status) {
-                       __entry->byte_len = 0;
-                       __entry->vendor_err = wc->vendor_err;
-               } else {
-                       __entry->byte_len = wc->byte_len;
-                       __entry->vendor_err = 0;
-               }
-       ),
-
-       TP_printk("rep=%p %u bytes: %s (%u/0x%x)",
-               __entry->rep, __entry->byte_len,
-               rdma_show_wc_status(__entry->status),
-               __entry->status, __entry->vendor_err
-       )
-);
-
 DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_fastreg);
 DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li);
 DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li_wake);

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index ad6e2e4994ce8edd52b920976a27f3bc8ffc0d2c..2c8d2801ec4f25e5ae067e14f573927591b79bb5 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -186,7 +186,7 @@ static void rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc)
        struct rpcrdma_xprt *r_xprt = cq->cq_context;
 
        /* WARNING: Only wr_cqe and status are reliable at this point */
-       trace_xprtrdma_wc_receive(wc);
+       trace_xprtrdma_wc_receive(wc, &rep->rr_cid);
        --r_xprt->rx_ep->re_receive_count;
        if (wc->status != IB_WC_SUCCESS)
                goto out_flushed;
@@ -972,6 +972,9 @@ struct rpcrdma_rep *rpcrdma_rep_create(struct rpcrdma_xprt *r_xprt,
        if (!rpcrdma_regbuf_dma_map(r_xprt, rep->rr_rdmabuf))
                goto out_free_regbuf;
 
+       rep->rr_cid.ci_completion_id =
+               atomic_inc_return(&r_xprt->rx_ep->re_completion_ids);
+
        xdr_buf_init(&rep->rr_hdrbuf, rdmab_data(rep->rr_rdmabuf),
                     rdmab_length(rep->rr_rdmabuf));
        rep->rr_cqe.done = rpcrdma_wc_receive;
@@ -1411,6 +1414,7 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp)
                if (!rep)
                        break;
 
+               rep->rr_cid.ci_queue_id = ep->re_attr.recv_cq->res.id;
                trace_xprtrdma_post_recv(rep);
                rep->rr_recv_wr.next = wr;
                wr = &rep->rr_recv_wr;

diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 43974ef39a5055f9c56b736cc5c5da20d36a4c55..b94940bc67aa03d9b6a85406f230eccbd93cc658 100644 (file)
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -53,6 +53,7 @@
 #include <rdma/ib_verbs.h>             /* RDMA verbs api */
 
 #include <linux/sunrpc/clnt.h>                 /* rpc_xprt */
+#include <linux/sunrpc/rpc_rdma_cid.h>         /* completion IDs */
 #include <linux/sunrpc/rpc_rdma.h>     /* RPC/RDMA protocol */
 #include <linux/sunrpc/xprtrdma.h>     /* xprt parameters */
 
@@ -93,6 +94,8 @@ struct rpcrdma_ep {
        unsigned int            re_max_requests; /* depends on device */
        unsigned int            re_inline_send; /* negotiated */
        unsigned int            re_inline_recv; /* negotiated */
+
+       atomic_t                re_completion_ids;
 };
 
 /* Pre-allocate extra Work Requests for handling backward receives
@@ -180,6 +183,8 @@ enum {
 
 struct rpcrdma_rep {
        struct ib_cqe           rr_cqe;
+       struct rpc_rdma_cid     rr_cid;
+
        __be32                  rr_xid;
        __be32                  rr_vers;
        __be32                  rr_proc;