userfaultfd: wake pending userfaults

[deliverable/linux.git] / fs / f2fs / debug.c

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 75176e0dd6c8b251d62d503ceb6d0b486e903afb..d013d847975379e5dd6cd745f370bcaae4430f33 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -33,8 +33,11 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        int i;
 
        /* validation check of the segment numbers */
-       si->hit_ext = sbi->read_hit_ext;
-       si->total_ext = sbi->total_hit_ext;
+       si->hit_largest = atomic_read(&sbi->read_hit_largest);
+       si->hit_cached = atomic_read(&sbi->read_hit_cached);
+       si->hit_rbtree = atomic_read(&sbi->read_hit_rbtree);
+       si->hit_total = si->hit_largest + si->hit_cached + si->hit_rbtree;
+       si->total_ext = atomic_read(&sbi->total_hit_ext);
        si->ext_tree = sbi->total_ext_tree;
        si->ext_node = atomic_read(&sbi->total_ext_node);
        si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES);
@@ -49,6 +52,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->valid_count = valid_user_blocks(sbi);
        si->valid_node_count = valid_node_count(sbi);
        si->valid_inode_count = valid_inode_count(sbi);
+       si->inline_xattr = atomic_read(&sbi->inline_xattr);
        si->inline_inode = atomic_read(&sbi->inline_inode);
        si->inline_dir = atomic_read(&sbi->inline_dir);
        si->utilization = utilization(sbi);
@@ -226,6 +230,8 @@ static int stat_show(struct seq_file *s, void *v)
                seq_printf(s, "Other: %u)\n  - Data: %u\n",
                           si->valid_node_count - si->valid_inode_count,
                           si->valid_count - si->valid_node_count);
+               seq_printf(s, "  - Inline_xattr Inode: %u\n",
+                          si->inline_xattr);
                seq_printf(s, "  - Inline_data Inode: %u\n",
                           si->inline_inode);
                seq_printf(s, "  - Inline_dentry Inode: %u\n",
@@ -276,10 +282,16 @@ static int stat_show(struct seq_file *s, void *v)
                                si->bg_data_blks);
                seq_printf(s, "  - node blocks : %d (%d)\n", si->node_blks,
                                si->bg_node_blks);
-               seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",
-                          si->hit_ext, si->total_ext);
-               seq_printf(s, "\nExtent Tree Count: %d\n", si->ext_tree);
-               seq_printf(s, "\nExtent Node Count: %d\n", si->ext_node);
+               seq_puts(s, "\nExtent Cache:\n");
+               seq_printf(s, "  - Hit Count: L1-1:%d L1-2:%d L2:%d\n",
+                               si->hit_largest, si->hit_cached,
+                               si->hit_rbtree);
+               seq_printf(s, "  - Hit Ratio: %d%% (%d / %d)\n",
+                               !si->total_ext ? 0 :
+                               (si->hit_total * 100) / si->total_ext,
+                               si->hit_total, si->total_ext);
+               seq_printf(s, "  - Inner Struct Count: tree: %d, node: %d\n",
+                               si->ext_tree, si->ext_node);
                seq_puts(s, "\nBalancing F2FS Async:\n");
                seq_printf(s, "  - inmem: %4d, wb: %4d\n",
                           si->inmem_pages, si->wb_pages);
@@ -366,6 +378,12 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
        si->sbi = sbi;
        sbi->stat_info = si;
 
+       atomic_set(&sbi->total_hit_ext, 0);
+       atomic_set(&sbi->read_hit_rbtree, 0);
+       atomic_set(&sbi->read_hit_largest, 0);
+       atomic_set(&sbi->read_hit_cached, 0);
+
+       atomic_set(&sbi->inline_xattr, 0);
        atomic_set(&sbi->inline_inode, 0);
        atomic_set(&sbi->inline_dir, 0);
        atomic_set(&sbi->inplace_count, 0);