RE: [PATCH v2 5/7] f2fs: stat dirty regular/symlink inodes
Hi Jaegeuk, > -Original Message- > From: Jaegeuk Kim [mailto:jaeg...@kernel.org] > Sent: Thursday, December 17, 2015 1:37 AM > To: Chao Yu > Cc: linux-f2fs-de...@lists.sourceforge.net; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2 5/7] f2fs: stat dirty regular/symlink inodes > > Hi Chao, > > We need to change this patch to avoid build warnings. > > On Wed, Dec 16, 2015 at 01:23:44PM +0800, Chao Yu wrote: > > Add to stat dirty regular and symlink inode for showing in debugfs. > > > > Signed-off-by: Chao Yu > > --- > > v2: > > - rename F2FS_DIRTY_DATAS to F2FS_DIRTY_DATA > > --- > > fs/f2fs/checkpoint.c | 4 > > fs/f2fs/debug.c | 4 > > fs/f2fs/f2fs.h | 8 +++- > > 3 files changed, 15 insertions(+), 1 deletion(-) > > > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > > index f33c4d7..b2af2c16 100644 > > --- a/fs/f2fs/checkpoint.c > > +++ b/fs/f2fs/checkpoint.c > > @@ -735,6 +735,8 @@ static void __add_dirty_inode(struct inode *inode, enum > > inode_type type) > > list_add_tail(&fi->dirty_list, &sbi->inode_list[type]); > > if (type == DIR_INODE) > > stat_inc_dirty_dir(sbi); > > + else > > + stat_inc_dirty_file(sbi); > > If we don't set F2FS_STAT_FS, this causes unreferenced sbi. > > How about something like this? > >stat_inc_dirty_inode(F2FS_I_SB(inode), type); > > #ifdef >stat_inc_dirty_inode(sbi, type) (sbi)->ndirty_inode[type]++; >stat_dec_dirty_inode(sbi, type) (sbi)->ndirty_inode[type]--; > #else >stat_inc_dirty_inode >stat_dec_dirty_inode > #endif More neat, will do. :) Thanks, > > > } > > > > static void __remove_dirty_inode(struct inode *inode, enum inode_type type) > > @@ -751,6 +753,8 @@ static void __remove_dirty_inode(struct inode *inode, > > enum inode_type > type) > > clear_inode_flag(fi, flag); > > if (type == DIR_INODE) > > stat_dec_dirty_dir(sbi); > > + else > > + stat_dec_dirty_file(sbi); > > >stat_dec_dirty_inode(F2FS_I_SB(inode), type); > > > } > > > > void update_dirty_page(struct inode *inode, struct page *page) > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c > > index f4a7b9e..780d5ed1 100644 > > --- a/fs/f2fs/debug.c > > +++ b/fs/f2fs/debug.c > > @@ -42,7 +42,9 @@ static void update_general_status(struct f2fs_sb_info > > *sbi) > > si->ext_node = atomic_read(&sbi->total_ext_node); > > si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES); > > si->ndirty_dent = get_pages(sbi, F2FS_DIRTY_DENTS); > > + si->ndirty_data = get_pages(sbi, F2FS_DIRTY_DATA); > > si->ndirty_dirs = sbi->n_dirty_dirs; > > + si->ndirty_files = sbi->n_dirty_files; > > ... = sbi->n_dirty_inode[FILE_INODE]; > ... = sbi->n_dirty_inode[DIR_INODE]; > > > 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); > > @@ -298,6 +300,8 @@ static int stat_show(struct seq_file *s, void *v) > >si->ndirty_node, si->node_pages); > > seq_printf(s, " - dents: %4d in dirs:%4d\n", > >si->ndirty_dent, si->ndirty_dirs); > > + seq_printf(s, " - datas: %4d in files:%4d\n", > > + si->ndirty_data, si->ndirty_files); > > seq_printf(s, " - meta: %4d in %4d\n", > >si->ndirty_meta, si->meta_pages); > > seq_printf(s, " - NATs: %9d/%9d\n - SITs: %9d/%9d\n", > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > index c68c4a3..e73ddea 100644 > > --- a/fs/f2fs/f2fs.h > > +++ b/fs/f2fs/f2fs.h > > @@ -818,6 +818,7 @@ struct f2fs_sb_info { > > atomic_t inline_dir;/* # of inline_dentry inodes */ > > int bg_gc; /* background gc calls */ > > unsigned int n_dirty_dirs; /* # of dir inodes */ > > + unsigned int n_dirty_files; /* # of regular/symlink inodes > > */ > > #endif > > unsigned int last_victim[2];/* last victim segment # */ > > spinlock_t stat_lock; /* lock for stat operations */ > > @@ -1887,7 +1888,8 @@ struct f2fs_stat_info { > > unsigned long long hit_largest, hit_cached, hit
Re: [PATCH v2 5/7] f2fs: stat dirty regular/symlink inodes
Hi Chao, We need to change this patch to avoid build warnings. On Wed, Dec 16, 2015 at 01:23:44PM +0800, Chao Yu wrote: > Add to stat dirty regular and symlink inode for showing in debugfs. > > Signed-off-by: Chao Yu > --- > v2: > - rename F2FS_DIRTY_DATAS to F2FS_DIRTY_DATA > --- > fs/f2fs/checkpoint.c | 4 > fs/f2fs/debug.c | 4 > fs/f2fs/f2fs.h | 8 +++- > 3 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index f33c4d7..b2af2c16 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -735,6 +735,8 @@ static void __add_dirty_inode(struct inode *inode, enum > inode_type type) > list_add_tail(&fi->dirty_list, &sbi->inode_list[type]); > if (type == DIR_INODE) > stat_inc_dirty_dir(sbi); > + else > + stat_inc_dirty_file(sbi); If we don't set F2FS_STAT_FS, this causes unreferenced sbi. How about something like this? stat_inc_dirty_inode(F2FS_I_SB(inode), type); #ifdef stat_inc_dirty_inode(sbi, type) (sbi)->ndirty_inode[type]++; stat_dec_dirty_inode(sbi, type) (sbi)->ndirty_inode[type]--; #else stat_inc_dirty_inode stat_dec_dirty_inode #endif > } > > static void __remove_dirty_inode(struct inode *inode, enum inode_type type) > @@ -751,6 +753,8 @@ static void __remove_dirty_inode(struct inode *inode, > enum inode_type type) > clear_inode_flag(fi, flag); > if (type == DIR_INODE) > stat_dec_dirty_dir(sbi); > + else > + stat_dec_dirty_file(sbi); stat_dec_dirty_inode(F2FS_I_SB(inode), type); > } > > void update_dirty_page(struct inode *inode, struct page *page) > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c > index f4a7b9e..780d5ed1 100644 > --- a/fs/f2fs/debug.c > +++ b/fs/f2fs/debug.c > @@ -42,7 +42,9 @@ static void update_general_status(struct f2fs_sb_info *sbi) > si->ext_node = atomic_read(&sbi->total_ext_node); > si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES); > si->ndirty_dent = get_pages(sbi, F2FS_DIRTY_DENTS); > + si->ndirty_data = get_pages(sbi, F2FS_DIRTY_DATA); > si->ndirty_dirs = sbi->n_dirty_dirs; > + si->ndirty_files = sbi->n_dirty_files; ... = sbi->n_dirty_inode[FILE_INODE]; ... = sbi->n_dirty_inode[DIR_INODE]; > 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); > @@ -298,6 +300,8 @@ static int stat_show(struct seq_file *s, void *v) > si->ndirty_node, si->node_pages); > seq_printf(s, " - dents: %4d in dirs:%4d\n", > si->ndirty_dent, si->ndirty_dirs); > + seq_printf(s, " - datas: %4d in files:%4d\n", > +si->ndirty_data, si->ndirty_files); > seq_printf(s, " - meta: %4d in %4d\n", > si->ndirty_meta, si->meta_pages); > seq_printf(s, " - NATs: %9d/%9d\n - SITs: %9d/%9d\n", > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index c68c4a3..e73ddea 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -818,6 +818,7 @@ struct f2fs_sb_info { > atomic_t inline_dir;/* # of inline_dentry inodes */ > int bg_gc; /* background gc calls */ > unsigned int n_dirty_dirs; /* # of dir inodes */ > + unsigned int n_dirty_files; /* # of regular/symlink inodes > */ > #endif > unsigned int last_victim[2];/* last victim segment # */ > spinlock_t stat_lock; /* lock for stat operations */ > @@ -1887,7 +1888,8 @@ struct f2fs_stat_info { > unsigned long long hit_largest, hit_cached, hit_rbtree; > unsigned long long hit_total, total_ext; > int ext_tree, ext_node; > - int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta; > + int ndirty_node, ndirty_meta; > + int ndirty_dent, ndirty_dirs, ndirty_data, ndirty_files; > int nats, dirty_nats, sits, dirty_sits, fnids; > int total_count, utilization; > int bg_gc, inmem_pages, wb_pages; > @@ -1922,6 +1924,8 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct > f2fs_sb_info *sbi) > #define stat_inc_bggc_count(sbi) ((sbi)->bg_gc++) > #define stat_inc_dirty_dir(sbi) ((sbi)->n_dirty_dirs++) > #define stat_dec_dirty_dir(sbi) ((sbi)->n_dirty_dirs--) > +#define stat_inc_dirty_file(sbi) ((sbi)->n_dirty_files++) > +#define stat_dec_dirty_file(sbi) ((sbi)->n_dirty_files--) > #define stat_inc_total_hit(sbi) > (atomic64_inc(&(sbi)->total_hit_ext)) > #define stat_inc_rbtree_node_hit(sbi) > (atomic64_inc(&(sbi)->read_hit_rbtree)) > #define stat_inc_largest_node_hit(sbi) > (atomic64_inc(&(sbi)->read_hit_largest)) > @@ -2004,6 +2008,8 @@ void f2fs_destroy_root_stats(void); > #define stat_
[PATCH v2 5/7] f2fs: stat dirty regular/symlink inodes
Add to stat dirty regular and symlink inode for showing in debugfs. Signed-off-by: Chao Yu --- v2: - rename F2FS_DIRTY_DATAS to F2FS_DIRTY_DATA --- fs/f2fs/checkpoint.c | 4 fs/f2fs/debug.c | 4 fs/f2fs/f2fs.h | 8 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index f33c4d7..b2af2c16 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -735,6 +735,8 @@ static void __add_dirty_inode(struct inode *inode, enum inode_type type) list_add_tail(&fi->dirty_list, &sbi->inode_list[type]); if (type == DIR_INODE) stat_inc_dirty_dir(sbi); + else + stat_inc_dirty_file(sbi); } static void __remove_dirty_inode(struct inode *inode, enum inode_type type) @@ -751,6 +753,8 @@ static void __remove_dirty_inode(struct inode *inode, enum inode_type type) clear_inode_flag(fi, flag); if (type == DIR_INODE) stat_dec_dirty_dir(sbi); + else + stat_dec_dirty_file(sbi); } void update_dirty_page(struct inode *inode, struct page *page) diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index f4a7b9e..780d5ed1 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -42,7 +42,9 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->ext_node = atomic_read(&sbi->total_ext_node); si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES); si->ndirty_dent = get_pages(sbi, F2FS_DIRTY_DENTS); + si->ndirty_data = get_pages(sbi, F2FS_DIRTY_DATA); si->ndirty_dirs = sbi->n_dirty_dirs; + si->ndirty_files = sbi->n_dirty_files; 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); @@ -298,6 +300,8 @@ static int stat_show(struct seq_file *s, void *v) si->ndirty_node, si->node_pages); seq_printf(s, " - dents: %4d in dirs:%4d\n", si->ndirty_dent, si->ndirty_dirs); + seq_printf(s, " - datas: %4d in files:%4d\n", + si->ndirty_data, si->ndirty_files); seq_printf(s, " - meta: %4d in %4d\n", si->ndirty_meta, si->meta_pages); seq_printf(s, " - NATs: %9d/%9d\n - SITs: %9d/%9d\n", diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index c68c4a3..e73ddea 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -818,6 +818,7 @@ struct f2fs_sb_info { atomic_t inline_dir;/* # of inline_dentry inodes */ int bg_gc; /* background gc calls */ unsigned int n_dirty_dirs; /* # of dir inodes */ + unsigned int n_dirty_files; /* # of regular/symlink inodes */ #endif unsigned int last_victim[2];/* last victim segment # */ spinlock_t stat_lock; /* lock for stat operations */ @@ -1887,7 +1888,8 @@ struct f2fs_stat_info { unsigned long long hit_largest, hit_cached, hit_rbtree; unsigned long long hit_total, total_ext; int ext_tree, ext_node; - int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta; + int ndirty_node, ndirty_meta; + int ndirty_dent, ndirty_dirs, ndirty_data, ndirty_files; int nats, dirty_nats, sits, dirty_sits, fnids; int total_count, utilization; int bg_gc, inmem_pages, wb_pages; @@ -1922,6 +1924,8 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) #define stat_inc_bggc_count(sbi) ((sbi)->bg_gc++) #define stat_inc_dirty_dir(sbi)((sbi)->n_dirty_dirs++) #define stat_dec_dirty_dir(sbi)((sbi)->n_dirty_dirs--) +#define stat_inc_dirty_file(sbi) ((sbi)->n_dirty_files++) +#define stat_dec_dirty_file(sbi) ((sbi)->n_dirty_files--) #define stat_inc_total_hit(sbi) (atomic64_inc(&(sbi)->total_hit_ext)) #define stat_inc_rbtree_node_hit(sbi) (atomic64_inc(&(sbi)->read_hit_rbtree)) #define stat_inc_largest_node_hit(sbi) (atomic64_inc(&(sbi)->read_hit_largest)) @@ -2004,6 +2008,8 @@ void f2fs_destroy_root_stats(void); #define stat_inc_bggc_count(si) #define stat_inc_dirty_dir(sbi) #define stat_dec_dirty_dir(sbi) +#define stat_inc_dirty_file(sbi) +#define stat_dec_dirty_file(sbi) #define stat_inc_total_hit(sb) #define stat_inc_rbtree_node_hit(sb) #define stat_inc_largest_node_hit(sbi) -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/