f2fs: trace elapsed time for cp_global_sem lock

Use f2fs_{down,up}_write_trace for cp_global_sem to trace lock elapsed time.

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

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index da7bcfa2a178dc5bf11af89308bb6d846151f026..86656231ce83bf9fd03ae8135c21fe682c65850c 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -513,6 +513,7 @@ static int f2fs_write_meta_pages(struct address_space *mapping,
                                struct writeback_control *wbc)
 {
        struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);
+       struct f2fs_lock_context lc;
        long diff, written;
 
        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
@@ -525,13 +526,13 @@ static int f2fs_write_meta_pages(struct address_space *mapping,
                goto skip_write;
 
        /* if locked failed, cp will flush dirty pages instead */
-       if (!f2fs_down_write_trylock(&sbi->cp_global_sem))
+       if (!f2fs_down_write_trylock_trace(&sbi->cp_global_sem, &lc))
                goto skip_write;
 
        trace_f2fs_writepages(mapping->host, wbc, META);
        diff = nr_pages_to_write(sbi, META, wbc);
        written = f2fs_sync_meta_pages(sbi, META, wbc->nr_to_write, FS_META_IO);
-       f2fs_up_write(&sbi->cp_global_sem);
+       f2fs_up_write_trace(&sbi->cp_global_sem, &lc);
        wbc->nr_to_write = max((long)0, wbc->nr_to_write - written - diff);
        return 0;
 
@@ -1780,6 +1781,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 {
        struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
+       struct f2fs_lock_context lc;
        unsigned long long ckpt_ver;
        int err = 0;
 
@@ -1794,7 +1796,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                f2fs_warn(sbi, "Start checkpoint disabled!");
        }
        if (cpc->reason != CP_RESIZE)
-               f2fs_down_write(&sbi->cp_global_sem);
+               f2fs_down_write_trace(&sbi->cp_global_sem, &lc);
 
        stat_cp_time(cpc, CP_TIME_LOCK);
 
@@ -1884,7 +1886,7 @@ stop:
        trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, CP_PHASE_FINISH_CHECKPOINT);
 out:
        if (cpc->reason != CP_RESIZE)
-               f2fs_up_write(&sbi->cp_global_sem);
+               f2fs_up_write_trace(&sbi->cp_global_sem, &lc);
        return err;
 }
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 3f3faa5e8ff118ad8ec424c3f095c1d3a0c62735..dc08f6c068102d80e1ce11ed2b46729d47b96aa6 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -179,6 +179,7 @@ enum f2fs_lock_name {
        LOCK_NAME_NODE_CHANGE,
        LOCK_NAME_NODE_WRITE,
        LOCK_NAME_GC_LOCK,
+       LOCK_NAME_CP_GLOBAL,
 };
 
 /*

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 391e66064c7e75a25989020a5c9879a513ccf279..1538f5b0a644bfc6481be7de833a45c254ce37ef 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -2267,6 +2267,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
        struct cp_control cpc = { CP_RESIZE, 0, 0, 0 };
        struct f2fs_lock_context lc;
        struct f2fs_lock_context glc;
+       struct f2fs_lock_context clc;
        unsigned int secs;
        int err = 0;
        __u32 rem;
@@ -2350,7 +2351,7 @@ out_drop_write:
        }
 
        f2fs_down_write_trace(&sbi->gc_lock, &glc);
-       f2fs_down_write(&sbi->cp_global_sem);
+       f2fs_down_write_trace(&sbi->cp_global_sem, &clc);
 
        spin_lock(&sbi->stat_lock);
        if (shrunk_blocks + valid_user_blocks(sbi) +
@@ -2398,7 +2399,7 @@ recover_out:
                spin_unlock(&sbi->stat_lock);
        }
 out_err:
-       f2fs_up_write(&sbi->cp_global_sem);
+       f2fs_up_write_trace(&sbi->cp_global_sem, &clc);
        f2fs_up_write_trace(&sbi->gc_lock, &glc);
        thaw_super(sbi->sb, FREEZE_HOLDER_KERNEL, NULL);
        return err;

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index c3415ebb9f5053952f1b238b5698496839cac5bf..39f6e9830a9c7d7834cf699a659838fb481dba40 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -875,6 +875,7 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
        LIST_HEAD(inode_list);
        LIST_HEAD(tmp_inode_list);
        LIST_HEAD(dir_list);
+       struct f2fs_lock_context lc;
        int err;
        int ret = 0;
        unsigned long s_flags = sbi->sb->s_flags;
@@ -888,7 +889,7 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
                f2fs_info(sbi, "recover fsync data on readonly fs");
 
        /* prevent checkpoint */
-       f2fs_down_write(&sbi->cp_global_sem);
+       f2fs_down_write_trace(&sbi->cp_global_sem, &lc);
 
        /* step #1: find fsynced inode numbers */
        err = find_fsync_dnodes(sbi, &inode_list, check_only, &new_inode);
@@ -932,7 +933,7 @@ skip:
        if (!err)
                clear_sbi_flag(sbi, SBI_POR_DOING);
 
-       f2fs_up_write(&sbi->cp_global_sem);
+       f2fs_up_write_trace(&sbi->cp_global_sem, &lc);
 
        /* let's drop all the directory inodes for clean checkpoint */
        destroy_fsync_dnodes(&dir_list, err);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index da3316528d1bdec85a3ee055a21751e7743edb61..be01eacbe5fa5a834ae2331c1695b6da183ff09f 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4897,7 +4897,7 @@ try_onemore:
        /* initialize locks within allocated memory */
        init_f2fs_rwsem_trace(&sbi->gc_lock, sbi, LOCK_NAME_GC_LOCK);
        mutex_init(&sbi->writepages);
-       init_f2fs_rwsem(&sbi->cp_global_sem);
+       init_f2fs_rwsem_trace(&sbi->cp_global_sem, sbi, LOCK_NAME_CP_GLOBAL);
        init_f2fs_rwsem_trace(&sbi->node_write, sbi, LOCK_NAME_NODE_WRITE);
        init_f2fs_rwsem_trace(&sbi->node_change, sbi, LOCK_NAME_NODE_CHANGE);
        spin_lock_init(&sbi->stat_lock);

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index bf353e7e024dc0b4f3c67cb2a8cb8bb246b56210..859de7c8d1c7478199b2270cca9e069e46f9d4e9 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -189,7 +189,8 @@ TRACE_DEFINE_ENUM(CP_PHASE_FINISH_CHECKPOINT);
                { LOCK_NAME_CP_RWSEM,           "cp_rwsem" },           \
                { LOCK_NAME_NODE_CHANGE,        "node_change" },        \
                { LOCK_NAME_NODE_WRITE,         "node_write" },         \
-               { LOCK_NAME_GC_LOCK,            "gc_lock" })
+               { LOCK_NAME_GC_LOCK,            "gc_lock" },            \
+               { LOCK_NAME_CP_GLOBAL,          "cp_global" })
 
 struct f2fs_sb_info;
 struct f2fs_io_info;