xprtrdma: Replace dprintk call sites in ERR_CHUNK path

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 bf10657..d5e6642 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1128,6 +1128,88 @@ DEFINE_REPLY_EVENT(xprtrdma_reply_rqst);
 DEFINE_REPLY_EVENT(xprtrdma_reply_short);
 DEFINE_REPLY_EVENT(xprtrdma_reply_hdr);
 
+TRACE_EVENT(xprtrdma_err_vers,
+       TP_PROTO(
+               const struct rpc_rqst *rqst,
+               __be32 *min,
+               __be32 *max
+       ),
+
+       TP_ARGS(rqst, min, max),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, task_id)
+               __field(unsigned int, client_id)
+               __field(u32, xid)
+               __field(u32, min)
+               __field(u32, max)
+       ),
+
+       TP_fast_assign(
+               __entry->task_id = rqst->rq_task->tk_pid;
+               __entry->client_id = rqst->rq_task->tk_client->cl_clid;
+               __entry->xid = be32_to_cpu(rqst->rq_xid);
+               __entry->min = be32_to_cpup(min);
+               __entry->max = be32_to_cpup(max);
+       ),
+
+       TP_printk("task:%u@%u xid=0x%08x versions=[%u, %u]",
+               __entry->task_id, __entry->client_id, __entry->xid,
+               __entry->min, __entry->max
+       )
+);
+
+TRACE_EVENT(xprtrdma_err_chunk,
+       TP_PROTO(
+               const struct rpc_rqst *rqst
+       ),
+
+       TP_ARGS(rqst),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, task_id)
+               __field(unsigned int, client_id)
+               __field(u32, xid)
+       ),
+
+       TP_fast_assign(
+               __entry->task_id = rqst->rq_task->tk_pid;
+               __entry->client_id = rqst->rq_task->tk_client->cl_clid;
+               __entry->xid = be32_to_cpu(rqst->rq_xid);
+       ),
+
+       TP_printk("task:%u@%u xid=0x%08x",
+               __entry->task_id, __entry->client_id, __entry->xid
+       )
+);
+
+TRACE_EVENT(xprtrdma_err_unrecognized,
+       TP_PROTO(
+               const struct rpc_rqst *rqst,
+               __be32 *procedure
+       ),
+
+       TP_ARGS(rqst, procedure),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, task_id)
+               __field(unsigned int, client_id)
+               __field(u32, xid)
+               __field(u32, procedure)
+       ),
+
+       TP_fast_assign(
+               __entry->task_id = rqst->rq_task->tk_pid;
+               __entry->client_id = rqst->rq_task->tk_client->cl_clid;
+               __entry->procedure = be32_to_cpup(procedure);
+       ),
+
+       TP_printk("task:%u@%u xid=0x%08x procedure=%u",
+               __entry->task_id, __entry->client_id, __entry->xid,
+               __entry->procedure
+       )
+);
+
 TRACE_EVENT(xprtrdma_fixup,
        TP_PROTO(
                const struct rpc_rqst *rqst,

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index 0f5120c..c178f93 100644 (file)
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -1322,20 +1322,13 @@ rpcrdma_decode_error(struct rpcrdma_xprt *r_xprt, struct rpcrdma_rep *rep,
                p = xdr_inline_decode(xdr, 2 * sizeof(*p));
                if (!p)
                        break;
-               dprintk("RPC:       %s: server reports "
-                       "version error (%u-%u), xid %08x\n", __func__,
-                       be32_to_cpup(p), be32_to_cpu(*(p + 1)),
-                       be32_to_cpu(rep->rr_xid));
+               trace_xprtrdma_err_vers(rqst, p, p + 1);
                break;
        case err_chunk:
-               dprintk("RPC:       %s: server reports "
-                       "header decoding error, xid %08x\n", __func__,
-                       be32_to_cpu(rep->rr_xid));
+               trace_xprtrdma_err_chunk(rqst);
                break;
        default:
-               dprintk("RPC:       %s: server reports "
-                       "unrecognized error %d, xid %08x\n", __func__,
-                       be32_to_cpup(p), be32_to_cpu(rep->rr_xid));
+               trace_xprtrdma_err_unrecognized(rqst, p);
        }
 
        return -EIO;