f2fs: trace f2fs_readdir

This patch adds trace for f2fs_readdir.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index c0c933ad43c8dce1910fe18615def9c96853bacb..148927f5bc93984f51a52976652cb2cf918b8ad9 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -14,6 +14,7 @@
 #include "node.h"
 #include "acl.h"
 #include "xattr.h"
+#include <trace/events/f2fs.h>
 
 static unsigned long dir_blocks(struct inode *inode)
 {
@@ -847,6 +848,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
        struct f2fs_dentry_block *dentry_blk = NULL;
        struct page *dentry_page = NULL;
        struct file_ra_state *ra = &file->f_ra;
+       loff_t start_pos = ctx->pos;
        unsigned int n = ((unsigned long)ctx->pos / NR_DENTRY_IN_BLOCK);
        struct f2fs_dentry_ptr d;
        struct fscrypt_str fstr = FSTR_INIT(NULL, 0);
@@ -855,16 +857,16 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
        if (f2fs_encrypted_inode(inode)) {
                err = fscrypt_get_encryption_info(inode);
                if (err && err != -ENOKEY)
-                       return err;
+                       goto out;
 
                err = fscrypt_fname_alloc_buffer(inode, F2FS_NAME_LEN, &fstr);
                if (err < 0)
-                       return err;
+                       goto out;
        }
 
        if (f2fs_has_inline_dentry(inode)) {
                err = f2fs_read_inline_dir(file, ctx, &fstr);
-               goto out;
+               goto out_free;
        }
 
        /* readahead for multi pages of dir */
@@ -880,7 +882,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
                                err = 0;
                                continue;
                        } else {
-                               goto out;
+                               goto out_free;
                        }
                }
 
@@ -900,8 +902,10 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
                kunmap(dentry_page);
                f2fs_put_page(dentry_page, 1);
        }
-out:
+out_free:
        fscrypt_fname_free_buffer(&fstr);
+out:
+       trace_f2fs_readdir(inode, start_pos, ctx->pos, err);
        return err < 0 ? err : 0;
 }
 

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index dcbbe6dcca9cbc99783a9afd113ae44a580d8f64..00974556421464d335ba910401728b7bdca318fa 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -784,6 +784,35 @@ TRACE_EVENT(f2fs_lookup_end,
                __entry->err)
 );
 
+TRACE_EVENT(f2fs_readdir,
+
+       TP_PROTO(struct inode *dir, loff_t start_pos, loff_t end_pos, int err),
+
+       TP_ARGS(dir, start_pos, end_pos, err),
+
+       TP_STRUCT__entry(
+               __field(dev_t,  dev)
+               __field(ino_t,  ino)
+               __field(loff_t, start)
+               __field(loff_t, end)
+               __field(int,    err)
+       ),
+
+       TP_fast_assign(
+               __entry->dev    = dir->i_sb->s_dev;
+               __entry->ino    = dir->i_ino;
+               __entry->start  = start_pos;
+               __entry->end    = end_pos;
+               __entry->err    = err;
+       ),
+
+       TP_printk("dev = (%d,%d), ino = %lu, start_pos:%llu, end_pos:%llu, err:%d",
+               show_dev_ino(__entry),
+               __entry->start,
+               __entry->end,
+               __entry->err)
+);
+
 TRACE_EVENT(f2fs_fallocate,
 
        TP_PROTO(struct inode *inode, int mode,