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
97 TP_STRUCT__entry(97 TP_STRUCT__entry(
98 __field(unsigned int, task_id)98 __field(unsigned int, task_id)
99 __field(unsigned int, client_id)99 __field(unsigned int, client_id)
100 __field(const void *, mr)
101 __field(unsigned int, pos)100 __field(unsigned int, pos)
102 __field(int, nents)101 __field(int, nents)
103 __field(u32, handle)102 __field(u32, handle)
@@ -109,7 +108,6 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 5 unmodified lines
109 TP_fast_assign(108 TP_fast_assign(
110 __entry->task_id = task->tk_pid;109 __entry->task_id = task->tk_pid;
111 __entry->client_id = task->tk_client->cl_clid;110 __entry->client_id = task->tk_client->cl_clid;
112 __entry->mr = mr;
113 __entry->pos = pos;111 __entry->pos = pos;
114 __entry->nents = mr->mr_nents;112 __entry->nents = mr->mr_nents;
115 __entry->handle = mr->mr_handle;113 __entry->handle = mr->mr_handle;
@@ -118,8 +116,8 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 2 unmodified lines
118 __entry->nsegs = nsegs;116 __entry->nsegs = nsegs;
119 ),117 ),
120 118
121 TP_printk("task:%u@%u mr=%p pos=%u %u@0x%016llx:0x%08x (%s)",119 TP_printk("task:%u@%u pos=%u %u@0x%016llx:0x%08x (%s)",
122 __entry->task_id, __entry->client_id, __entry->mr,120 __entry->task_id, __entry->client_id,
123 __entry->pos, __entry->length,121 __entry->pos, __entry->length,
124 (unsigned long long)__entry->offset, __entry->handle,122 (unsigned long long)__entry->offset, __entry->handle,
125 __entry->nents < __entry->nsegs ? "more" : "last"123 __entry->nents < __entry->nsegs ? "more" : "last"
@@ -127,7 +125,7 @@ DECLARE_EVENT_CLASS(xprtrdma_rdch_event, · 1 unmodified line
127);125);
128 126
129#define DEFINE_RDCH_EVENT(name) \127#define DEFINE_RDCH_EVENT(name) \
130 DEFINE_EVENT(xprtrdma_rdch_event, name, \128 DEFINE_EVENT(xprtrdma_rdch_event, xprtrdma_chunk_##name,\
131 TP_PROTO( \129 TP_PROTO( \
132 const struct rpc_task *task, \130 const struct rpc_task *task, \
133 unsigned int pos, \131 unsigned int pos, \
@@ -148,7 +146,6 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 14 unmodified lines
148 TP_STRUCT__entry(146 TP_STRUCT__entry(
149 __field(unsigned int, task_id)147 __field(unsigned int, task_id)
150 __field(unsigned int, client_id)148 __field(unsigned int, client_id)
151 __field(const void *, mr)
152 __field(int, nents)149 __field(int, nents)
153 __field(u32, handle)150 __field(u32, handle)
154 __field(u32, length)151 __field(u32, length)
@@ -159,7 +156,6 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 4 unmodified lines
159 TP_fast_assign(156 TP_fast_assign(
160 __entry->task_id = task->tk_pid;157 __entry->task_id = task->tk_pid;
161 __entry->client_id = task->tk_client->cl_clid;158 __entry->client_id = task->tk_client->cl_clid;
162 __entry->mr = mr;
163 __entry->nents = mr->mr_nents;159 __entry->nents = mr->mr_nents;
164 __entry->handle = mr->mr_handle;160 __entry->handle = mr->mr_handle;
165 __entry->length = mr->mr_length;161 __entry->length = mr->mr_length;
@@ -167,8 +163,8 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 1 unmodified line
167 __entry->nsegs = nsegs;163 __entry->nsegs = nsegs;
168 ),164 ),
169 165
170 TP_printk("task:%u@%u mr=%p %u@0x%016llx:0x%08x (%s)",166 TP_printk("task:%u@%u %u@0x%016llx:0x%08x (%s)",
171 __entry->task_id, __entry->client_id, __entry->mr,167 __entry->task_id, __entry->client_id,
172 __entry->length, (unsigned long long)__entry->offset,168 __entry->length, (unsigned long long)__entry->offset,
173 __entry->handle,169 __entry->handle,
174 __entry->nents < __entry->nsegs ? "more" : "last"170 __entry->nents < __entry->nsegs ? "more" : "last"
@@ -176,7 +172,7 @@ DECLARE_EVENT_CLASS(xprtrdma_wrch_event, · 1 unmodified line
176);172);
177 173
178#define DEFINE_WRCH_EVENT(name) \174#define DEFINE_WRCH_EVENT(name) \
179 DEFINE_EVENT(xprtrdma_wrch_event, name, \175 DEFINE_EVENT(xprtrdma_wrch_event, xprtrdma_chunk_##name,\
180 TP_PROTO( \176 TP_PROTO( \
181 const struct rpc_task *task, \177 const struct rpc_task *task, \
182 struct rpcrdma_mr *mr, \178 struct rpcrdma_mr *mr, \
@@ -234,6 +230,18 @@ DECLARE_EVENT_CLASS(xprtrdma_frwr_done, · 51 unmodified lines
234 ), \230 ), \
235 TP_ARGS(wc, frwr))231 TP_ARGS(wc, frwr))
236 232
233TRACE_DEFINE_ENUM(DMA_BIDIRECTIONAL);
234TRACE_DEFINE_ENUM(DMA_TO_DEVICE);
235TRACE_DEFINE_ENUM(DMA_FROM_DEVICE);
236TRACE_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
237DECLARE_EVENT_CLASS(xprtrdma_mr,245DECLARE_EVENT_CLASS(xprtrdma_mr,
238 TP_PROTO(246 TP_PROTO(
239 const struct rpcrdma_mr *mr247 const struct rpcrdma_mr *mr
@@ -246,6 +254,7 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, · 6 unmodified lines
246 __field(u32, handle)254 __field(u32, handle)
247 __field(u32, length)255 __field(u32, length)
248 __field(u64, offset)256 __field(u64, offset)
257 __field(u32, dir)
249 ),258 ),
250 259
251 TP_fast_assign(260 TP_fast_assign(
@@ -253,12 +262,13 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, · 1 unmodified line
253 __entry->handle = mr->mr_handle;262 __entry->handle = mr->mr_handle;
254 __entry->length = mr->mr_length;263 __entry->length = mr->mr_length;
255 __entry->offset = mr->mr_offset;264 __entry->offset = mr->mr_offset;
265 __entry->dir = mr->mr_dir;
256 ),266 ),
257 267
258 TP_printk("mr=%p %u@0x%016llx:0x%08x",268 TP_printk("mr=%p %u@0x%016llx:0x%08x (%s)",
259 __entry->mr, __entry->length,269 __entry->mr, __entry->length,
260 (unsigned long long)__entry->offset,270 (unsigned long long)__entry->offset, __entry->handle,
261 __entry->handle271 xprtrdma_show_direction(__entry->dir)
262 )272 )
263);273);
264 274
@@ -437,9 +447,9 @@ TRACE_EVENT(xprtrdma_createmrs, · 172 unmodified lines
437 447
438DEFINE_RXPRT_EVENT(xprtrdma_nomrs);448DEFINE_RXPRT_EVENT(xprtrdma_nomrs);
439 449
440DEFINE_RDCH_EVENT(xprtrdma_read_chunk);450DEFINE_RDCH_EVENT(read);
441DEFINE_WRCH_EVENT(xprtrdma_write_chunk);451DEFINE_WRCH_EVENT(write);
442DEFINE_WRCH_EVENT(xprtrdma_reply_chunk);452DEFINE_WRCH_EVENT(reply);
443 453
444TRACE_DEFINE_ENUM(rpcrdma_noch);454TRACE_DEFINE_ENUM(rpcrdma_noch);
445TRACE_DEFINE_ENUM(rpcrdma_readch);455TRACE_DEFINE_ENUM(rpcrdma_readch);