These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / f2fs / debug.c

diff --git a/kernel/fs/f2fs/debug.c b/kernel/fs/f2fs/debug.c
index f5388f3..478e5d5 100644 (file)
--- a/kernel/fs/f2fs/debug.c
+++ b/kernel/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 = atomic64_read(&sbi->read_hit_largest);
+       si->hit_cached = atomic64_read(&sbi->read_hit_cached);
+       si->hit_rbtree = atomic64_read(&sbi->read_hit_rbtree);
+       si->hit_total = si->hit_largest + si->hit_cached + si->hit_rbtree;
+       si->total_ext = atomic64_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);
@@ -94,7 +98,8 @@ static void update_general_status(struct f2fs_sb_info *sbi)
 static void update_sit_info(struct f2fs_sb_info *sbi)
 {
        struct f2fs_stat_info *si = F2FS_STAT(sbi);
-       unsigned int blks_per_sec, hblks_per_sec, total_vblocks, bimodal, dist;
+       unsigned long long blks_per_sec, hblks_per_sec, total_vblocks;
+       unsigned long long bimodal, dist;
        unsigned int segno, vblocks;
        int ndirty = 0;
 
@@ -112,10 +117,10 @@ static void update_sit_info(struct f2fs_sb_info *sbi)
                        ndirty++;
                }
        }
-       dist = MAIN_SECS(sbi) * hblks_per_sec * hblks_per_sec / 100;
-       si->bimodal = bimodal / dist;
+       dist = div_u64(MAIN_SECS(sbi) * hblks_per_sec * hblks_per_sec, 100);
+       si->bimodal = div64_u64(bimodal, dist);
        if (si->dirty_count)
-               si->avg_vblocks = total_vblocks / ndirty;
+               si->avg_vblocks = div_u64(total_vblocks, ndirty);
        else
                si->avg_vblocks = 0;
 }
@@ -143,7 +148,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
        si->base_mem += sizeof(struct sit_info);
        si->base_mem += MAIN_SEGS(sbi) * sizeof(struct seg_entry);
        si->base_mem += f2fs_bitmap_size(MAIN_SEGS(sbi));
-       si->base_mem += 2 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi);
+       si->base_mem += 3 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi);
        si->base_mem += SIT_VBLOCK_MAP_SIZE;
        if (sbi->segs_per_sec > 1)
                si->base_mem += MAIN_SECS(sbi) * sizeof(struct sec_entry);
@@ -193,9 +198,9 @@ get_cache:
 
        si->page_mem = 0;
        npages = NODE_MAPPING(sbi)->nrpages;
-       si->page_mem += npages << PAGE_CACHE_SHIFT;
+       si->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT;
        npages = META_MAPPING(sbi)->nrpages;
-       si->page_mem += npages << PAGE_CACHE_SHIFT;
+       si->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT;
 }
 
 static int stat_show(struct seq_file *s, void *v)
@@ -225,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",
@@ -275,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:%llu L1-2:%llu L2:%llu\n",
+                               si->hit_largest, si->hit_cached,
+                               si->hit_rbtree);
+               seq_printf(s, "  - Hit Ratio: %llu%% (%llu / %llu)\n",
+                               !si->total_ext ? 0 :
+                               div64_u64(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);
@@ -320,13 +333,13 @@ static int stat_show(struct seq_file *s, void *v)
 
                /* memory footprint */
                update_mem_info(si->sbi);
-               seq_printf(s, "\nMemory: %u KB\n",
+               seq_printf(s, "\nMemory: %llu KB\n",
                        (si->base_mem + si->cache_mem + si->page_mem) >> 10);
-               seq_printf(s, "  - static: %u KB\n",
+               seq_printf(s, "  - static: %llu KB\n",
                                si->base_mem >> 10);
-               seq_printf(s, "  - cached: %u KB\n",
+               seq_printf(s, "  - cached: %llu KB\n",
                                si->cache_mem >> 10);
-               seq_printf(s, "  - paged : %u KB\n",
+               seq_printf(s, "  - paged : %llu KB\n",
                                si->page_mem >> 10);
        }
        mutex_unlock(&f2fs_stat_mutex);
@@ -365,6 +378,12 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
        si->sbi = sbi;
        sbi->stat_info = si;
 
+       atomic64_set(&sbi->total_hit_ext, 0);
+       atomic64_set(&sbi->read_hit_rbtree, 0);
+       atomic64_set(&sbi->read_hit_largest, 0);
+       atomic64_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);