Merge tag 'nfs-for-5.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[platform/kernel/linux-starfive.git] / include / trace / events / rpcrdma.h

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index 81b8742..051f26f 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1442,7 +1442,7 @@ DECLARE_EVENT_CLASS(svcrdma_segment_event,
 );
 
 #define DEFINE_SEGMENT_EVENT(name)                                     \
-               DEFINE_EVENT(svcrdma_segment_event, svcrdma_encode_##name,\
+               DEFINE_EVENT(svcrdma_segment_event, svcrdma_##name,\
                                TP_PROTO(                               \
                                        u32 handle,                     \
                                        u32 length,                     \
@@ -1450,8 +1450,11 @@ DECLARE_EVENT_CLASS(svcrdma_segment_event,
                                ),                                      \
                                TP_ARGS(handle, length, offset))
 
-DEFINE_SEGMENT_EVENT(rseg);
-DEFINE_SEGMENT_EVENT(wseg);
+DEFINE_SEGMENT_EVENT(decode_wseg);
+DEFINE_SEGMENT_EVENT(encode_rseg);
+DEFINE_SEGMENT_EVENT(send_rseg);
+DEFINE_SEGMENT_EVENT(encode_wseg);
+DEFINE_SEGMENT_EVENT(send_wseg);
 
 DECLARE_EVENT_CLASS(svcrdma_chunk_event,
        TP_PROTO(
@@ -1474,17 +1477,19 @@ DECLARE_EVENT_CLASS(svcrdma_chunk_event,
 );
 
 #define DEFINE_CHUNK_EVENT(name)                                       \
-               DEFINE_EVENT(svcrdma_chunk_event, svcrdma_encode_##name,\
+               DEFINE_EVENT(svcrdma_chunk_event, svcrdma_##name,       \
                                TP_PROTO(                               \
                                        u32 length                      \
                                ),                                      \
                                TP_ARGS(length))
 
-DEFINE_CHUNK_EVENT(pzr);
-DEFINE_CHUNK_EVENT(write);
-DEFINE_CHUNK_EVENT(reply);
+DEFINE_CHUNK_EVENT(send_pzr);
+DEFINE_CHUNK_EVENT(encode_write_chunk);
+DEFINE_CHUNK_EVENT(send_write_chunk);
+DEFINE_CHUNK_EVENT(encode_read_chunk);
+DEFINE_CHUNK_EVENT(send_reply_chunk);
 
-TRACE_EVENT(svcrdma_encode_read,
+TRACE_EVENT(svcrdma_send_read_chunk,
        TP_PROTO(
                u32 length,
                u32 position
@@ -1607,6 +1612,24 @@ TRACE_EVENT(svcrdma_dma_map_rwctx,
        )
 );
 
+TRACE_EVENT(svcrdma_send_pullup,
+       TP_PROTO(
+               unsigned int len
+       ),
+
+       TP_ARGS(len),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, len)
+       ),
+
+       TP_fast_assign(
+               __entry->len = len;
+       ),
+
+       TP_printk("len=%u", __entry->len)
+);
+
 TRACE_EVENT(svcrdma_send_failed,
        TP_PROTO(
                const struct svc_rqst *rqst,
@@ -1786,34 +1809,6 @@ TRACE_EVENT(svcrdma_post_rw,
 DEFINE_SENDCOMP_EVENT(read);
 DEFINE_SENDCOMP_EVENT(write);
 
-TRACE_EVENT(svcrdma_cm_event,
-       TP_PROTO(
-               const struct rdma_cm_event *event,
-               const struct sockaddr *sap
-       ),
-
-       TP_ARGS(event, sap),
-
-       TP_STRUCT__entry(
-               __field(unsigned int, event)
-               __field(int, status)
-               __array(__u8, addr, INET6_ADDRSTRLEN + 10)
-       ),
-
-       TP_fast_assign(
-               __entry->event = event->event;
-               __entry->status = event->status;
-               snprintf(__entry->addr, sizeof(__entry->addr) - 1,
-                        "%pISpc", sap);
-       ),
-
-       TP_printk("addr=%s event=%s (%u/%d)",
-               __entry->addr,
-               rdma_show_cm_event(__entry->event),
-               __entry->event, __entry->status
-       )
-);
-
 TRACE_EVENT(svcrdma_qp_error,
        TP_PROTO(
                const struct ib_event *event,