Merge tag 'audit-pr-20200226' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

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

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 9b0bedd82581b263568695422d7410e679534ace..6b89eae5e4ca21a794fde1f59d436c3797d65519 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -21,9 +21,45 @@
 #include "gc.h"
 
 static LIST_HEAD(f2fs_stat_list);
-static struct dentry *f2fs_debugfs_root;
 static DEFINE_MUTEX(f2fs_stat_mutex);
+#ifdef CONFIG_DEBUG_FS
+static struct dentry *f2fs_debugfs_root;
+#endif
+
+/*
+ * This function calculates BDF of every segments
+ */
+void f2fs_update_sit_info(struct f2fs_sb_info *sbi)
+{
+       struct f2fs_stat_info *si = F2FS_STAT(sbi);
+       unsigned long long blks_per_sec, hblks_per_sec, total_vblocks;
+       unsigned long long bimodal, dist;
+       unsigned int segno, vblocks;
+       int ndirty = 0;
+
+       bimodal = 0;
+       total_vblocks = 0;
+       blks_per_sec = BLKS_PER_SEC(sbi);
+       hblks_per_sec = blks_per_sec / 2;
+       for (segno = 0; segno < MAIN_SEGS(sbi); segno += sbi->segs_per_sec) {
+               vblocks = get_valid_blocks(sbi, segno, true);
+               dist = abs(vblocks - hblks_per_sec);
+               bimodal += dist * dist;
+
+               if (vblocks > 0 && vblocks < blks_per_sec) {
+                       total_vblocks += vblocks;
+                       ndirty++;
+               }
+       }
+       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 = div_u64(total_vblocks, ndirty);
+       else
+               si->avg_vblocks = 0;
+}
 
+#ifdef CONFIG_DEBUG_FS
 static void update_general_status(struct f2fs_sb_info *sbi)
 {
        struct f2fs_stat_info *si = F2FS_STAT(sbi);
@@ -56,7 +92,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->nquota_files = sbi->nquota_files;
        si->ndirty_all = sbi->ndirty_inode[DIRTY_META];
        si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);
-       si->aw_cnt = atomic_read(&sbi->aw_cnt);
+       si->aw_cnt = sbi->atomic_files;
        si->vw_cnt = atomic_read(&sbi->vw_cnt);
        si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);
        si->max_vw_cnt = atomic_read(&sbi->max_vw_cnt);
@@ -94,6 +130,8 @@ static void update_general_status(struct f2fs_sb_info *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->compr_inode = atomic_read(&sbi->compr_inode);
+       si->compr_blocks = atomic_read(&sbi->compr_blocks);
        si->append = sbi->im[APPEND_INO].ino_num;
        si->update = sbi->im[UPDATE_INO].ino_num;
        si->orphans = sbi->im[ORPHAN_INO].ino_num;
@@ -114,7 +152,6 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->free_nids = NM_I(sbi)->nid_cnt[FREE_NID];
        si->avail_nids = NM_I(sbi)->available_nids;
        si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
-       si->bg_gc = sbi->bg_gc;
        si->io_skip_bggc = sbi->io_skip_bggc;
        si->other_skip_bggc = sbi->other_skip_bggc;
        si->skipped_atomic_files[BG_GC] = sbi->skipped_atomic_files[BG_GC];
@@ -145,39 +182,6 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->inplace_count = atomic_read(&sbi->inplace_count);
 }
 
-/*
- * This function calculates BDF of every segments
- */
-static void update_sit_info(struct f2fs_sb_info *sbi)
-{
-       struct f2fs_stat_info *si = F2FS_STAT(sbi);
-       unsigned long long blks_per_sec, hblks_per_sec, total_vblocks;
-       unsigned long long bimodal, dist;
-       unsigned int segno, vblocks;
-       int ndirty = 0;
-
-       bimodal = 0;
-       total_vblocks = 0;
-       blks_per_sec = BLKS_PER_SEC(sbi);
-       hblks_per_sec = blks_per_sec / 2;
-       for (segno = 0; segno < MAIN_SEGS(sbi); segno += sbi->segs_per_sec) {
-               vblocks = get_valid_blocks(sbi, segno, true);
-               dist = abs(vblocks - hblks_per_sec);
-               bimodal += dist * dist;
-
-               if (vblocks > 0 && vblocks < blks_per_sec) {
-                       total_vblocks += vblocks;
-                       ndirty++;
-               }
-       }
-       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 = div_u64(total_vblocks, ndirty);
-       else
-               si->avg_vblocks = 0;
-}
-
 /*
  * This function calculates memory footprint.
  */
@@ -315,6 +319,8 @@ static int stat_show(struct seq_file *s, void *v)
                           si->inline_inode);
                seq_printf(s, "  - Inline_dentry Inode: %u\n",
                           si->inline_dir);
+               seq_printf(s, "  - Compressed Inode: %u, Blocks: %u\n",
+                          si->compr_inode, si->compr_blocks);
                seq_printf(s, "  - Orphan/Append/Update Inode: %u, %u, %u\n",
                           si->orphans, si->append, si->update);
                seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",
@@ -441,7 +447,7 @@ static int stat_show(struct seq_file *s, void *v)
                           si->block_count[LFS], si->segment_count[LFS]);
 
                /* segment usage info */
-               update_sit_info(si->sbi);
+               f2fs_update_sit_info(si->sbi);
                seq_printf(s, "\nBDF: %u, avg. vblocks: %u\n",
                           si->bimodal, si->avg_vblocks);
 
@@ -461,6 +467,7 @@ static int stat_show(struct seq_file *s, void *v)
 }
 
 DEFINE_SHOW_ATTRIBUTE(stat);
+#endif
 
 int f2fs_build_stats(struct f2fs_sb_info *sbi)
 {
@@ -491,11 +498,12 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
        atomic_set(&sbi->inline_xattr, 0);
        atomic_set(&sbi->inline_inode, 0);
        atomic_set(&sbi->inline_dir, 0);
+       atomic_set(&sbi->compr_inode, 0);
+       atomic_set(&sbi->compr_blocks, 0);
        atomic_set(&sbi->inplace_count, 0);
        for (i = META_CP; i < META_MAX; i++)
                atomic_set(&sbi->meta_count[i], 0);
 
-       atomic_set(&sbi->aw_cnt, 0);
        atomic_set(&sbi->vw_cnt, 0);
        atomic_set(&sbi->max_aw_cnt, 0);
        atomic_set(&sbi->max_vw_cnt, 0);
@@ -520,14 +528,18 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi)
 
 void __init f2fs_create_root_stats(void)
 {
+#ifdef CONFIG_DEBUG_FS
        f2fs_debugfs_root = debugfs_create_dir("f2fs", NULL);
 
        debugfs_create_file("status", S_IRUGO, f2fs_debugfs_root, NULL,
                            &stat_fops);
+#endif
 }
 
 void f2fs_destroy_root_stats(void)
 {
+#ifdef CONFIG_DEBUG_FS
        debugfs_remove_recursive(f2fs_debugfs_root);
        f2fs_debugfs_root = NULL;
+#endif
 }