History

xprtrdma: Clean up of xprtrdma chunk trace points

The chunk-related trace points capture nearly the same information as the MR-related trace points. Also, rename them so globbing can be used to enable or disable these trace points more easily.

Chuck Lever committed 7 years ago

Commit aba11831 parent 9bef8482 files · +29 −19Browse files

Showing the changes to include/trace (1 of 2 files). Show all

Unified · Split

include/trace/events/rpcrdma.h+26−16
@@ -97,7 +97,6 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 96 unmodified lines
9797 TP_STRUCT__entry(
9898 __field(unsigned int, task_id)
9999 __field(unsigned int, client_id)
100− __field(const void *, mr)
101100 __field(unsigned int, pos)
102101 __field(int, nents)
103102 __field(u32, handle)
@@ -109,7 +108,6 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 5 unmodified lines
109108 TP_fast_assign(
110109 __entry->task_id = task->tk_pid;
111110 __entry->client_id = task->tk_client->cl_clid;
112− __entry->mr = mr;
113111 __entry->pos = pos;
114112 __entry->nents = mr->mr_nents;
115113 __entry->handle = mr->mr_handle;
@@ -118,8 +116,8 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 2 unmodified lines
118116 __entry->nsegs = nsegs;
119117 ),
120118
121− TP_printk("task:%u@%u mr=%p pos=%u %u@0x%016llx:0x%08x (%s)",
122− __entry->task_id, __entry->client_id, __entry->mr,
119+ TP_printk("task:%u@%u pos=%u %u@0x%016llx:0x%08x (%s)",
120+ __entry->task_id, __entry->client_id,
123121 __entry->pos, __entry->length,
124122 (unsigned long long)__entry->offset, __entry->handle,
125123 __entry->nents < __entry->nsegs ? "more" : "last"
@@ -127,7 +125,7 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 1 unmodified line
127125 );
128126
129127 #define DEFINE_RDCH_EVENT(name) \
130− DEFINE_EVENT(xprtrdma_rdch_event, name, \
128+ DEFINE_EVENT(xprtrdma_rdch_event, xprtrdma_chunk_##name,\
131129 TP_PROTO( \
132130 const struct rpc_task *task, \
133131 unsigned int pos, \
@@ -148,7 +146,6 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 14 unmodified lines
148146 TP_STRUCT__entry(
149147 __field(unsigned int, task_id)
150148 __field(unsigned int, client_id)
151− __field(const void *, mr)
152149 __field(int, nents)
153150 __field(u32, handle)
154151 __field(u32, length)
@@ -159,7 +156,6 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 4 unmodified lines
159156 TP_fast_assign(
160157 __entry->task_id = task->tk_pid;
161158 __entry->client_id = task->tk_client->cl_clid;
162− __entry->mr = mr;
163159 __entry->nents = mr->mr_nents;
164160 __entry->handle = mr->mr_handle;
165161 __entry->length = mr->mr_length;
@@ -167,8 +163,8 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 1 unmodified line
167163 __entry->nsegs = nsegs;
168164 ),
169165
170− TP_printk("task:%u@%u mr=%p %u@0x%016llx:0x%08x (%s)",
171− __entry->task_id, __entry->client_id, __entry->mr,
166+ TP_printk("task:%u@%u %u@0x%016llx:0x%08x (%s)",
167+ __entry->task_id, __entry->client_id,
172168 __entry->length, (unsigned long long)__entry->offset,
173169 __entry->handle,
174170 __entry->nents < __entry->nsegs ? "more" : "last"
@@ -176,7 +172,7 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 1 unmodified line
176172 );
177173
178174 #define DEFINE_WRCH_EVENT(name) \
179− DEFINE_EVENT(xprtrdma_wrch_event, name, \
175+ DEFINE_EVENT(xprtrdma_wrch_event, xprtrdma_chunk_##name,\
180176 TP_PROTO( \
181177 const struct rpc_task *task, \
182178 struct rpcrdma_mr *mr, \
@@ -234,6 +230,18 @@ DECLARE_EVENT_CLASS(xprtrdma_frwr_done, · 51 unmodified lines
234230 ), \
235231 TP_ARGS(wc, frwr))
236232
233+TRACE_DEFINE_ENUM(DMA_BIDIRECTIONAL);
234+TRACE_DEFINE_ENUM(DMA_TO_DEVICE);
235+TRACE_DEFINE_ENUM(DMA_FROM_DEVICE);
236+TRACE_DEFINE_ENUM(DMA_NONE);
237+
238+#define xprtrdma_show_direction(x) \
239+ __print_symbolic(x, \
240+ { DMA_BIDIRECTIONAL, "BIDIR" }, \
241+ { DMA_TO_DEVICE, "TO_DEVICE" }, \
242+ { DMA_FROM_DEVICE, "FROM_DEVICE" }, \
243+ { DMA_NONE, "NONE" })
244+
237245 DECLARE_EVENT_CLASS(xprtrdma_mr,
238246 TP_PROTO(
239247 const struct rpcrdma_mr *mr
@@ -246,6 +254,7 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, · 6 unmodified lines
246254 __field(u32, handle)
247255 __field(u32, length)
248256 __field(u64, offset)
257+ __field(u32, dir)
249258 ),
250259
251260 TP_fast_assign(
@@ -253,12 +262,13 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, · 1 unmodified line
253262 __entry->handle = mr->mr_handle;
254263 __entry->length = mr->mr_length;
255264 __entry->offset = mr->mr_offset;
265+ __entry->dir = mr->mr_dir;
256266 ),
257267
258− TP_printk("mr=%p %u@0x%016llx:0x%08x",
268+ TP_printk("mr=%p %u@0x%016llx:0x%08x (%s)",
259269 __entry->mr, __entry->length,
260− (unsigned long long)__entry->offset,
261− __entry->handle
270+ (unsigned long long)__entry->offset, __entry->handle,
271+ xprtrdma_show_direction(__entry->dir)
262272 )
263273 );
264274
@@ -437,9 +447,9 @@ TRACE_EVENT(xprtrdma_createmrs, · 172 unmodified lines
437447
438448 DEFINE_RXPRT_EVENT(xprtrdma_nomrs);
439449
440−DEFINE_RDCH_EVENT(xprtrdma_read_chunk);
441−DEFINE_WRCH_EVENT(xprtrdma_write_chunk);
442−DEFINE_WRCH_EVENT(xprtrdma_reply_chunk);
450+DEFINE_RDCH_EVENT(read);
451+DEFINE_WRCH_EVENT(write);
452+DEFINE_WRCH_EVENT(reply);
443453
444454 TRACE_DEFINE_ENUM(rpcrdma_noch);
445455 TRACE_DEFINE_ENUM(rpcrdma_readch);