1 /* SPDX-License-Identifier: GPL-2.0 */ 1 /* SPDX-License-Identifier: GPL-2.0 */
2 /* 2 /*
3 * Copyright (c) 2013 Trond Myklebust <Trond.M 3 * Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
4 */ 4 */
5 #undef TRACE_SYSTEM 5 #undef TRACE_SYSTEM
6 #define TRACE_SYSTEM nfs 6 #define TRACE_SYSTEM nfs
7 7
8 #if !defined(_TRACE_NFS_H) || defined(TRACE_HE 8 #if !defined(_TRACE_NFS_H) || defined(TRACE_HEADER_MULTI_READ)
9 #define _TRACE_NFS_H 9 #define _TRACE_NFS_H
10 10
11 #include <linux/tracepoint.h> 11 #include <linux/tracepoint.h>
12 #include <linux/iversion.h> 12 #include <linux/iversion.h>
13 13
14 #include <trace/misc/fs.h> !! 14 #define nfs_show_file_type(ftype) \
15 #include <trace/misc/nfs.h> !! 15 __print_symbolic(ftype, \
16 #include <trace/misc/sunrpc.h> !! 16 { DT_UNKNOWN, "UNKNOWN" }, \
>> 17 { DT_FIFO, "FIFO" }, \
>> 18 { DT_CHR, "CHR" }, \
>> 19 { DT_DIR, "DIR" }, \
>> 20 { DT_BLK, "BLK" }, \
>> 21 { DT_REG, "REG" }, \
>> 22 { DT_LNK, "LNK" }, \
>> 23 { DT_SOCK, "SOCK" }, \
>> 24 { DT_WHT, "WHT" })
17 25
18 #define nfs_show_cache_validity(v) \ 26 #define nfs_show_cache_validity(v) \
19 __print_flags(v, "|", \ 27 __print_flags(v, "|", \
>> 28 { NFS_INO_INVALID_ATTR, "INVALID_ATTR" }, \
20 { NFS_INO_INVALID_DATA 29 { NFS_INO_INVALID_DATA, "INVALID_DATA" }, \
21 { NFS_INO_INVALID_ATIM 30 { NFS_INO_INVALID_ATIME, "INVALID_ATIME" }, \
22 { NFS_INO_INVALID_ACCE 31 { NFS_INO_INVALID_ACCESS, "INVALID_ACCESS" }, \
23 { NFS_INO_INVALID_ACL, 32 { NFS_INO_INVALID_ACL, "INVALID_ACL" }, \
>> 33 { NFS_INO_REVAL_PAGECACHE, "REVAL_PAGECACHE" }, \
24 { NFS_INO_REVAL_FORCED 34 { NFS_INO_REVAL_FORCED, "REVAL_FORCED" }, \
25 { NFS_INO_INVALID_LABE !! 35 { NFS_INO_INVALID_LABEL, "INVALID_LABEL" })
26 { NFS_INO_INVALID_CHAN <<
27 { NFS_INO_INVALID_CTIM <<
28 { NFS_INO_INVALID_MTIM <<
29 { NFS_INO_INVALID_SIZE <<
30 { NFS_INO_INVALID_OTHE <<
31 { NFS_INO_DATA_INVAL_D <<
32 { NFS_INO_INVALID_BLOC <<
33 { NFS_INO_INVALID_XATT <<
34 { NFS_INO_INVALID_NLIN <<
35 { NFS_INO_INVALID_MODE <<
36 36
37 #define nfs_show_nfsi_flags(v) \ 37 #define nfs_show_nfsi_flags(v) \
38 __print_flags(v, "|", \ 38 __print_flags(v, "|", \
39 { BIT(NFS_INO_STALE), !! 39 { 1 << NFS_INO_ADVISE_RDPLUS, "ADVISE_RDPLUS" }, \
40 { BIT(NFS_INO_ACL_LRU_ !! 40 { 1 << NFS_INO_STALE, "STALE" }, \
41 { BIT(NFS_INO_INVALIDA !! 41 { 1 << NFS_INO_INVALIDATING, "INVALIDATING" }, \
42 { BIT(NFS_INO_LAYOUTCO !! 42 { 1 << NFS_INO_FSCACHE, "FSCACHE" }, \
43 { BIT(NFS_INO_LAYOUTCO !! 43 { 1 << NFS_INO_LAYOUTCOMMIT, "NEED_LAYOUTCOMMIT" }, \
44 { BIT(NFS_INO_LAYOUTST !! 44 { 1 << NFS_INO_LAYOUTCOMMITTING, "LAYOUTCOMMIT" })
45 { BIT(NFS_INO_ODIRECT) <<
46 45
47 DECLARE_EVENT_CLASS(nfs_inode_event, 46 DECLARE_EVENT_CLASS(nfs_inode_event,
48 TP_PROTO( 47 TP_PROTO(
49 const struct inode *in 48 const struct inode *inode
50 ), 49 ),
51 50
52 TP_ARGS(inode), 51 TP_ARGS(inode),
53 52
54 TP_STRUCT__entry( 53 TP_STRUCT__entry(
55 __field(dev_t, dev) 54 __field(dev_t, dev)
56 __field(u32, fhandle) 55 __field(u32, fhandle)
57 __field(u64, fileid) 56 __field(u64, fileid)
58 __field(u64, version) 57 __field(u64, version)
59 ), 58 ),
60 59
61 TP_fast_assign( 60 TP_fast_assign(
62 const struct nfs_inode 61 const struct nfs_inode *nfsi = NFS_I(inode);
63 __entry->dev = inode-> 62 __entry->dev = inode->i_sb->s_dev;
64 __entry->fileid = nfsi 63 __entry->fileid = nfsi->fileid;
65 __entry->fhandle = nfs 64 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
66 __entry->version = ino 65 __entry->version = inode_peek_iversion_raw(inode);
67 ), 66 ),
68 67
69 TP_printk( 68 TP_printk(
70 "fileid=%02x:%02x:%llu 69 "fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu ",
71 MAJOR(__entry->dev), M 70 MAJOR(__entry->dev), MINOR(__entry->dev),
72 (unsigned long long)__ 71 (unsigned long long)__entry->fileid,
73 __entry->fhandle, 72 __entry->fhandle,
74 (unsigned long long)__ 73 (unsigned long long)__entry->version
75 ) 74 )
76 ); 75 );
77 76
78 DECLARE_EVENT_CLASS(nfs_inode_event_done, 77 DECLARE_EVENT_CLASS(nfs_inode_event_done,
79 TP_PROTO( 78 TP_PROTO(
80 const struct inode *in 79 const struct inode *inode,
81 int error 80 int error
82 ), 81 ),
83 82
84 TP_ARGS(inode, error), 83 TP_ARGS(inode, error),
85 84
86 TP_STRUCT__entry( 85 TP_STRUCT__entry(
87 __field(unsigned long, !! 86 __field(int, error)
88 __field(dev_t, dev) 87 __field(dev_t, dev)
89 __field(u32, fhandle) 88 __field(u32, fhandle)
90 __field(unsigned char, 89 __field(unsigned char, type)
91 __field(u64, fileid) 90 __field(u64, fileid)
92 __field(u64, version) 91 __field(u64, version)
93 __field(loff_t, size) 92 __field(loff_t, size)
94 __field(unsigned long, 93 __field(unsigned long, nfsi_flags)
95 __field(unsigned long, 94 __field(unsigned long, cache_validity)
96 ), 95 ),
97 96
98 TP_fast_assign( 97 TP_fast_assign(
99 const struct nfs_inode 98 const struct nfs_inode *nfsi = NFS_I(inode);
100 __entry->error = error !! 99 __entry->error = error;
101 __entry->dev = inode-> 100 __entry->dev = inode->i_sb->s_dev;
102 __entry->fileid = nfsi 101 __entry->fileid = nfsi->fileid;
103 __entry->fhandle = nfs 102 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
104 __entry->type = nfs_um 103 __entry->type = nfs_umode_to_dtype(inode->i_mode);
105 __entry->version = ino 104 __entry->version = inode_peek_iversion_raw(inode);
106 __entry->size = i_size 105 __entry->size = i_size_read(inode);
107 __entry->nfsi_flags = 106 __entry->nfsi_flags = nfsi->flags;
108 __entry->cache_validit 107 __entry->cache_validity = nfsi->cache_validity;
109 ), 108 ),
110 109
111 TP_printk( 110 TP_printk(
112 "error=%ld (%s) fileid !! 111 "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x "
113 "type=%u (%s) version= 112 "type=%u (%s) version=%llu size=%lld "
114 "cache_validity=0x%lx !! 113 "cache_validity=%lu (%s) nfs_flags=%ld (%s)",
115 -__entry->error, show_ !! 114 __entry->error,
116 MAJOR(__entry->dev), M 115 MAJOR(__entry->dev), MINOR(__entry->dev),
117 (unsigned long long)__ 116 (unsigned long long)__entry->fileid,
118 __entry->fhandle, 117 __entry->fhandle,
119 __entry->type, 118 __entry->type,
120 show_fs_dirent_type(__ !! 119 nfs_show_file_type(__entry->type),
121 (unsigned long long)__ 120 (unsigned long long)__entry->version,
122 (long long)__entry->si 121 (long long)__entry->size,
123 __entry->cache_validit 122 __entry->cache_validity,
124 nfs_show_cache_validit 123 nfs_show_cache_validity(__entry->cache_validity),
125 __entry->nfsi_flags, 124 __entry->nfsi_flags,
126 nfs_show_nfsi_flags(__ 125 nfs_show_nfsi_flags(__entry->nfsi_flags)
127 ) 126 )
128 ); 127 );
129 128
130 #define DEFINE_NFS_INODE_EVENT(name) \ 129 #define DEFINE_NFS_INODE_EVENT(name) \
131 DEFINE_EVENT(nfs_inode_event, name, \ 130 DEFINE_EVENT(nfs_inode_event, name, \
132 TP_PROTO( \ 131 TP_PROTO( \
133 const struct i 132 const struct inode *inode \
134 ), \ 133 ), \
135 TP_ARGS(inode)) 134 TP_ARGS(inode))
136 #define DEFINE_NFS_INODE_EVENT_DONE(name) \ 135 #define DEFINE_NFS_INODE_EVENT_DONE(name) \
137 DEFINE_EVENT(nfs_inode_event_done, nam 136 DEFINE_EVENT(nfs_inode_event_done, name, \
138 TP_PROTO( \ 137 TP_PROTO( \
139 const struct i 138 const struct inode *inode, \
140 int error \ 139 int error \
141 ), \ 140 ), \
142 TP_ARGS(inode, error)) 141 TP_ARGS(inode, error))
143 DEFINE_NFS_INODE_EVENT(nfs_set_inode_stale); <<
144 DEFINE_NFS_INODE_EVENT(nfs_refresh_inode_enter 142 DEFINE_NFS_INODE_EVENT(nfs_refresh_inode_enter);
145 DEFINE_NFS_INODE_EVENT_DONE(nfs_refresh_inode_ 143 DEFINE_NFS_INODE_EVENT_DONE(nfs_refresh_inode_exit);
146 DEFINE_NFS_INODE_EVENT(nfs_revalidate_inode_en 144 DEFINE_NFS_INODE_EVENT(nfs_revalidate_inode_enter);
147 DEFINE_NFS_INODE_EVENT_DONE(nfs_revalidate_ino 145 DEFINE_NFS_INODE_EVENT_DONE(nfs_revalidate_inode_exit);
148 DEFINE_NFS_INODE_EVENT(nfs_invalidate_mapping_ 146 DEFINE_NFS_INODE_EVENT(nfs_invalidate_mapping_enter);
149 DEFINE_NFS_INODE_EVENT_DONE(nfs_invalidate_map 147 DEFINE_NFS_INODE_EVENT_DONE(nfs_invalidate_mapping_exit);
150 DEFINE_NFS_INODE_EVENT(nfs_getattr_enter); 148 DEFINE_NFS_INODE_EVENT(nfs_getattr_enter);
151 DEFINE_NFS_INODE_EVENT_DONE(nfs_getattr_exit); 149 DEFINE_NFS_INODE_EVENT_DONE(nfs_getattr_exit);
152 DEFINE_NFS_INODE_EVENT(nfs_setattr_enter); 150 DEFINE_NFS_INODE_EVENT(nfs_setattr_enter);
153 DEFINE_NFS_INODE_EVENT_DONE(nfs_setattr_exit); 151 DEFINE_NFS_INODE_EVENT_DONE(nfs_setattr_exit);
>> 152 DEFINE_NFS_INODE_EVENT(nfs_writeback_page_enter);
>> 153 DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_page_exit);
154 DEFINE_NFS_INODE_EVENT(nfs_writeback_inode_ent 154 DEFINE_NFS_INODE_EVENT(nfs_writeback_inode_enter);
155 DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_inod 155 DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_inode_exit);
156 DEFINE_NFS_INODE_EVENT(nfs_fsync_enter); 156 DEFINE_NFS_INODE_EVENT(nfs_fsync_enter);
157 DEFINE_NFS_INODE_EVENT_DONE(nfs_fsync_exit); 157 DEFINE_NFS_INODE_EVENT_DONE(nfs_fsync_exit);
158 DEFINE_NFS_INODE_EVENT(nfs_access_enter); 158 DEFINE_NFS_INODE_EVENT(nfs_access_enter);
159 DEFINE_NFS_INODE_EVENT_DONE(nfs_set_cache_inva !! 159 DEFINE_NFS_INODE_EVENT_DONE(nfs_access_exit);
160 DEFINE_NFS_INODE_EVENT(nfs_readdir_force_readd <<
161 DEFINE_NFS_INODE_EVENT_DONE(nfs_readdir_cache_ <<
162 DEFINE_NFS_INODE_EVENT_DONE(nfs_readdir_uncach <<
163 <<
164 TRACE_EVENT(nfs_access_exit, <<
165 TP_PROTO( <<
166 const struct inode *in <<
167 unsigned int mask, <<
168 unsigned int permitted <<
169 int error <<
170 ), <<
171 <<
172 TP_ARGS(inode, mask, permitted <<
173 <<
174 TP_STRUCT__entry( <<
175 __field(unsigned long, <<
176 __field(dev_t, dev) <<
177 __field(u32, fhandle) <<
178 __field(unsigned char, <<
179 __field(u64, fileid) <<
180 __field(u64, version) <<
181 __field(loff_t, size) <<
182 __field(unsigned long, <<
183 __field(unsigned long, <<
184 __field(unsigned int, <<
185 __field(unsigned int, <<
186 ), <<
187 <<
188 TP_fast_assign( <<
189 const struct nfs_inode <<
190 __entry->error = error <<
191 __entry->dev = inode-> <<
192 __entry->fileid = nfsi <<
193 __entry->fhandle = nfs <<
194 __entry->type = nfs_um <<
195 __entry->version = ino <<
196 __entry->size = i_size <<
197 __entry->nfsi_flags = <<
198 __entry->cache_validit <<
199 __entry->mask = mask; <<
200 __entry->permitted = p <<
201 ), <<
202 <<
203 TP_printk( <<
204 "error=%ld (%s) fileid <<
205 "type=%u (%s) version= <<
206 "cache_validity=0x%lx <<
207 "mask=0x%x permitted=0 <<
208 -__entry->error, show_ <<
209 MAJOR(__entry->dev), M <<
210 (unsigned long long)__ <<
211 __entry->fhandle, <<
212 __entry->type, <<
213 show_fs_dirent_type(__ <<
214 (unsigned long long)__ <<
215 (long long)__entry->si <<
216 __entry->cache_validit <<
217 nfs_show_cache_validit <<
218 __entry->nfsi_flags, <<
219 nfs_show_nfsi_flags(__ <<
220 __entry->mask, __entry <<
221 ) <<
222 ); <<
223 <<
224 DECLARE_EVENT_CLASS(nfs_update_size_class, <<
225 TP_PROTO( <<
226 const struct inode *in <<
227 loff_t new_size <<
228 ), <<
229 <<
230 TP_ARGS(inode, new_size), <<
231 <<
232 TP_STRUCT__entry( <<
233 __field(dev_t, dev) <<
234 __field(u32, fhandle) <<
235 __field(u64, fileid) <<
236 __field(u64, version) <<
237 __field(loff_t, cur_si <<
238 __field(loff_t, new_si <<
239 ), <<
240 160
241 TP_fast_assign( !! 161 #define show_lookup_flags(flags) \
242 const struct nfs_inode !! 162 __print_flags((unsigned long)flags, "|", \
243 !! 163 { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
244 __entry->dev = inode-> !! 164 { LOOKUP_DIRECTORY, "DIRECTORY" }, \
245 __entry->fhandle = nfs !! 165 { LOOKUP_OPEN, "OPEN" }, \
246 __entry->fileid = nfsi !! 166 { LOOKUP_CREATE, "CREATE" }, \
247 __entry->version = ino !! 167 { LOOKUP_EXCL, "EXCL" })
248 __entry->cur_size = i_ <<
249 __entry->new_size = ne <<
250 ), <<
251 <<
252 TP_printk( <<
253 "fileid=%02x:%02x:%llu <<
254 MAJOR(__entry->dev), M <<
255 (unsigned long long)__ <<
256 __entry->fhandle, __en <<
257 __entry->cur_size, __e <<
258 ) <<
259 ); <<
260 <<
261 #define DEFINE_NFS_UPDATE_SIZE_EVENT(name) \ <<
262 DEFINE_EVENT(nfs_update_size_class, nf <<
263 TP_PROTO( \ <<
264 const struct i <<
265 loff_t new_siz <<
266 ), \ <<
267 TP_ARGS(inode, new_siz <<
268 <<
269 DEFINE_NFS_UPDATE_SIZE_EVENT(truncate); <<
270 DEFINE_NFS_UPDATE_SIZE_EVENT(wcc); <<
271 DEFINE_NFS_UPDATE_SIZE_EVENT(update); <<
272 DEFINE_NFS_UPDATE_SIZE_EVENT(grow); <<
273 <<
274 DECLARE_EVENT_CLASS(nfs_inode_range_event, <<
275 TP_PROTO( <<
276 const struct inode *in <<
277 loff_t range_start, <<
278 loff_t range_end <<
279 ), <<
280 <<
281 TP_ARGS(inode, range_start, ra <<
282 <<
283 TP_STRUCT__entry( <<
284 __field(dev_t, dev) <<
285 __field(u32, fhandle) <<
286 __field(u64, fileid) <<
287 __field(u64, version) <<
288 __field(loff_t, range_ <<
289 __field(loff_t, range_ <<
290 ), <<
291 <<
292 TP_fast_assign( <<
293 const struct nfs_inode <<
294 <<
295 __entry->dev = inode-> <<
296 __entry->fhandle = nfs <<
297 __entry->fileid = nfsi <<
298 __entry->version = ino <<
299 __entry->range_start = <<
300 __entry->range_end = r <<
301 ), <<
302 <<
303 TP_printk( <<
304 "fileid=%02x:%02x:%llu <<
305 "range=[%lld, %lld]", <<
306 MAJOR(__entry->dev), M <<
307 (unsigned long long)__ <<
308 __entry->fhandle, __en <<
309 __entry->range_start, <<
310 ) <<
311 ); <<
312 <<
313 #define DEFINE_NFS_INODE_RANGE_EVENT(name) \ <<
314 DEFINE_EVENT(nfs_inode_range_event, na <<
315 TP_PROTO( \ <<
316 const struct i <<
317 loff_t range_s <<
318 loff_t range_e <<
319 ), \ <<
320 TP_ARGS(inode, range_s <<
321 <<
322 DEFINE_NFS_INODE_RANGE_EVENT(nfs_readdir_inval <<
323 <<
324 DECLARE_EVENT_CLASS(nfs_readdir_event, <<
325 TP_PROTO( <<
326 const struct file *fil <<
327 const __be32 *verifier <<
328 u64 cookie, <<
329 pgoff_t page_index, <<
330 unsigned int dtsize <<
331 ), <<
332 <<
333 TP_ARGS(file, verifier, cookie <<
334 <<
335 TP_STRUCT__entry( <<
336 __field(dev_t, dev) <<
337 __field(u32, fhandle) <<
338 __field(u64, fileid) <<
339 __field(u64, version) <<
340 __array(char, verifier <<
341 __field(u64, cookie) <<
342 __field(pgoff_t, index <<
343 __field(unsigned int, <<
344 ), <<
345 <<
346 TP_fast_assign( <<
347 const struct inode *di <<
348 const struct nfs_inode <<
349 <<
350 __entry->dev = dir->i_ <<
351 __entry->fileid = nfsi <<
352 __entry->fhandle = nfs <<
353 __entry->version = ino <<
354 if (cookie != 0) <<
355 memcpy(__entry <<
356 NFS4_VE <<
357 else <<
358 memset(__entry <<
359 NFS4_VE <<
360 __entry->cookie = cook <<
361 __entry->index = page_ <<
362 __entry->dtsize = dtsi <<
363 ), <<
364 <<
365 TP_printk( <<
366 "fileid=%02x:%02x:%llu <<
367 "cookie=%s:0x%llx cach <<
368 MAJOR(__entry->dev), M <<
369 (unsigned long long)__ <<
370 __entry->version, show <<
371 (unsigned long long)__ <<
372 __entry->dtsize <<
373 ) <<
374 ); <<
375 <<
376 #define DEFINE_NFS_READDIR_EVENT(name) \ <<
377 DEFINE_EVENT(nfs_readdir_event, name, <<
378 TP_PROTO( \ <<
379 const struct f <<
380 const __be32 * <<
381 u64 cookie, \ <<
382 pgoff_t page_i <<
383 unsigned int d <<
384 ), \ <<
385 TP_ARGS(file, verifier <<
386 <<
387 DEFINE_NFS_READDIR_EVENT(nfs_readdir_cache_fil <<
388 DEFINE_NFS_READDIR_EVENT(nfs_readdir_uncached) <<
389 168
390 DECLARE_EVENT_CLASS(nfs_lookup_event, 169 DECLARE_EVENT_CLASS(nfs_lookup_event,
391 TP_PROTO( 170 TP_PROTO(
392 const struct inode *di 171 const struct inode *dir,
393 const struct dentry *d 172 const struct dentry *dentry,
394 unsigned int flags 173 unsigned int flags
395 ), 174 ),
396 175
397 TP_ARGS(dir, dentry, flags), 176 TP_ARGS(dir, dentry, flags),
398 177
399 TP_STRUCT__entry( 178 TP_STRUCT__entry(
400 __field(unsigned long, !! 179 __field(unsigned int, flags)
401 __field(dev_t, dev) 180 __field(dev_t, dev)
402 __field(u64, dir) 181 __field(u64, dir)
403 __field(u64, fileid) <<
404 __string(name, dentry- 182 __string(name, dentry->d_name.name)
405 ), 183 ),
406 184
407 TP_fast_assign( 185 TP_fast_assign(
408 __entry->dev = dir->i_ 186 __entry->dev = dir->i_sb->s_dev;
409 __entry->dir = NFS_FIL 187 __entry->dir = NFS_FILEID(dir);
410 __entry->flags = flags 188 __entry->flags = flags;
411 __entry->fileid = d_is !! 189 __assign_str(name, dentry->d_name.name);
412 __assign_str(name); <<
413 ), 190 ),
414 191
415 TP_printk( 192 TP_printk(
416 "flags=0x%lx (%s) name !! 193 "flags=%u (%s) name=%02x:%02x:%llu/%s",
417 __entry->flags, 194 __entry->flags,
418 show_fs_lookup_flags(_ !! 195 show_lookup_flags(__entry->flags),
419 MAJOR(__entry->dev), M 196 MAJOR(__entry->dev), MINOR(__entry->dev),
420 (unsigned long long)__ 197 (unsigned long long)__entry->dir,
421 __get_str(name), !! 198 __get_str(name)
422 __entry->fileid <<
423 ) 199 )
424 ); 200 );
425 201
426 #define DEFINE_NFS_LOOKUP_EVENT(name) \ 202 #define DEFINE_NFS_LOOKUP_EVENT(name) \
427 DEFINE_EVENT(nfs_lookup_event, name, \ 203 DEFINE_EVENT(nfs_lookup_event, name, \
428 TP_PROTO( \ 204 TP_PROTO( \
429 const struct i 205 const struct inode *dir, \
430 const struct d 206 const struct dentry *dentry, \
431 unsigned int f 207 unsigned int flags \
432 ), \ 208 ), \
433 TP_ARGS(dir, dentry, f 209 TP_ARGS(dir, dentry, flags))
434 210
435 DECLARE_EVENT_CLASS(nfs_lookup_event_done, 211 DECLARE_EVENT_CLASS(nfs_lookup_event_done,
436 TP_PROTO( 212 TP_PROTO(
437 const struct inode *di 213 const struct inode *dir,
438 const struct dentry *d 214 const struct dentry *dentry,
439 unsigned int flags, 215 unsigned int flags,
440 int error 216 int error
441 ), 217 ),
442 218
443 TP_ARGS(dir, dentry, flags, er 219 TP_ARGS(dir, dentry, flags, error),
444 220
445 TP_STRUCT__entry( 221 TP_STRUCT__entry(
446 __field(unsigned long, !! 222 __field(int, error)
447 __field(unsigned long, !! 223 __field(unsigned int, flags)
448 __field(dev_t, dev) 224 __field(dev_t, dev)
449 __field(u64, dir) 225 __field(u64, dir)
450 __field(u64, fileid) <<
451 __string(name, dentry- 226 __string(name, dentry->d_name.name)
452 ), 227 ),
453 228
454 TP_fast_assign( 229 TP_fast_assign(
455 __entry->dev = dir->i_ 230 __entry->dev = dir->i_sb->s_dev;
456 __entry->dir = NFS_FIL 231 __entry->dir = NFS_FILEID(dir);
457 __entry->error = error !! 232 __entry->error = error;
458 __entry->flags = flags 233 __entry->flags = flags;
459 __entry->fileid = d_is !! 234 __assign_str(name, dentry->d_name.name);
460 __assign_str(name); <<
461 ), 235 ),
462 236
463 TP_printk( 237 TP_printk(
464 "error=%ld (%s) flags= !! 238 "error=%d flags=%u (%s) name=%02x:%02x:%llu/%s",
465 -__entry->error, show_ !! 239 __entry->error,
466 __entry->flags, 240 __entry->flags,
467 show_fs_lookup_flags(_ !! 241 show_lookup_flags(__entry->flags),
468 MAJOR(__entry->dev), M 242 MAJOR(__entry->dev), MINOR(__entry->dev),
469 (unsigned long long)__ 243 (unsigned long long)__entry->dir,
470 __get_str(name), !! 244 __get_str(name)
471 __entry->fileid <<
472 ) 245 )
473 ); 246 );
474 247
475 #define DEFINE_NFS_LOOKUP_EVENT_DONE(name) \ 248 #define DEFINE_NFS_LOOKUP_EVENT_DONE(name) \
476 DEFINE_EVENT(nfs_lookup_event_done, na 249 DEFINE_EVENT(nfs_lookup_event_done, name, \
477 TP_PROTO( \ 250 TP_PROTO( \
478 const struct i 251 const struct inode *dir, \
479 const struct d 252 const struct dentry *dentry, \
480 unsigned int f 253 unsigned int flags, \
481 int error \ 254 int error \
482 ), \ 255 ), \
483 TP_ARGS(dir, dentry, f 256 TP_ARGS(dir, dentry, flags, error))
484 257
485 DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_enter); 258 DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_enter);
486 DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit); 259 DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
487 DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_ 260 DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
488 DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revali 261 DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
489 DEFINE_NFS_LOOKUP_EVENT(nfs_readdir_lookup); !! 262
490 DEFINE_NFS_LOOKUP_EVENT(nfs_readdir_lookup_rev !! 263 #define show_open_flags(flags) \
491 DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_readdir_looku !! 264 __print_flags((unsigned long)flags, "|", \
>> 265 { O_CREAT, "O_CREAT" }, \
>> 266 { O_EXCL, "O_EXCL" }, \
>> 267 { O_TRUNC, "O_TRUNC" }, \
>> 268 { O_APPEND, "O_APPEND" }, \
>> 269 { O_DSYNC, "O_DSYNC" }, \
>> 270 { O_DIRECT, "O_DIRECT" }, \
>> 271 { O_DIRECTORY, "O_DIRECTORY" })
>> 272
>> 273 #define show_fmode_flags(mode) \
>> 274 __print_flags(mode, "|", \
>> 275 { ((__force unsigned long)FMODE_READ), "READ" }, \
>> 276 { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
>> 277 { ((__force unsigned long)FMODE_EXEC), "EXEC" })
492 278
493 TRACE_EVENT(nfs_atomic_open_enter, 279 TRACE_EVENT(nfs_atomic_open_enter,
494 TP_PROTO( 280 TP_PROTO(
495 const struct inode *di 281 const struct inode *dir,
496 const struct nfs_open_ 282 const struct nfs_open_context *ctx,
497 unsigned int flags 283 unsigned int flags
498 ), 284 ),
499 285
500 TP_ARGS(dir, ctx, flags), 286 TP_ARGS(dir, ctx, flags),
501 287
502 TP_STRUCT__entry( 288 TP_STRUCT__entry(
503 __field(unsigned long, !! 289 __field(unsigned int, flags)
504 __field(unsigned long, !! 290 __field(unsigned int, fmode)
505 __field(dev_t, dev) 291 __field(dev_t, dev)
506 __field(u64, dir) 292 __field(u64, dir)
507 __string(name, ctx->de 293 __string(name, ctx->dentry->d_name.name)
508 ), 294 ),
509 295
510 TP_fast_assign( 296 TP_fast_assign(
511 __entry->dev = dir->i_ 297 __entry->dev = dir->i_sb->s_dev;
512 __entry->dir = NFS_FIL 298 __entry->dir = NFS_FILEID(dir);
513 __entry->flags = flags 299 __entry->flags = flags;
514 __entry->fmode = (__fo !! 300 __entry->fmode = (__force unsigned int)ctx->mode;
515 __assign_str(name); !! 301 __assign_str(name, ctx->dentry->d_name.name);
516 ), 302 ),
517 303
518 TP_printk( 304 TP_printk(
519 "flags=0x%lx (%s) fmod !! 305 "flags=%u (%s) fmode=%s name=%02x:%02x:%llu/%s",
520 __entry->flags, 306 __entry->flags,
521 show_fs_fcntl_open_fla !! 307 show_open_flags(__entry->flags),
522 show_fs_fmode_flags(__ !! 308 show_fmode_flags(__entry->fmode),
523 MAJOR(__entry->dev), M 309 MAJOR(__entry->dev), MINOR(__entry->dev),
524 (unsigned long long)__ 310 (unsigned long long)__entry->dir,
525 __get_str(name) 311 __get_str(name)
526 ) 312 )
527 ); 313 );
528 314
529 TRACE_EVENT(nfs_atomic_open_exit, 315 TRACE_EVENT(nfs_atomic_open_exit,
530 TP_PROTO( 316 TP_PROTO(
531 const struct inode *di 317 const struct inode *dir,
532 const struct nfs_open_ 318 const struct nfs_open_context *ctx,
533 unsigned int flags, 319 unsigned int flags,
534 int error 320 int error
535 ), 321 ),
536 322
537 TP_ARGS(dir, ctx, flags, error 323 TP_ARGS(dir, ctx, flags, error),
538 324
539 TP_STRUCT__entry( 325 TP_STRUCT__entry(
540 __field(unsigned long, !! 326 __field(int, error)
541 __field(unsigned long, !! 327 __field(unsigned int, flags)
542 __field(unsigned long, !! 328 __field(unsigned int, fmode)
543 __field(dev_t, dev) 329 __field(dev_t, dev)
544 __field(u64, dir) 330 __field(u64, dir)
545 __string(name, ctx->de 331 __string(name, ctx->dentry->d_name.name)
546 ), 332 ),
547 333
548 TP_fast_assign( 334 TP_fast_assign(
549 __entry->error = -erro !! 335 __entry->error = error;
550 __entry->dev = dir->i_ 336 __entry->dev = dir->i_sb->s_dev;
551 __entry->dir = NFS_FIL 337 __entry->dir = NFS_FILEID(dir);
552 __entry->flags = flags 338 __entry->flags = flags;
553 __entry->fmode = (__fo !! 339 __entry->fmode = (__force unsigned int)ctx->mode;
554 __assign_str(name); !! 340 __assign_str(name, ctx->dentry->d_name.name);
555 ), 341 ),
556 342
557 TP_printk( 343 TP_printk(
558 "error=%ld (%s) flags= !! 344 "error=%d flags=%u (%s) fmode=%s "
559 "name=%02x:%02x:%llu/% 345 "name=%02x:%02x:%llu/%s",
560 -__entry->error, show_ !! 346 __entry->error,
561 __entry->flags, 347 __entry->flags,
562 show_fs_fcntl_open_fla !! 348 show_open_flags(__entry->flags),
563 show_fs_fmode_flags(__ !! 349 show_fmode_flags(__entry->fmode),
564 MAJOR(__entry->dev), M 350 MAJOR(__entry->dev), MINOR(__entry->dev),
565 (unsigned long long)__ 351 (unsigned long long)__entry->dir,
566 __get_str(name) 352 __get_str(name)
567 ) 353 )
568 ); 354 );
569 355
570 TRACE_EVENT(nfs_create_enter, 356 TRACE_EVENT(nfs_create_enter,
571 TP_PROTO( 357 TP_PROTO(
572 const struct inode *di 358 const struct inode *dir,
573 const struct dentry *d 359 const struct dentry *dentry,
574 unsigned int flags 360 unsigned int flags
575 ), 361 ),
576 362
577 TP_ARGS(dir, dentry, flags), 363 TP_ARGS(dir, dentry, flags),
578 364
579 TP_STRUCT__entry( 365 TP_STRUCT__entry(
580 __field(unsigned long, !! 366 __field(unsigned int, flags)
581 __field(dev_t, dev) 367 __field(dev_t, dev)
582 __field(u64, dir) 368 __field(u64, dir)
583 __string(name, dentry- 369 __string(name, dentry->d_name.name)
584 ), 370 ),
585 371
586 TP_fast_assign( 372 TP_fast_assign(
587 __entry->dev = dir->i_ 373 __entry->dev = dir->i_sb->s_dev;
588 __entry->dir = NFS_FIL 374 __entry->dir = NFS_FILEID(dir);
589 __entry->flags = flags 375 __entry->flags = flags;
590 __assign_str(name); !! 376 __assign_str(name, dentry->d_name.name);
591 ), 377 ),
592 378
593 TP_printk( 379 TP_printk(
594 "flags=0x%lx (%s) name !! 380 "flags=%u (%s) name=%02x:%02x:%llu/%s",
595 __entry->flags, 381 __entry->flags,
596 show_fs_fcntl_open_fla !! 382 show_open_flags(__entry->flags),
597 MAJOR(__entry->dev), M 383 MAJOR(__entry->dev), MINOR(__entry->dev),
598 (unsigned long long)__ 384 (unsigned long long)__entry->dir,
599 __get_str(name) 385 __get_str(name)
600 ) 386 )
601 ); 387 );
602 388
603 TRACE_EVENT(nfs_create_exit, 389 TRACE_EVENT(nfs_create_exit,
604 TP_PROTO( 390 TP_PROTO(
605 const struct inode *di 391 const struct inode *dir,
606 const struct dentry *d 392 const struct dentry *dentry,
607 unsigned int flags, 393 unsigned int flags,
608 int error 394 int error
609 ), 395 ),
610 396
611 TP_ARGS(dir, dentry, flags, er 397 TP_ARGS(dir, dentry, flags, error),
612 398
613 TP_STRUCT__entry( 399 TP_STRUCT__entry(
614 __field(unsigned long, !! 400 __field(int, error)
615 __field(unsigned long, !! 401 __field(unsigned int, flags)
616 __field(dev_t, dev) 402 __field(dev_t, dev)
617 __field(u64, dir) 403 __field(u64, dir)
618 __string(name, dentry- 404 __string(name, dentry->d_name.name)
619 ), 405 ),
620 406
621 TP_fast_assign( 407 TP_fast_assign(
622 __entry->error = -erro !! 408 __entry->error = error;
623 __entry->dev = dir->i_ 409 __entry->dev = dir->i_sb->s_dev;
624 __entry->dir = NFS_FIL 410 __entry->dir = NFS_FILEID(dir);
625 __entry->flags = flags 411 __entry->flags = flags;
626 __assign_str(name); !! 412 __assign_str(name, dentry->d_name.name);
627 ), 413 ),
628 414
629 TP_printk( 415 TP_printk(
630 "error=%ld (%s) flags= !! 416 "error=%d flags=%u (%s) name=%02x:%02x:%llu/%s",
631 -__entry->error, show_ !! 417 __entry->error,
632 __entry->flags, 418 __entry->flags,
633 show_fs_fcntl_open_fla !! 419 show_open_flags(__entry->flags),
634 MAJOR(__entry->dev), M 420 MAJOR(__entry->dev), MINOR(__entry->dev),
635 (unsigned long long)__ 421 (unsigned long long)__entry->dir,
636 __get_str(name) 422 __get_str(name)
637 ) 423 )
638 ); 424 );
639 425
640 DECLARE_EVENT_CLASS(nfs_directory_event, 426 DECLARE_EVENT_CLASS(nfs_directory_event,
641 TP_PROTO( 427 TP_PROTO(
642 const struct inode *di 428 const struct inode *dir,
643 const struct dentry *d 429 const struct dentry *dentry
644 ), 430 ),
645 431
646 TP_ARGS(dir, dentry), 432 TP_ARGS(dir, dentry),
647 433
648 TP_STRUCT__entry( 434 TP_STRUCT__entry(
649 __field(dev_t, dev) 435 __field(dev_t, dev)
650 __field(u64, dir) 436 __field(u64, dir)
651 __string(name, dentry- 437 __string(name, dentry->d_name.name)
652 ), 438 ),
653 439
654 TP_fast_assign( 440 TP_fast_assign(
655 __entry->dev = dir->i_ 441 __entry->dev = dir->i_sb->s_dev;
656 __entry->dir = NFS_FIL 442 __entry->dir = NFS_FILEID(dir);
657 __assign_str(name); !! 443 __assign_str(name, dentry->d_name.name);
658 ), 444 ),
659 445
660 TP_printk( 446 TP_printk(
661 "name=%02x:%02x:%llu/% 447 "name=%02x:%02x:%llu/%s",
662 MAJOR(__entry->dev), M 448 MAJOR(__entry->dev), MINOR(__entry->dev),
663 (unsigned long long)__ 449 (unsigned long long)__entry->dir,
664 __get_str(name) 450 __get_str(name)
665 ) 451 )
666 ); 452 );
667 453
668 #define DEFINE_NFS_DIRECTORY_EVENT(name) \ 454 #define DEFINE_NFS_DIRECTORY_EVENT(name) \
669 DEFINE_EVENT(nfs_directory_event, name 455 DEFINE_EVENT(nfs_directory_event, name, \
670 TP_PROTO( \ 456 TP_PROTO( \
671 const struct i 457 const struct inode *dir, \
672 const struct d 458 const struct dentry *dentry \
673 ), \ 459 ), \
674 TP_ARGS(dir, dentry)) 460 TP_ARGS(dir, dentry))
675 461
676 DECLARE_EVENT_CLASS(nfs_directory_event_done, 462 DECLARE_EVENT_CLASS(nfs_directory_event_done,
677 TP_PROTO( 463 TP_PROTO(
678 const struct inode *di 464 const struct inode *dir,
679 const struct dentry *d 465 const struct dentry *dentry,
680 int error 466 int error
681 ), 467 ),
682 468
683 TP_ARGS(dir, dentry, error), 469 TP_ARGS(dir, dentry, error),
684 470
685 TP_STRUCT__entry( 471 TP_STRUCT__entry(
686 __field(unsigned long, !! 472 __field(int, error)
687 __field(dev_t, dev) 473 __field(dev_t, dev)
688 __field(u64, dir) 474 __field(u64, dir)
689 __string(name, dentry- 475 __string(name, dentry->d_name.name)
690 ), 476 ),
691 477
692 TP_fast_assign( 478 TP_fast_assign(
693 __entry->dev = dir->i_ 479 __entry->dev = dir->i_sb->s_dev;
694 __entry->dir = NFS_FIL 480 __entry->dir = NFS_FILEID(dir);
695 __entry->error = error !! 481 __entry->error = error;
696 __assign_str(name); !! 482 __assign_str(name, dentry->d_name.name);
697 ), 483 ),
698 484
699 TP_printk( 485 TP_printk(
700 "error=%ld (%s) name=% !! 486 "error=%d name=%02x:%02x:%llu/%s",
701 -__entry->error, show_ !! 487 __entry->error,
702 MAJOR(__entry->dev), M 488 MAJOR(__entry->dev), MINOR(__entry->dev),
703 (unsigned long long)__ 489 (unsigned long long)__entry->dir,
704 __get_str(name) 490 __get_str(name)
705 ) 491 )
706 ); 492 );
707 493
708 #define DEFINE_NFS_DIRECTORY_EVENT_DONE(name) 494 #define DEFINE_NFS_DIRECTORY_EVENT_DONE(name) \
709 DEFINE_EVENT(nfs_directory_event_done, 495 DEFINE_EVENT(nfs_directory_event_done, name, \
710 TP_PROTO( \ 496 TP_PROTO( \
711 const struct i 497 const struct inode *dir, \
712 const struct d 498 const struct dentry *dentry, \
713 int error \ 499 int error \
714 ), \ 500 ), \
715 TP_ARGS(dir, dentry, e 501 TP_ARGS(dir, dentry, error))
716 502
717 DEFINE_NFS_DIRECTORY_EVENT(nfs_mknod_enter); 503 DEFINE_NFS_DIRECTORY_EVENT(nfs_mknod_enter);
718 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_mknod_exit 504 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_mknod_exit);
719 DEFINE_NFS_DIRECTORY_EVENT(nfs_mkdir_enter); 505 DEFINE_NFS_DIRECTORY_EVENT(nfs_mkdir_enter);
720 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_mkdir_exit 506 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_mkdir_exit);
721 DEFINE_NFS_DIRECTORY_EVENT(nfs_rmdir_enter); 507 DEFINE_NFS_DIRECTORY_EVENT(nfs_rmdir_enter);
722 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_rmdir_exit 508 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_rmdir_exit);
723 DEFINE_NFS_DIRECTORY_EVENT(nfs_remove_enter); 509 DEFINE_NFS_DIRECTORY_EVENT(nfs_remove_enter);
724 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_remove_exi 510 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_remove_exit);
725 DEFINE_NFS_DIRECTORY_EVENT(nfs_unlink_enter); 511 DEFINE_NFS_DIRECTORY_EVENT(nfs_unlink_enter);
726 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_unlink_exi 512 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_unlink_exit);
727 DEFINE_NFS_DIRECTORY_EVENT(nfs_symlink_enter); 513 DEFINE_NFS_DIRECTORY_EVENT(nfs_symlink_enter);
728 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_symlink_ex 514 DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_symlink_exit);
729 515
730 TRACE_EVENT(nfs_link_enter, 516 TRACE_EVENT(nfs_link_enter,
731 TP_PROTO( 517 TP_PROTO(
732 const struct inode *in 518 const struct inode *inode,
733 const struct inode *di 519 const struct inode *dir,
734 const struct dentry *d 520 const struct dentry *dentry
735 ), 521 ),
736 522
737 TP_ARGS(inode, dir, dentry), 523 TP_ARGS(inode, dir, dentry),
738 524
739 TP_STRUCT__entry( 525 TP_STRUCT__entry(
740 __field(dev_t, dev) 526 __field(dev_t, dev)
741 __field(u64, fileid) 527 __field(u64, fileid)
742 __field(u64, dir) 528 __field(u64, dir)
743 __string(name, dentry- 529 __string(name, dentry->d_name.name)
744 ), 530 ),
745 531
746 TP_fast_assign( 532 TP_fast_assign(
747 __entry->dev = inode-> 533 __entry->dev = inode->i_sb->s_dev;
748 __entry->fileid = NFS_ 534 __entry->fileid = NFS_FILEID(inode);
749 __entry->dir = NFS_FIL 535 __entry->dir = NFS_FILEID(dir);
750 __assign_str(name); !! 536 __assign_str(name, dentry->d_name.name);
751 ), 537 ),
752 538
753 TP_printk( 539 TP_printk(
754 "fileid=%02x:%02x:%llu 540 "fileid=%02x:%02x:%llu name=%02x:%02x:%llu/%s",
755 MAJOR(__entry->dev), M 541 MAJOR(__entry->dev), MINOR(__entry->dev),
756 __entry->fileid, 542 __entry->fileid,
757 MAJOR(__entry->dev), M 543 MAJOR(__entry->dev), MINOR(__entry->dev),
758 (unsigned long long)__ 544 (unsigned long long)__entry->dir,
759 __get_str(name) 545 __get_str(name)
760 ) 546 )
761 ); 547 );
762 548
763 TRACE_EVENT(nfs_link_exit, 549 TRACE_EVENT(nfs_link_exit,
764 TP_PROTO( 550 TP_PROTO(
765 const struct inode *in 551 const struct inode *inode,
766 const struct inode *di 552 const struct inode *dir,
767 const struct dentry *d 553 const struct dentry *dentry,
768 int error 554 int error
769 ), 555 ),
770 556
771 TP_ARGS(inode, dir, dentry, er 557 TP_ARGS(inode, dir, dentry, error),
772 558
773 TP_STRUCT__entry( 559 TP_STRUCT__entry(
774 __field(unsigned long, !! 560 __field(int, error)
775 __field(dev_t, dev) 561 __field(dev_t, dev)
776 __field(u64, fileid) 562 __field(u64, fileid)
777 __field(u64, dir) 563 __field(u64, dir)
778 __string(name, dentry- 564 __string(name, dentry->d_name.name)
779 ), 565 ),
780 566
781 TP_fast_assign( 567 TP_fast_assign(
782 __entry->dev = inode-> 568 __entry->dev = inode->i_sb->s_dev;
783 __entry->fileid = NFS_ 569 __entry->fileid = NFS_FILEID(inode);
784 __entry->dir = NFS_FIL 570 __entry->dir = NFS_FILEID(dir);
785 __entry->error = error !! 571 __entry->error = error;
786 __assign_str(name); !! 572 __assign_str(name, dentry->d_name.name);
787 ), 573 ),
788 574
789 TP_printk( 575 TP_printk(
790 "error=%ld (%s) fileid !! 576 "error=%d fileid=%02x:%02x:%llu name=%02x:%02x:%llu/%s",
791 -__entry->error, show_ !! 577 __entry->error,
792 MAJOR(__entry->dev), M 578 MAJOR(__entry->dev), MINOR(__entry->dev),
793 __entry->fileid, 579 __entry->fileid,
794 MAJOR(__entry->dev), M 580 MAJOR(__entry->dev), MINOR(__entry->dev),
795 (unsigned long long)__ 581 (unsigned long long)__entry->dir,
796 __get_str(name) 582 __get_str(name)
797 ) 583 )
798 ); 584 );
799 585
800 DECLARE_EVENT_CLASS(nfs_rename_event, 586 DECLARE_EVENT_CLASS(nfs_rename_event,
801 TP_PROTO( 587 TP_PROTO(
802 const struct inode *ol 588 const struct inode *old_dir,
803 const struct dentry *o 589 const struct dentry *old_dentry,
804 const struct inode *ne 590 const struct inode *new_dir,
805 const struct dentry *n 591 const struct dentry *new_dentry
806 ), 592 ),
807 593
808 TP_ARGS(old_dir, old_dentry, n 594 TP_ARGS(old_dir, old_dentry, new_dir, new_dentry),
809 595
810 TP_STRUCT__entry( 596 TP_STRUCT__entry(
811 __field(dev_t, dev) 597 __field(dev_t, dev)
812 __field(u64, old_dir) 598 __field(u64, old_dir)
813 __field(u64, new_dir) 599 __field(u64, new_dir)
814 __string(old_name, old 600 __string(old_name, old_dentry->d_name.name)
815 __string(new_name, new 601 __string(new_name, new_dentry->d_name.name)
816 ), 602 ),
817 603
818 TP_fast_assign( 604 TP_fast_assign(
819 __entry->dev = old_dir 605 __entry->dev = old_dir->i_sb->s_dev;
820 __entry->old_dir = NFS 606 __entry->old_dir = NFS_FILEID(old_dir);
821 __entry->new_dir = NFS 607 __entry->new_dir = NFS_FILEID(new_dir);
822 __assign_str(old_name) !! 608 __assign_str(old_name, old_dentry->d_name.name);
823 __assign_str(new_name) !! 609 __assign_str(new_name, new_dentry->d_name.name);
824 ), 610 ),
825 611
826 TP_printk( 612 TP_printk(
827 "old_name=%02x:%02x:%l 613 "old_name=%02x:%02x:%llu/%s new_name=%02x:%02x:%llu/%s",
828 MAJOR(__entry->dev), M 614 MAJOR(__entry->dev), MINOR(__entry->dev),
829 (unsigned long long)__ 615 (unsigned long long)__entry->old_dir,
830 __get_str(old_name), 616 __get_str(old_name),
831 MAJOR(__entry->dev), M 617 MAJOR(__entry->dev), MINOR(__entry->dev),
832 (unsigned long long)__ 618 (unsigned long long)__entry->new_dir,
833 __get_str(new_name) 619 __get_str(new_name)
834 ) 620 )
835 ); 621 );
836 #define DEFINE_NFS_RENAME_EVENT(name) \ 622 #define DEFINE_NFS_RENAME_EVENT(name) \
837 DEFINE_EVENT(nfs_rename_event, name, \ 623 DEFINE_EVENT(nfs_rename_event, name, \
838 TP_PROTO( \ 624 TP_PROTO( \
839 const struct i 625 const struct inode *old_dir, \
840 const struct d 626 const struct dentry *old_dentry, \
841 const struct i 627 const struct inode *new_dir, \
842 const struct d 628 const struct dentry *new_dentry \
843 ), \ 629 ), \
844 TP_ARGS(old_dir, old_d 630 TP_ARGS(old_dir, old_dentry, new_dir, new_dentry))
845 631
846 DECLARE_EVENT_CLASS(nfs_rename_event_done, 632 DECLARE_EVENT_CLASS(nfs_rename_event_done,
847 TP_PROTO( 633 TP_PROTO(
848 const struct inode *ol 634 const struct inode *old_dir,
849 const struct dentry *o 635 const struct dentry *old_dentry,
850 const struct inode *ne 636 const struct inode *new_dir,
851 const struct dentry *n 637 const struct dentry *new_dentry,
852 int error 638 int error
853 ), 639 ),
854 640
855 TP_ARGS(old_dir, old_dentry, n 641 TP_ARGS(old_dir, old_dentry, new_dir, new_dentry, error),
856 642
857 TP_STRUCT__entry( 643 TP_STRUCT__entry(
858 __field(dev_t, dev) 644 __field(dev_t, dev)
859 __field(unsigned long, !! 645 __field(int, error)
860 __field(u64, old_dir) 646 __field(u64, old_dir)
861 __string(old_name, old 647 __string(old_name, old_dentry->d_name.name)
862 __field(u64, new_dir) 648 __field(u64, new_dir)
863 __string(new_name, new 649 __string(new_name, new_dentry->d_name.name)
864 ), 650 ),
865 651
866 TP_fast_assign( 652 TP_fast_assign(
867 __entry->dev = old_dir 653 __entry->dev = old_dir->i_sb->s_dev;
868 __entry->error = -erro <<
869 __entry->old_dir = NFS 654 __entry->old_dir = NFS_FILEID(old_dir);
870 __entry->new_dir = NFS 655 __entry->new_dir = NFS_FILEID(new_dir);
871 __assign_str(old_name) !! 656 __entry->error = error;
872 __assign_str(new_name) !! 657 __assign_str(old_name, old_dentry->d_name.name);
>> 658 __assign_str(new_name, new_dentry->d_name.name);
873 ), 659 ),
874 660
875 TP_printk( 661 TP_printk(
876 "error=%ld (%s) old_na !! 662 "error=%d old_name=%02x:%02x:%llu/%s "
877 "new_name=%02x:%02x:%l 663 "new_name=%02x:%02x:%llu/%s",
878 -__entry->error, show_ !! 664 __entry->error,
879 MAJOR(__entry->dev), M 665 MAJOR(__entry->dev), MINOR(__entry->dev),
880 (unsigned long long)__ 666 (unsigned long long)__entry->old_dir,
881 __get_str(old_name), 667 __get_str(old_name),
882 MAJOR(__entry->dev), M 668 MAJOR(__entry->dev), MINOR(__entry->dev),
883 (unsigned long long)__ 669 (unsigned long long)__entry->new_dir,
884 __get_str(new_name) 670 __get_str(new_name)
885 ) 671 )
886 ); 672 );
887 #define DEFINE_NFS_RENAME_EVENT_DONE(name) \ 673 #define DEFINE_NFS_RENAME_EVENT_DONE(name) \
888 DEFINE_EVENT(nfs_rename_event_done, na 674 DEFINE_EVENT(nfs_rename_event_done, name, \
889 TP_PROTO( \ 675 TP_PROTO( \
890 const struct i 676 const struct inode *old_dir, \
891 const struct d 677 const struct dentry *old_dentry, \
892 const struct i 678 const struct inode *new_dir, \
893 const struct d 679 const struct dentry *new_dentry, \
894 int error \ 680 int error \
895 ), \ 681 ), \
896 TP_ARGS(old_dir, old_d 682 TP_ARGS(old_dir, old_dentry, new_dir, \
897 new_dentry, er 683 new_dentry, error))
898 684
899 DEFINE_NFS_RENAME_EVENT(nfs_rename_enter); 685 DEFINE_NFS_RENAME_EVENT(nfs_rename_enter);
900 DEFINE_NFS_RENAME_EVENT_DONE(nfs_rename_exit); 686 DEFINE_NFS_RENAME_EVENT_DONE(nfs_rename_exit);
901 687
902 DEFINE_NFS_RENAME_EVENT_DONE(nfs_async_rename_ !! 688 DEFINE_NFS_RENAME_EVENT_DONE(nfs_sillyrename_rename);
903 689
904 TRACE_EVENT(nfs_sillyrename_unlink, 690 TRACE_EVENT(nfs_sillyrename_unlink,
905 TP_PROTO( 691 TP_PROTO(
906 const struct nfs_unlin 692 const struct nfs_unlinkdata *data,
907 int error 693 int error
908 ), 694 ),
909 695
910 TP_ARGS(data, error), 696 TP_ARGS(data, error),
911 697
912 TP_STRUCT__entry( 698 TP_STRUCT__entry(
913 __field(dev_t, dev) 699 __field(dev_t, dev)
914 __field(unsigned long, !! 700 __field(int, error)
915 __field(u64, dir) 701 __field(u64, dir)
916 __dynamic_array(char, 702 __dynamic_array(char, name, data->args.name.len + 1)
917 ), 703 ),
918 704
919 TP_fast_assign( 705 TP_fast_assign(
920 struct inode *dir = d_ 706 struct inode *dir = d_inode(data->dentry->d_parent);
921 size_t len = data->arg 707 size_t len = data->args.name.len;
922 __entry->dev = dir->i_ 708 __entry->dev = dir->i_sb->s_dev;
923 __entry->dir = NFS_FIL 709 __entry->dir = NFS_FILEID(dir);
924 __entry->error = -erro !! 710 __entry->error = error;
925 memcpy(__get_str(name) 711 memcpy(__get_str(name),
926 data->args.nam 712 data->args.name.name, len);
927 __get_str(name)[len] = 713 __get_str(name)[len] = 0;
928 ), 714 ),
929 715
930 TP_printk( 716 TP_printk(
931 "error=%ld (%s) name=% !! 717 "error=%d name=%02x:%02x:%llu/%s",
932 -__entry->error, show_ !! 718 __entry->error,
933 MAJOR(__entry->dev), M 719 MAJOR(__entry->dev), MINOR(__entry->dev),
934 (unsigned long long)__ 720 (unsigned long long)__entry->dir,
935 __get_str(name) 721 __get_str(name)
936 ) 722 )
937 ); 723 );
938 724
939 DECLARE_EVENT_CLASS(nfs_folio_event, !! 725 TRACE_EVENT(nfs_initiate_read,
940 TP_PROTO( 726 TP_PROTO(
941 const struct inode *in 727 const struct inode *inode,
942 loff_t offset, !! 728 loff_t offset, unsigned long count
943 size_t count <<
944 ), 729 ),
945 730
946 TP_ARGS(inode, offset, count), 731 TP_ARGS(inode, offset, count),
947 732
948 TP_STRUCT__entry( 733 TP_STRUCT__entry(
949 __field(dev_t, dev) <<
950 __field(u32, fhandle) <<
951 __field(u64, fileid) <<
952 __field(u64, version) <<
953 __field(loff_t, offset <<
954 __field(size_t, count) <<
955 ), <<
956 <<
957 TP_fast_assign( <<
958 const struct nfs_inode <<
959 <<
960 __entry->dev = inode-> <<
961 __entry->fileid = nfsi <<
962 __entry->fhandle = nfs <<
963 __entry->version = ino <<
964 __entry->offset = offs <<
965 __entry->count = count <<
966 ), <<
967 <<
968 TP_printk( <<
969 "fileid=%02x:%02x:%llu <<
970 "offset=%lld count=%zu <<
971 MAJOR(__entry->dev), M <<
972 (unsigned long long)__ <<
973 __entry->fhandle, __en <<
974 __entry->offset, __ent <<
975 ) <<
976 ); <<
977 <<
978 #define DEFINE_NFS_FOLIO_EVENT(name) \ <<
979 DEFINE_EVENT(nfs_folio_event, name, \ <<
980 TP_PROTO( \ <<
981 const struct i <<
982 loff_t offset, <<
983 size_t count \ <<
984 ), \ <<
985 TP_ARGS(inode, offset, <<
986 <<
987 DECLARE_EVENT_CLASS(nfs_folio_event_done, <<
988 TP_PROTO( <<
989 const struct inode *in <<
990 loff_t offset, <<
991 size_t count, <<
992 int ret <<
993 ), <<
994 <<
995 TP_ARGS(inode, offset, count, <<
996 <<
997 TP_STRUCT__entry( <<
998 __field(dev_t, dev) <<
999 __field(u32, fhandle) <<
1000 __field(int, ret) <<
1001 __field(u64, fileid) <<
1002 __field(u64, version) <<
1003 __field(loff_t, offse <<
1004 __field(size_t, count <<
1005 ), <<
1006 <<
1007 TP_fast_assign( <<
1008 const struct nfs_inod <<
1009 <<
1010 __entry->dev = inode- <<
1011 __entry->fileid = nfs <<
1012 __entry->fhandle = nf <<
1013 __entry->version = in <<
1014 __entry->offset = off <<
1015 __entry->count = coun <<
1016 __entry->ret = ret; <<
1017 ), <<
1018 <<
1019 TP_printk( <<
1020 "fileid=%02x:%02x:%ll <<
1021 "offset=%lld count=%z <<
1022 MAJOR(__entry->dev), <<
1023 (unsigned long long)_ <<
1024 __entry->fhandle, __e <<
1025 __entry->offset, __en <<
1026 ) <<
1027 ); <<
1028 <<
1029 #define DEFINE_NFS_FOLIO_EVENT_DONE(name) \ <<
1030 DEFINE_EVENT(nfs_folio_event_done, na <<
1031 TP_PROTO( \ <<
1032 const struct <<
1033 loff_t offset <<
1034 size_t count, <<
1035 int ret \ <<
1036 ), \ <<
1037 TP_ARGS(inode, offset <<
1038 <<
1039 DEFINE_NFS_FOLIO_EVENT(nfs_aop_readpage); <<
1040 DEFINE_NFS_FOLIO_EVENT_DONE(nfs_aop_readpage_ <<
1041 <<
1042 DEFINE_NFS_FOLIO_EVENT(nfs_writeback_folio); <<
1043 DEFINE_NFS_FOLIO_EVENT_DONE(nfs_writeback_fol <<
1044 <<
1045 DEFINE_NFS_FOLIO_EVENT(nfs_invalidate_folio); <<
1046 DEFINE_NFS_FOLIO_EVENT_DONE(nfs_launder_folio <<
1047 <<
1048 TRACE_EVENT(nfs_aop_readahead, <<
1049 TP_PROTO( <<
1050 const struct inode *i <<
1051 loff_t pos, <<
1052 unsigned int nr_pages <<
1053 ), <<
1054 <<
1055 TP_ARGS(inode, pos, nr_pages) <<
1056 <<
1057 TP_STRUCT__entry( <<
1058 __field(dev_t, dev) <<
1059 __field(u32, fhandle) <<
1060 __field(u64, fileid) <<
1061 __field(u64, version) <<
1062 __field(loff_t, offse 734 __field(loff_t, offset)
1063 __field(unsigned int, !! 735 __field(unsigned long, count)
1064 ), <<
1065 <<
1066 TP_fast_assign( <<
1067 const struct nfs_inod <<
1068 <<
1069 __entry->dev = inode- <<
1070 __entry->fileid = nfs <<
1071 __entry->fhandle = nf <<
1072 __entry->version = in <<
1073 __entry->offset = pos <<
1074 __entry->nr_pages = n <<
1075 ), <<
1076 <<
1077 TP_printk( <<
1078 "fileid=%02x:%02x:%ll <<
1079 MAJOR(__entry->dev), <<
1080 (unsigned long long)_ <<
1081 __entry->fhandle, __e <<
1082 __entry->offset, __en <<
1083 ) <<
1084 ); <<
1085 <<
1086 TRACE_EVENT(nfs_aop_readahead_done, <<
1087 TP_PROTO( <<
1088 const struct inode *i <<
1089 unsigned int nr_pages <<
1090 int ret <<
1091 ), <<
1092 <<
1093 TP_ARGS(inode, nr_pages, ret) <<
1094 <<
1095 TP_STRUCT__entry( <<
1096 __field(dev_t, dev) 736 __field(dev_t, dev)
1097 __field(u32, fhandle) 737 __field(u32, fhandle)
1098 __field(int, ret) <<
1099 __field(u64, fileid) 738 __field(u64, fileid)
1100 __field(u64, version) <<
1101 __field(loff_t, offse <<
1102 __field(unsigned int, <<
1103 ), 739 ),
1104 740
1105 TP_fast_assign( 741 TP_fast_assign(
1106 const struct nfs_inod 742 const struct nfs_inode *nfsi = NFS_I(inode);
1107 743
>> 744 __entry->offset = offset;
>> 745 __entry->count = count;
1108 __entry->dev = inode- 746 __entry->dev = inode->i_sb->s_dev;
1109 __entry->fileid = nfs 747 __entry->fileid = nfsi->fileid;
1110 __entry->fhandle = nf 748 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1111 __entry->version = in <<
1112 __entry->nr_pages = n <<
1113 __entry->ret = ret; <<
1114 ), <<
1115 <<
1116 TP_printk( <<
1117 "fileid=%02x:%02x:%ll <<
1118 MAJOR(__entry->dev), <<
1119 (unsigned long long)_ <<
1120 __entry->fhandle, __e <<
1121 __entry->nr_pages, __ <<
1122 ) <<
1123 ); <<
1124 <<
1125 TRACE_EVENT(nfs_initiate_read, <<
1126 TP_PROTO( <<
1127 const struct nfs_pgio <<
1128 ), <<
1129 <<
1130 TP_ARGS(hdr), <<
1131 <<
1132 TP_STRUCT__entry( <<
1133 __field(dev_t, dev) <<
1134 __field(u32, fhandle) <<
1135 __field(u64, fileid) <<
1136 __field(loff_t, offse <<
1137 __field(u32, count) <<
1138 ), <<
1139 <<
1140 TP_fast_assign( <<
1141 const struct inode *i <<
1142 const struct nfs_inod <<
1143 const struct nfs_fh * <<
1144 <<
1145 <<
1146 __entry->offset = hdr <<
1147 __entry->count = hdr- <<
1148 __entry->dev = inode- <<
1149 __entry->fileid = nfs <<
1150 __entry->fhandle = nf <<
1151 ), 749 ),
1152 750
1153 TP_printk( 751 TP_printk(
1154 "fileid=%02x:%02x:%ll 752 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1155 "offset=%lld count=%u !! 753 "offset=%lld count=%lu",
1156 MAJOR(__entry->dev), 754 MAJOR(__entry->dev), MINOR(__entry->dev),
1157 (unsigned long long)_ 755 (unsigned long long)__entry->fileid,
1158 __entry->fhandle, 756 __entry->fhandle,
1159 (long long)__entry->o !! 757 __entry->offset, __entry->count
1160 ) 758 )
1161 ); 759 );
1162 760
1163 TRACE_EVENT(nfs_readpage_done, 761 TRACE_EVENT(nfs_readpage_done,
1164 TP_PROTO( 762 TP_PROTO(
1165 const struct rpc_task !! 763 const struct inode *inode,
1166 const struct nfs_pgio !! 764 int status, loff_t offset, bool eof
1167 ), 765 ),
1168 766
1169 TP_ARGS(task, hdr), !! 767 TP_ARGS(inode, status, offset, eof),
1170 768
1171 TP_STRUCT__entry( 769 TP_STRUCT__entry(
1172 __field(dev_t, dev) !! 770 __field(int, status)
1173 __field(u32, fhandle) <<
1174 __field(u64, fileid) <<
1175 __field(loff_t, offse 771 __field(loff_t, offset)
1176 __field(u32, arg_coun <<
1177 __field(u32, res_coun <<
1178 __field(bool, eof) 772 __field(bool, eof)
1179 __field(int, error) <<
1180 ), <<
1181 <<
1182 TP_fast_assign( <<
1183 const struct inode *i <<
1184 const struct nfs_inod <<
1185 const struct nfs_fh * <<
1186 <<
1187 <<
1188 __entry->error = task <<
1189 __entry->offset = hdr <<
1190 __entry->arg_count = <<
1191 __entry->res_count = <<
1192 __entry->eof = hdr->r <<
1193 __entry->dev = inode- <<
1194 __entry->fileid = nfs <<
1195 __entry->fhandle = nf <<
1196 ), <<
1197 <<
1198 TP_printk( <<
1199 "error=%d fileid=%02x <<
1200 "offset=%lld count=%u <<
1201 MAJOR(__entry->dev), <<
1202 (unsigned long long)_ <<
1203 __entry->fhandle, <<
1204 (long long)__entry->o <<
1205 __entry->res_count, _ <<
1206 ) <<
1207 ); <<
1208 <<
1209 TRACE_EVENT(nfs_readpage_short, <<
1210 TP_PROTO( <<
1211 const struct rpc_task <<
1212 const struct nfs_pgio <<
1213 ), <<
1214 <<
1215 TP_ARGS(task, hdr), <<
1216 <<
1217 TP_STRUCT__entry( <<
1218 __field(dev_t, dev) 773 __field(dev_t, dev)
1219 __field(u32, fhandle) 774 __field(u32, fhandle)
1220 __field(u64, fileid) 775 __field(u64, fileid)
1221 __field(loff_t, offse <<
1222 __field(u32, arg_coun <<
1223 __field(u32, res_coun <<
1224 __field(bool, eof) <<
1225 __field(int, error) <<
1226 ), 776 ),
1227 777
1228 TP_fast_assign( 778 TP_fast_assign(
1229 const struct inode *i <<
1230 const struct nfs_inod 779 const struct nfs_inode *nfsi = NFS_I(inode);
1231 const struct nfs_fh * <<
1232 <<
1233 780
1234 __entry->error = task !! 781 __entry->status = status;
1235 __entry->offset = hdr !! 782 __entry->offset = offset;
1236 __entry->arg_count = !! 783 __entry->eof = eof;
1237 __entry->res_count = <<
1238 __entry->eof = hdr->r <<
1239 __entry->dev = inode- 784 __entry->dev = inode->i_sb->s_dev;
1240 __entry->fileid = nfs 785 __entry->fileid = nfsi->fileid;
1241 __entry->fhandle = nf !! 786 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1242 ), 787 ),
1243 788
1244 TP_printk( 789 TP_printk(
1245 "error=%d fileid=%02x !! 790 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1246 "offset=%lld count=%u !! 791 "offset=%lld status=%d%s",
1247 MAJOR(__entry->dev), 792 MAJOR(__entry->dev), MINOR(__entry->dev),
1248 (unsigned long long)_ 793 (unsigned long long)__entry->fileid,
1249 __entry->fhandle, 794 __entry->fhandle,
1250 (long long)__entry->o !! 795 __entry->offset, __entry->status,
1251 __entry->res_count, _ !! 796 __entry->eof ? " eof" : ""
1252 ) 797 )
1253 ); 798 );
1254 799
>> 800 TRACE_DEFINE_ENUM(NFS_UNSTABLE);
>> 801 TRACE_DEFINE_ENUM(NFS_DATA_SYNC);
>> 802 TRACE_DEFINE_ENUM(NFS_FILE_SYNC);
1255 803
1256 TRACE_EVENT(nfs_pgio_error, !! 804 #define nfs_show_stable(stable) \
1257 TP_PROTO( !! 805 __print_symbolic(stable, \
1258 const struct nfs_pgio_header !! 806 { NFS_UNSTABLE, "UNSTABLE" }, \
1259 int error, !! 807 { NFS_DATA_SYNC, "DATA_SYNC" }, \
1260 loff_t pos !! 808 { NFS_FILE_SYNC, "FILE_SYNC" })
1261 ), <<
1262 <<
1263 TP_ARGS(hdr, error, pos), <<
1264 <<
1265 TP_STRUCT__entry( <<
1266 __field(dev_t, dev) <<
1267 __field(u32, fhandle) <<
1268 __field(u64, fileid) <<
1269 __field(loff_t, offset) <<
1270 __field(u32, arg_count) <<
1271 __field(u32, res_count) <<
1272 __field(loff_t, pos) <<
1273 __field(int, error) <<
1274 ), <<
1275 <<
1276 TP_fast_assign( <<
1277 const struct inode *inode = h <<
1278 const struct nfs_inode *nfsi <<
1279 const struct nfs_fh *fh = hdr <<
1280 hdr <<
1281 <<
1282 __entry->error = error; <<
1283 __entry->offset = hdr->args.o <<
1284 __entry->arg_count = hdr->arg <<
1285 __entry->res_count = hdr->res <<
1286 __entry->dev = inode->i_sb->s <<
1287 __entry->fileid = nfsi->filei <<
1288 __entry->fhandle = nfs_fhandl <<
1289 ), <<
1290 <<
1291 TP_printk("error=%d fileid=%02x:%02x: <<
1292 "offset=%lld count=%u res=% <<
1293 MAJOR(__entry->dev), MINOR(__ <<
1294 (unsigned long long)__entry-> <<
1295 (long long)__entry->offset, _ <<
1296 __entry->pos <<
1297 ) <<
1298 ); <<
1299 809
1300 TRACE_EVENT(nfs_initiate_write, 810 TRACE_EVENT(nfs_initiate_write,
1301 TP_PROTO( 811 TP_PROTO(
1302 const struct nfs_pgio !! 812 const struct inode *inode,
>> 813 loff_t offset, unsigned long count,
>> 814 enum nfs3_stable_how stable
1303 ), 815 ),
1304 816
1305 TP_ARGS(hdr), !! 817 TP_ARGS(inode, offset, count, stable),
1306 818
1307 TP_STRUCT__entry( 819 TP_STRUCT__entry(
>> 820 __field(loff_t, offset)
>> 821 __field(unsigned long, count)
>> 822 __field(enum nfs3_stable_how, stable)
1308 __field(dev_t, dev) 823 __field(dev_t, dev)
1309 __field(u32, fhandle) 824 __field(u32, fhandle)
1310 __field(u64, fileid) 825 __field(u64, fileid)
1311 __field(loff_t, offse <<
1312 __field(u32, count) <<
1313 __field(unsigned long <<
1314 ), 826 ),
1315 827
1316 TP_fast_assign( 828 TP_fast_assign(
1317 const struct inode *i <<
1318 const struct nfs_inod 829 const struct nfs_inode *nfsi = NFS_I(inode);
1319 const struct nfs_fh * <<
1320 <<
1321 830
1322 __entry->offset = hdr !! 831 __entry->offset = offset;
1323 __entry->count = hdr- !! 832 __entry->count = count;
1324 __entry->stable = hdr !! 833 __entry->stable = stable;
1325 __entry->dev = inode- 834 __entry->dev = inode->i_sb->s_dev;
1326 __entry->fileid = nfs 835 __entry->fileid = nfsi->fileid;
1327 __entry->fhandle = nf !! 836 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1328 ), 837 ),
1329 838
1330 TP_printk( 839 TP_printk(
1331 "fileid=%02x:%02x:%ll 840 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1332 "offset=%lld count=%u !! 841 "offset=%lld count=%lu stable=%s",
1333 MAJOR(__entry->dev), 842 MAJOR(__entry->dev), MINOR(__entry->dev),
1334 (unsigned long long)_ 843 (unsigned long long)__entry->fileid,
1335 __entry->fhandle, 844 __entry->fhandle,
1336 (long long)__entry->o !! 845 __entry->offset, __entry->count,
1337 show_nfs_stable_how(_ !! 846 nfs_show_stable(__entry->stable)
1338 ) 847 )
1339 ); 848 );
1340 849
1341 TRACE_EVENT(nfs_writeback_done, 850 TRACE_EVENT(nfs_writeback_done,
1342 TP_PROTO( 851 TP_PROTO(
1343 const struct rpc_task <<
1344 const struct nfs_pgio <<
1345 ), <<
1346 <<
1347 TP_ARGS(task, hdr), <<
1348 <<
1349 TP_STRUCT__entry( <<
1350 __field(dev_t, dev) <<
1351 __field(u32, fhandle) <<
1352 __field(u64, fileid) <<
1353 __field(loff_t, offse <<
1354 __field(u32, arg_coun <<
1355 __field(u32, res_coun <<
1356 __field(int, error) <<
1357 __field(unsigned long <<
1358 __array(char, verifie <<
1359 ), <<
1360 <<
1361 TP_fast_assign( <<
1362 const struct inode *i <<
1363 const struct nfs_inod <<
1364 const struct nfs_fh * <<
1365 <<
1366 const struct nfs_writ <<
1367 <<
1368 __entry->error = task <<
1369 __entry->offset = hdr <<
1370 __entry->arg_count = <<
1371 __entry->res_count = <<
1372 __entry->stable = ver <<
1373 memcpy(__entry->verif <<
1374 &verf->verifi <<
1375 NFS4_VERIFIER <<
1376 __entry->dev = inode- <<
1377 __entry->fileid = nfs <<
1378 __entry->fhandle = nf <<
1379 ), <<
1380 <<
1381 TP_printk( <<
1382 "error=%d fileid=%02x <<
1383 "offset=%lld count=%u <<
1384 "verifier=%s", __entr <<
1385 MAJOR(__entry->dev), <<
1386 (unsigned long long)_ <<
1387 __entry->fhandle, <<
1388 (long long)__entry->o <<
1389 __entry->res_count, <<
1390 show_nfs_stable_how(_ <<
1391 show_nfs4_verifier(__ <<
1392 ) <<
1393 ); <<
1394 <<
1395 DECLARE_EVENT_CLASS(nfs_page_error_class, <<
1396 TP_PROTO( <<
1397 const struct inode *i 852 const struct inode *inode,
1398 const struct nfs_page !! 853 int status,
1399 int error !! 854 loff_t offset,
>> 855 struct nfs_writeverf *writeverf
1400 ), 856 ),
1401 857
1402 TP_ARGS(inode, req, error), !! 858 TP_ARGS(inode, status, offset, writeverf),
1403 859
1404 TP_STRUCT__entry( 860 TP_STRUCT__entry(
>> 861 __field(int, status)
>> 862 __field(loff_t, offset)
>> 863 __field(enum nfs3_stable_how, stable)
>> 864 __field(unsigned long long, verifier)
1405 __field(dev_t, dev) 865 __field(dev_t, dev)
1406 __field(u32, fhandle) 866 __field(u32, fhandle)
1407 __field(u64, fileid) 867 __field(u64, fileid)
1408 __field(loff_t, offse <<
1409 __field(unsigned int, <<
1410 __field(int, error) <<
1411 ), 868 ),
1412 869
1413 TP_fast_assign( 870 TP_fast_assign(
1414 const struct nfs_inod 871 const struct nfs_inode *nfsi = NFS_I(inode);
>> 872
>> 873 __entry->status = status;
>> 874 __entry->offset = offset;
>> 875 __entry->stable = writeverf->committed;
>> 876 memcpy(&__entry->verifier, &writeverf->verifier,
>> 877 sizeof(__entry->verifier));
1415 __entry->dev = inode- 878 __entry->dev = inode->i_sb->s_dev;
1416 __entry->fileid = nfs 879 __entry->fileid = nfsi->fileid;
1417 __entry->fhandle = nf 880 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1418 __entry->offset = req <<
1419 __entry->count = req- <<
1420 __entry->error = erro <<
1421 ), 881 ),
1422 882
1423 TP_printk( 883 TP_printk(
1424 "error=%d fileid=%02x !! 884 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1425 "offset=%lld count=%u !! 885 "offset=%lld status=%d stable=%s "
>> 886 "verifier 0x%016llx",
1426 MAJOR(__entry->dev), 887 MAJOR(__entry->dev), MINOR(__entry->dev),
1427 (unsigned long long)_ 888 (unsigned long long)__entry->fileid,
1428 __entry->fhandle, __e !! 889 __entry->fhandle,
1429 __entry->count !! 890 __entry->offset, __entry->status,
>> 891 nfs_show_stable(__entry->stable),
>> 892 __entry->verifier
1430 ) 893 )
1431 ); 894 );
1432 895
1433 #define DEFINE_NFS_PAGEERR_EVENT(name) \ <<
1434 DEFINE_EVENT(nfs_page_error_class, na <<
1435 TP_PROTO( \ <<
1436 const struct <<
1437 const struct <<
1438 int error \ <<
1439 ), \ <<
1440 TP_ARGS(inode, req, e <<
1441 <<
1442 DEFINE_NFS_PAGEERR_EVENT(nfs_write_error); <<
1443 DEFINE_NFS_PAGEERR_EVENT(nfs_comp_error); <<
1444 DEFINE_NFS_PAGEERR_EVENT(nfs_commit_error); <<
1445 <<
1446 TRACE_EVENT(nfs_initiate_commit, 896 TRACE_EVENT(nfs_initiate_commit,
1447 TP_PROTO( 897 TP_PROTO(
1448 const struct nfs_comm 898 const struct nfs_commit_data *data
1449 ), 899 ),
1450 900
1451 TP_ARGS(data), 901 TP_ARGS(data),
1452 902
1453 TP_STRUCT__entry( 903 TP_STRUCT__entry(
>> 904 __field(loff_t, offset)
>> 905 __field(unsigned long, count)
1454 __field(dev_t, dev) 906 __field(dev_t, dev)
1455 __field(u32, fhandle) 907 __field(u32, fhandle)
1456 __field(u64, fileid) 908 __field(u64, fileid)
1457 __field(loff_t, offse <<
1458 __field(u32, count) <<
1459 ), 909 ),
1460 910
1461 TP_fast_assign( 911 TP_fast_assign(
1462 const struct inode *i 912 const struct inode *inode = data->inode;
1463 const struct nfs_inod 913 const struct nfs_inode *nfsi = NFS_I(inode);
1464 const struct nfs_fh * <<
1465 <<
1466 914
1467 __entry->offset = dat 915 __entry->offset = data->args.offset;
1468 __entry->count = data 916 __entry->count = data->args.count;
1469 __entry->dev = inode- 917 __entry->dev = inode->i_sb->s_dev;
1470 __entry->fileid = nfs 918 __entry->fileid = nfsi->fileid;
1471 __entry->fhandle = nf !! 919 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1472 ), 920 ),
1473 921
1474 TP_printk( 922 TP_printk(
1475 "fileid=%02x:%02x:%ll 923 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1476 "offset=%lld count=%u !! 924 "offset=%lld count=%lu",
1477 MAJOR(__entry->dev), 925 MAJOR(__entry->dev), MINOR(__entry->dev),
1478 (unsigned long long)_ 926 (unsigned long long)__entry->fileid,
1479 __entry->fhandle, 927 __entry->fhandle,
1480 (long long)__entry->o !! 928 __entry->offset, __entry->count
1481 ) 929 )
1482 ); 930 );
1483 931
1484 TRACE_EVENT(nfs_commit_done, 932 TRACE_EVENT(nfs_commit_done,
1485 TP_PROTO( 933 TP_PROTO(
1486 const struct rpc_task <<
1487 const struct nfs_comm 934 const struct nfs_commit_data *data
1488 ), 935 ),
1489 936
1490 TP_ARGS(task, data), !! 937 TP_ARGS(data),
1491 938
1492 TP_STRUCT__entry( 939 TP_STRUCT__entry(
>> 940 __field(int, status)
>> 941 __field(loff_t, offset)
>> 942 __field(unsigned long long, verifier)
1493 __field(dev_t, dev) 943 __field(dev_t, dev)
1494 __field(u32, fhandle) 944 __field(u32, fhandle)
1495 __field(u64, fileid) 945 __field(u64, fileid)
1496 __field(loff_t, offse <<
1497 __field(int, error) <<
1498 __field(unsigned long <<
1499 __array(char, verifie <<
1500 ), 946 ),
1501 947
1502 TP_fast_assign( 948 TP_fast_assign(
1503 const struct inode *i 949 const struct inode *inode = data->inode;
1504 const struct nfs_inod 950 const struct nfs_inode *nfsi = NFS_I(inode);
1505 const struct nfs_fh * <<
1506 <<
1507 const struct nfs_writ <<
1508 951
1509 __entry->error = task !! 952 __entry->status = data->res.op_status;
1510 __entry->offset = dat 953 __entry->offset = data->args.offset;
1511 __entry->stable = ver !! 954 memcpy(&__entry->verifier, &data->verf.verifier,
1512 memcpy(__entry->verif !! 955 sizeof(__entry->verifier));
1513 &verf->verifi <<
1514 NFS4_VERIFIER <<
1515 __entry->dev = inode- 956 __entry->dev = inode->i_sb->s_dev;
1516 __entry->fileid = nfs 957 __entry->fileid = nfsi->fileid;
1517 __entry->fhandle = nf !! 958 __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
1518 ), 959 ),
1519 960
1520 TP_printk( 961 TP_printk(
1521 "error=%d fileid=%02x !! 962 "fileid=%02x:%02x:%llu fhandle=0x%08x "
1522 "offset=%lld stable=% !! 963 "offset=%lld status=%d verifier 0x%016llx",
1523 MAJOR(__entry->dev), 964 MAJOR(__entry->dev), MINOR(__entry->dev),
1524 (unsigned long long)_ 965 (unsigned long long)__entry->fileid,
1525 __entry->fhandle, 966 __entry->fhandle,
1526 (long long)__entry->o !! 967 __entry->offset, __entry->status,
1527 show_nfs_stable_how(_ !! 968 __entry->verifier
1528 show_nfs4_verifier(__ <<
1529 ) 969 )
1530 ); 970 );
1531 <<
1532 #define nfs_show_direct_req_flags(v) \ <<
1533 __print_flags(v, "|", \ <<
1534 { NFS_ODIRECT_DO_COMM <<
1535 { NFS_ODIRECT_RESCHED <<
1536 { NFS_ODIRECT_SHOULD_ <<
1537 { NFS_ODIRECT_DONE, " <<
1538 <<
1539 DECLARE_EVENT_CLASS(nfs_direct_req_class, <<
1540 TP_PROTO( <<
1541 const struct nfs_dire <<
1542 ), <<
1543 <<
1544 TP_ARGS(dreq), <<
1545 <<
1546 TP_STRUCT__entry( <<
1547 __field(dev_t, dev) <<
1548 __field(u64, fileid) <<
1549 __field(u32, fhandle) <<
1550 __field(loff_t, offse <<
1551 __field(ssize_t, coun <<
1552 __field(ssize_t, erro <<
1553 __field(int, flags) <<
1554 ), <<
1555 <<
1556 TP_fast_assign( <<
1557 const struct inode *i <<
1558 const struct nfs_inod <<
1559 const struct nfs_fh * <<
1560 <<
1561 __entry->dev = inode- <<
1562 __entry->fileid = nfs <<
1563 __entry->fhandle = nf <<
1564 __entry->offset = dre <<
1565 __entry->count = dreq <<
1566 __entry->error = dreq <<
1567 __entry->flags = dreq <<
1568 ), <<
1569 <<
1570 TP_printk( <<
1571 "error=%zd fileid=%02 <<
1572 "offset=%lld count=%z <<
1573 __entry->error, MAJOR <<
1574 MINOR(__entry->dev), <<
1575 (unsigned long long)_ <<
1576 __entry->fhandle, __e <<
1577 __entry->count, <<
1578 nfs_show_direct_req_f <<
1579 ) <<
1580 ); <<
1581 <<
1582 #define DEFINE_NFS_DIRECT_REQ_EVENT(name) \ <<
1583 DEFINE_EVENT(nfs_direct_req_class, na <<
1584 TP_PROTO( \ <<
1585 const struct <<
1586 ), \ <<
1587 TP_ARGS(dreq)) <<
1588 <<
1589 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_commit <<
1590 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_resche <<
1591 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_ <<
1592 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_ <<
1593 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_ <<
1594 DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_ <<
1595 <<
1596 TRACE_EVENT(nfs_fh_to_dentry, <<
1597 TP_PROTO( <<
1598 const struct super_bl <<
1599 const struct nfs_fh * <<
1600 u64 fileid, <<
1601 int error <<
1602 ), <<
1603 <<
1604 TP_ARGS(sb, fh, fileid, error <<
1605 <<
1606 TP_STRUCT__entry( <<
1607 __field(int, error) <<
1608 __field(dev_t, dev) <<
1609 __field(u32, fhandle) <<
1610 __field(u64, fileid) <<
1611 ), <<
1612 <<
1613 TP_fast_assign( <<
1614 __entry->error = erro <<
1615 __entry->dev = sb->s_ <<
1616 __entry->fileid = fil <<
1617 __entry->fhandle = nf <<
1618 ), <<
1619 <<
1620 TP_printk( <<
1621 "error=%d fileid=%02x <<
1622 __entry->error, <<
1623 MAJOR(__entry->dev), <<
1624 (unsigned long long)_ <<
1625 __entry->fhandle <<
1626 ) <<
1627 ); <<
1628 <<
1629 TRACE_EVENT(nfs_mount_assign, <<
1630 TP_PROTO( <<
1631 const char *option, <<
1632 const char *value <<
1633 ), <<
1634 <<
1635 TP_ARGS(option, value), <<
1636 <<
1637 TP_STRUCT__entry( <<
1638 __string(option, option) <<
1639 __string(value, value) <<
1640 ), <<
1641 <<
1642 TP_fast_assign( <<
1643 __assign_str(option); <<
1644 __assign_str(value); <<
1645 ), <<
1646 <<
1647 TP_printk("option %s=%s", <<
1648 __get_str(option), __get_str( <<
1649 ) <<
1650 ); <<
1651 <<
1652 TRACE_EVENT(nfs_mount_option, <<
1653 TP_PROTO( <<
1654 const struct fs_parameter *pa <<
1655 ), <<
1656 <<
1657 TP_ARGS(param), <<
1658 <<
1659 TP_STRUCT__entry( <<
1660 __string(option, param->key) <<
1661 ), <<
1662 <<
1663 TP_fast_assign( <<
1664 __assign_str(option); <<
1665 ), <<
1666 <<
1667 TP_printk("option %s", __get_str(opti <<
1668 ); <<
1669 <<
1670 TRACE_EVENT(nfs_mount_path, <<
1671 TP_PROTO( <<
1672 const char *path <<
1673 ), <<
1674 <<
1675 TP_ARGS(path), <<
1676 <<
1677 TP_STRUCT__entry( <<
1678 __string(path, path) <<
1679 ), <<
1680 <<
1681 TP_fast_assign( <<
1682 __assign_str(path); <<
1683 ), <<
1684 <<
1685 TP_printk("path='%s'", __get_str(path <<
1686 ); <<
1687 <<
1688 DECLARE_EVENT_CLASS(nfs_xdr_event, <<
1689 TP_PROTO( <<
1690 const struct xdr_stre <<
1691 int error <<
1692 ), <<
1693 <<
1694 TP_ARGS(xdr, error), <<
1695 <<
1696 TP_STRUCT__entry( <<
1697 __field(unsigned int, <<
1698 __field(unsigned int, <<
1699 __field(u32, xid) <<
1700 __field(int, version) <<
1701 __field(unsigned long <<
1702 __string(program, <<
1703 xdr->rqst->r <<
1704 __string(procedure, <<
1705 xdr->rqst->r <<
1706 ), <<
1707 <<
1708 TP_fast_assign( <<
1709 const struct rpc_rqst <<
1710 const struct rpc_task <<
1711 <<
1712 __entry->task_id = ta <<
1713 __entry->client_id = <<
1714 __entry->xid = be32_t <<
1715 __entry->version = ta <<
1716 __entry->error = erro <<
1717 __assign_str(program) <<
1718 __assign_str(procedur <<
1719 ), <<
1720 <<
1721 TP_printk(SUNRPC_TRACE_TASK_S <<
1722 " xid=0x%08x %sv%d <<
1723 __entry->task_id, __e <<
1724 __get_str(program), _ <<
1725 __get_str(procedure), <<
1726 show_nfs_status(__ent <<
1727 ) <<
1728 ); <<
1729 #define DEFINE_NFS_XDR_EVENT(name) \ <<
1730 DEFINE_EVENT(nfs_xdr_event, name, \ <<
1731 TP_PROTO( \ <<
1732 const struct <<
1733 int error \ <<
1734 ), \ <<
1735 TP_ARGS(xdr, error)) <<
1736 DEFINE_NFS_XDR_EVENT(nfs_xdr_status); <<
1737 DEFINE_NFS_XDR_EVENT(nfs_xdr_bad_filehandle); <<
1738 971
1739 #endif /* _TRACE_NFS_H */ 972 #endif /* _TRACE_NFS_H */
1740 973
1741 #undef TRACE_INCLUDE_PATH 974 #undef TRACE_INCLUDE_PATH
1742 #define TRACE_INCLUDE_PATH . 975 #define TRACE_INCLUDE_PATH .
1743 #define TRACE_INCLUDE_FILE nfstrace 976 #define TRACE_INCLUDE_FILE nfstrace
1744 /* This part must be outside protection */ 977 /* This part must be outside protection */
1745 #include <trace/define_trace.h> 978 #include <trace/define_trace.h>
1746 979
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.