gfs2: new slab for transactions
PATCH v9 1/1 gfs2: new slab for transactions
In reply to a message not in the archiveHi,
This patch is really a separate issue from the rest of the recovery and journal replay issues. So I separated it from the patch set and implemented Andreas's suggestions.
Bob
This patch adds a new slab for gfs2 transactions. That allows us to have an initialization function and protect against some errors.
Signed-off-by Bob Peterson <[email protected]>
--- fs/gfs2/glops.c | 1 + fs/gfs2/log.c | 11 +++++++++-- fs/gfs2/lops.c | 4 ++++ fs/gfs2/main.c | 22 ++++++++++++++++++++++ fs/gfs2/trans.c | 26 ++++++++++++++++++++------ fs/gfs2/trans.h | 1 + fs/gfs2/util.c | 1 + fs/gfs2/util.h | 1 + 8 files changed, 59 insertions(+), 8 deletions(-)
fs/gfs2/glops.c +1 -0
@@ -87,6 +87,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)memset (&tr,0 ,sizeof (tr));INIT_LIST_HEAD (&tr.tr_buf);INIT_LIST_HEAD (&tr.tr_databuf); +set_bit (TR_ATTACHED , &tr.tr_flags);/* prevent gfs2_trans_end free */ tr.tr_revokes =atomic_read (&gl->gl_ail_count);if (!tr.tr_revokes)
fs/gfs2/log.c +9 -2
@@ -30,6 +30,7 @@#include "util.h" #include "dir.h" #include "trace_gfs2.h" +#include "trans.h" static void gfs2_log_shutdown (struct gfs2_sbd *sdp);
@@ -307,7 +308,7 @@ static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)list_del (&tr->tr_list);gfs2_assert_warn (sdp,list_empty (&tr->tr_ail1_list));gfs2_assert_warn (sdp,list_empty (&tr->tr_ail2_list)); -kfree (tr); +gfs2_trans_free (sdp, tr); }spin_unlock (&sdp->sd_ail_lock);
@@ -877,7 +878,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)trace_gfs2_log_flush (sdp,0 , flags);up_write (&sdp->sd_log_flush_lock); -kfree (tr); +gfs2_trans_free (sdp, tr); }/**
@@ -897,6 +898,12 @@ static void gfs2_merge_trans(struct gfs2_trans *old, struct gfs2_trans *new) old->tr_num_revoke += new->tr_num_revoke; old->tr_num_revoke_rm += new->tr_num_revoke_rm; + new->tr_num_buf_new =0 ; + new->tr_num_buf_rm =0 ; + new->tr_num_databuf_new =0 ; + new->tr_num_databuf_rm =0 ; + new->tr_num_revoke =0 ; +list_splice_tail_init (&new->tr_databuf, &old->tr_databuf);list_splice_tail_init (&new->tr_buf, &old->tr_buf); }
fs/gfs2/lops.c +4 -0
@@ -734,6 +734,8 @@ static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)list_del_init (&bd->bd_list);gfs2_unpin (sdp, bd->bd_bh, tr); } + tr->tr_num_buf_new =0 ; + tr->tr_num_buf_rm =0 ; } static void buf_lo_before_scan(struct gfs2_jdesc *jd,
@@ -1083,6 +1085,8 @@ static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)list_del_init (&bd->bd_list);gfs2_unpin (sdp, bd->bd_bh, tr); } + tr->tr_num_databuf_new =0 ; + tr->tr_num_databuf_rm =0 ; }
fs/gfs2/main.c +22 -0
@@ -68,6 +68,19 @@ static void gfs2_init_gl_aspace_once(void *foo)address_space_init_once (mapping); } +static void gfs2_init_tr_once (void *foo) +{ +struct gfs2_trans *tr = foo; + +memset (tr,0 ,sizeof (struct gfs2_trans )); +INIT_LIST_HEAD (&tr->tr_databuf); +INIT_LIST_HEAD (&tr->tr_buf); +INIT_LIST_HEAD (&tr->tr_ail1_list); +INIT_LIST_HEAD (&tr->tr_ail2_list); +INIT_LIST_HEAD (&tr->tr_list); + tr->tr_ip =0 ; +} +/** * init_gfs2_fs - Register GFS2 as a filesystem *
@@ -143,6 +156,12 @@ static int __init init_gfs2_fs(void)if (!gfs2_qadata_cachep) goto fail_cachep7; + gfs2_trans_cachep =kmem_cache_create ("gfs2_trans" , +sizeof (struct gfs2_trans ), +0 ,0 , gfs2_init_tr_once); +if (!gfs2_trans_cachep) + goto fail_cachep8; + error =register_shrinker (&gfs2_qd_shrinker);if (error) goto fail_shrinker;
@@ -194,6 +213,8 @@ static int __init init_gfs2_fs(void) fail_fs1:unregister_shrinker (&gfs2_qd_shrinker); fail_shrinker: +kmem_cache_destroy (gfs2_trans_cachep); +fail_cachep8:kmem_cache_destroy (gfs2_qadata_cachep); fail_cachep7:kmem_cache_destroy (gfs2_quotad_cachep);
@@ -236,6 +257,7 @@ static void __exit exit_gfs2_fs(void)rcu_barrier ();mempool_destroy (gfs2_page_pool); +kmem_cache_destroy (gfs2_trans_cachep);kmem_cache_destroy (gfs2_qadata_cachep);kmem_cache_destroy (gfs2_quotad_cachep);kmem_cache_destroy (gfs2_rgrpd_cachep);
fs/gfs2/trans.c +20 -6
@@ -37,7 +37,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,if (!test_bit (SDF_JOURNAL_LIVE , &sdp->sd_flags))return -EROFS ; - tr =kzalloc (sizeof (struct gfs2_trans ),GFP_NOFS ); + tr =kmem_cache_alloc (gfs2_trans_cachep,GFP_NOFS );if (!tr)return -ENOMEM ;
@@ -45,13 +45,16 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, tr->tr_blocks = blocks; tr->tr_revokes = revokes; tr->tr_reserved =1 ; + tr->tr_num_revoke =0 ; + +clear_bit (TR_TOUCHED , &tr->tr_flags); +clear_bit (TR_ATTACHED , &tr->tr_flags); +set_bit (TR_ALLOCED , &tr->tr_flags);if (blocks) tr->tr_reserved +=6 + blocks;if (revokes) tr->tr_reserved +=gfs2_struct2blk (sdp, revokes); -INIT_LIST_HEAD (&tr->tr_databuf); -INIT_LIST_HEAD (&tr->tr_buf);sb_start_intwrite (sdp->sd_vfs);
@@ -65,7 +68,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, fail:sb_end_intwrite (sdp->sd_vfs); -kfree (tr); +kmem_cache_free (gfs2_trans_cachep, tr);return error; }
@@ -93,7 +96,7 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)if (!test_bit (TR_TOUCHED , &tr->tr_flags)) {gfs2_log_release (sdp, tr->tr_reserved);if (alloced) { -kfree (tr); +gfs2_trans_free (sdp, tr);sb_end_intwrite (sdp->sd_vfs); }return ;
@@ -109,7 +112,7 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)gfs2_log_commit (sdp, tr);if (alloced && !test_bit (TR_ATTACHED , &tr->tr_flags)) -kfree (tr); +gfs2_trans_free (sdp, tr);up_read (&sdp->sd_log_flush_lock);if (sdp->sd_vfs->s_flags &SB_SYNCHRONOUS )
@@ -272,3 +275,14 @@ void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)gfs2_log_unlock (sdp); } +void gfs2_trans_free (struct gfs2_sbd *sdp,struct gfs2_trans *tr) +{ +if (tr ==NULL ) +return ; + +gfs2_assert_warn (sdp,list_empty (&tr->tr_ail1_list)); +gfs2_assert_warn (sdp,list_empty (&tr->tr_ail2_list)); +gfs2_assert_warn (sdp,list_empty (&tr->tr_databuf)); +gfs2_assert_warn (sdp,list_empty (&tr->tr_buf)); +kmem_cache_free (gfs2_trans_cachep, tr); +}
fs/gfs2/trans.h +1 -0
@@ -42,5 +42,6 @@ extern void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh);extern void gfs2_trans_add_meta (struct gfs2_glock *gl,struct buffer_head *bh);extern void gfs2_trans_add_revoke (struct gfs2_sbd *sdp,struct gfs2_bufdata *bd);extern void gfs2_trans_remove_revoke (struct gfs2_sbd *sdp,u64 blkno,unsigned int len); +extern void gfs2_trans_free (struct gfs2_sbd *sdp,struct gfs2_trans *tr);#endif /* __TRANS_DOT_H__ */
fs/gfs2/util.c +1 -0
@@ -26,6 +26,7 @@ struct kmem_cache *gfs2_bufdata_cachep __read_mostly;struct kmem_cache *gfs2_rgrpd_cachep__read_mostly ;struct kmem_cache *gfs2_quotad_cachep__read_mostly ;struct kmem_cache *gfs2_qadata_cachep__read_mostly ; +struct kmem_cache *gfs2_trans_cachep__read_mostly ;mempool_t *gfs2_page_pool__read_mostly ;void gfs2_assert_i (struct gfs2_sbd *sdp)
fs/gfs2/util.h +1 -0
@@ -151,6 +151,7 @@ extern struct kmem_cache *gfs2_bufdata_cachep;extern struct kmem_cache *gfs2_rgrpd_cachep;extern struct kmem_cache *gfs2_quotad_cachep;extern struct kmem_cache *gfs2_qadata_cachep; +extern struct kmem_cache *gfs2_trans_cachep;extern mempool_t *gfs2_page_pool;extern struct workqueue_struct *gfs2_control_wq;