@@ -900,9 +900,9 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)
*desc = &my_desc;
int res = 0;
- dfprintk(FILE, "NFS: readdir(%pD2) starting at cookie %llu\n",
- file, (long long)ctx->pos);
nfs_inc_stats(inode, NFSIOS_VFSGETDENTS);
+ trace_nfs_readdir_enter(inode, ctx->pos, dir_ctx->dir_cookie,
+ NFS_SERVER(inode)->dtsize, my_desc.plus);
/*
* ctx->pos points to the dirent entry number.
@@ -949,7 +949,8 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)
out:
if (res > 0)
res = 0;
- dfprintk(FILE, "NFS: readdir(%pD2) returns %d\n", file, res);
+ trace_nfs_readdir_exit(inode, ctx->pos, dir_ctx->dir_cookie,
+ NFS_SERVER(inode)->dtsize, my_desc.plus, res);
return res;
}
@@ -668,6 +668,90 @@
DEFINE_NFS_DIRECTORY_EVENT(nfs_symlink_enter);
DEFINE_NFS_DIRECTORY_EVENT_DONE(nfs_symlink_exit);
+TRACE_EVENT(nfs_readdir_enter,
+ TP_PROTO(
+ const struct inode *inode,
+ u64 cookie,
+ u64 dir_cookie,
+ unsigned int count,
+ bool plus
+ ),
+
+ TP_ARGS(inode, cookie, dir_cookie, count, plus),
+
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(u32, fhandle)
+ __field(u64, fileid)
+ __field(u64, cookie)
+ __field(u64, dir_cookie)
+ __field(u64, count)
+ __field(bool, plus)
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->fileid = NFS_FILEID(inode);
+ __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
+ __entry->cookie = cookie;
+ __entry->dir_cookie = dir_cookie;
+ __entry->count = count;
+ __entry->plus = plus;
+ ),
+
+ TP_printk(
+ "fileid=%02x:%02x:%llu fhandle=0x%08x cookie=0x%08llx dir_cookie=0x%08llx count=%llu plus=%s",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ (unsigned long long)__entry->fileid,
+ __entry->fhandle, __entry->cookie, __entry->dir_cookie,
+ __entry->count, __entry->plus ? "true" : "false"
+ )
+);
+
+TRACE_EVENT(nfs_readdir_exit,
+ TP_PROTO(
+ const struct inode *inode,
+ u64 cookie,
+ u64 dir_cookie,
+ unsigned int count,
+ bool plus,
+ int error
+ ),
+
+ TP_ARGS(inode, cookie, dir_cookie, count, plus, error),
+
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(u32, fhandle)
+ __field(u64, fileid)
+ __field(unsigned long, error)
+ __field(u64, cookie)
+ __field(u64, dir_cookie)
+ __field(u64, count)
+ __field(bool, plus)
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->fileid = NFS_FILEID(inode);
+ __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
+ __entry->error = error;
+ __entry->cookie = cookie;
+ __entry->dir_cookie = dir_cookie;
+ __entry->count = count;
+ __entry->plus = plus;
+ ),
+
+ TP_printk(
+ "error=%ld fileid=%02x:%02x:%llu fhandle=0x%08x cookie=0x%08llx dir_cookie=0x%08llx count=%llu plus=%s",
+ __entry->error,
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ (unsigned long long)__entry->fileid,
+ __entry->fhandle, __entry->cookie, __entry->dir_cookie,
+ __entry->count, __entry->plus ? "true" : "false"
+ )
+);
+
TRACE_EVENT(nfs_link_enter,
TP_PROTO(
const struct inode *inode,
Remove a couple dfprintks in nfs_readdir and replace them with trace events on entry/exit that contain more information. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com> --- fs/nfs/dir.c | 7 +++-- fs/nfs/nfstrace.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-)