1 files changed, 42 insertions, 17 deletions

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 91e8f699ab30..e671373cc8ab 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -40,6 +40,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
         si->ndirty_dirs = sbi->n_dirty_dirs;
         si->ndirty_meta = get_pages(sbi, F2FS_DIRTY_META);
         si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);
+        si->wb_pages = get_pages(sbi, F2FS_WRITEBACK);
         si->total_count = (int)sbi->user_block_count / sbi->blocks_per_seg;
         si->rsvd_segs = reserved_segments(sbi);
         si->overp_segs = overprovision_segments(sbi);
@@ -57,7 +58,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
         si->node_pages = NODE_MAPPING(sbi)->nrpages;
         si->meta_pages = META_MAPPING(sbi)->nrpages;
         si->nats = NM_I(sbi)->nat_cnt;
-        si->sits = SIT_I(sbi)->dirty_sentries;
+        si->dirty_nats = NM_I(sbi)->dirty_nat_cnt;
+        si->sits = MAIN_SEGS(sbi);
+        si->dirty_sits = SIT_I(sbi)->dirty_sentries;
         si->fnids = NM_I(sbi)->fcnt;
         si->bg_gc = sbi->bg_gc;
         si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
@@ -79,6 +82,8 @@ static void update_general_status(struct f2fs_sb_info *sbi)
                 si->segment_count[i] = sbi->segment_count[i];
                 si->block_count[i] = sbi->block_count[i];
         }
+
+        si->inplace_count = atomic_read(&sbi->inplace_count);
 }
 
 /*
@@ -137,6 +142,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
         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 += SIT_VBLOCK_MAP_SIZE;
         if (sbi->segs_per_sec > 1)
                 si->base_mem += MAIN_SECS(sbi) * sizeof(struct sec_entry);
         si->base_mem += __bitmap_size(sbi, SIT_BITMAP);
@@ -159,20 +165,32 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
         si->base_mem += sizeof(struct f2fs_nm_info);
         si->base_mem += __bitmap_size(sbi, NAT_BITMAP);
 
+get_cache:
+        si->cache_mem = 0;
+
         /* build gc */
-        si->base_mem += sizeof(struct f2fs_gc_kthread);
+        if (sbi->gc_thread)
+                si->cache_mem += sizeof(struct f2fs_gc_kthread);
+
+        /* build merge flush thread */
+        if (SM_I(sbi)->cmd_control_info)
+                si->cache_mem += sizeof(struct flush_cmd_control);
 
-get_cache:
         /* free nids */
-        si->cache_mem = NM_I(sbi)->fcnt;
-        si->cache_mem += NM_I(sbi)->nat_cnt;
-        npages = NODE_MAPPING(sbi)->nrpages;
-        si->cache_mem += npages << PAGE_CACHE_SHIFT;
-        npages = META_MAPPING(sbi)->nrpages;
-        si->cache_mem += npages << PAGE_CACHE_SHIFT;
-        si->cache_mem += sbi->n_dirty_dirs * sizeof(struct dir_inode_entry);
+        si->cache_mem += NM_I(sbi)->fcnt * sizeof(struct free_nid);
+        si->cache_mem += NM_I(sbi)->nat_cnt * sizeof(struct nat_entry);
+        si->cache_mem += NM_I(sbi)->dirty_nat_cnt *
+                                        sizeof(struct nat_entry_set);
+        si->cache_mem += si->inmem_pages * sizeof(struct inmem_pages);
+        si->cache_mem += sbi->n_dirty_dirs * sizeof(struct inode_entry);
         for (i = 0; i <= UPDATE_INO; i++)
                 si->cache_mem += sbi->im[i].ino_num * sizeof(struct ino_entry);
+
+        si->page_mem = 0;
+        npages = NODE_MAPPING(sbi)->nrpages;
+        si->page_mem += npages << PAGE_CACHE_SHIFT;
+        npages = META_MAPPING(sbi)->nrpages;
+        si->page_mem += npages << PAGE_CACHE_SHIFT;
 }
 
 static int stat_show(struct seq_file *s, void *v)
@@ -250,16 +268,16 @@ static int stat_show(struct seq_file *s, void *v)
                 seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",
                            si->hit_ext, si->total_ext);
                 seq_puts(s, "\nBalancing F2FS Async:\n");
-                seq_printf(s, "  - inmem: %4d\n",
-                           si->inmem_pages);
+                seq_printf(s, "  - inmem: %4d, wb: %4d\n",
+                           si->inmem_pages, si->wb_pages);
                 seq_printf(s, "  - nodes: %4d in %4d\n",
                            si->ndirty_node, si->node_pages);
                 seq_printf(s, "  - dents: %4d in dirs:%4d\n",
                            si->ndirty_dent, si->ndirty_dirs);
                 seq_printf(s, "  - meta: %4d in %4d\n",
                            si->ndirty_meta, si->meta_pages);
-                seq_printf(s, "  - NATs: %9d\n  - SITs: %9d\n",
-                           si->nats, si->sits);
+                seq_printf(s, "  - NATs: %9d/%9d\n  - SITs: %9d/%9d\n",
+                           si->dirty_nats, si->nats, si->dirty_sits, si->sits);
                 seq_printf(s, "  - free_nids: %9d\n",
                            si->fnids);
                 seq_puts(s, "\nDistribution of User Blocks:");
@@ -277,6 +295,7 @@ static int stat_show(struct seq_file *s, void *v)
                 for (j = 0; j < si->util_free; j++)
                         seq_putc(s, '-');
                 seq_puts(s, "]\n\n");
+                seq_printf(s, "IPU: %u blocks\n", si->inplace_count);
                 seq_printf(s, "SSR: %u blocks in %u segments\n",
                            si->block_count[SSR], si->segment_count[SSR]);
                 seq_printf(s, "LFS: %u blocks in %u segments\n",
@@ -289,9 +308,14 @@ static int stat_show(struct seq_file *s, void *v)
 
                 /* memory footprint */
                 update_mem_info(si->sbi);
-                seq_printf(s, "\nMemory: %u KB = static: %u + cached: %u\n",
-                                (si->base_mem + si->cache_mem) >> 10,
-                                si->base_mem >> 10, si->cache_mem >> 10);
+                seq_printf(s, "\nMemory: %u KB\n",
+                        (si->base_mem + si->cache_mem + si->page_mem) >> 10);
+                seq_printf(s, "  - static: %u KB\n",
+                                si->base_mem >> 10);
+                seq_printf(s, "  - cached: %u KB\n",
+                                si->cache_mem >> 10);
+                seq_printf(s, "  - paged : %u KB\n",
+                                si->page_mem >> 10);
         }
         mutex_unlock(&f2fs_stat_mutex);
         return 0;
@@ -331,6 +355,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
 
         atomic_set(&sbi->inline_inode, 0);
         atomic_set(&sbi->inline_dir, 0);
+        atomic_set(&sbi->inplace_count, 0);
 
         mutex_lock(&f2fs_stat_mutex);
         list_add_tail(&si->stat_list, &f2fs_stat_list);