gfs2: new slab for transactions
PATCH v2 1/1 gfs2: new slab for transactions
In reply to a message not in the archiveHi,
I've posted similar patches for this in the past, but they all had shortcomings. This is my latest version. There is a follow-on patch which I will post shortly. In the future, I want to add a new slab initialization function, but for now this is enough.
Note that the use-after-free warnings in gfs2_trans_free() require that we now properly initialize the transaction ail lists.
Bob Peterson
...
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 | 2 ++ fs/gfs2/log.c | 9 +++++---- fs/gfs2/main.c | 9 +++++++++ fs/gfs2/trans.c | 22 ++++++++++++++++++---- fs/gfs2/trans.h | 1 + fs/gfs2/util.c | 1 + fs/gfs2/util.h | 1 + 7 files changed, 37 insertions(+), 8 deletions(-)
fs/gfs2/glops.c +2 -0
@@ -91,6 +91,8 @@ static int 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); +INIT_LIST_HEAD (&tr.tr_ail1_list); +INIT_LIST_HEAD (&tr.tr_ail2_list); tr.tr_revokes =atomic_read (&gl->gl_ail_count);if (!tr.tr_revokes) {
fs/gfs2/log.c +5 -4
@@ -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);
@@ -379,7 +380,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);
@@ -868,14 +869,14 @@ static void ail_drain(struct gfs2_sbd *sdp)gfs2_ail_empty_tr (sdp, tr, &tr->tr_ail1_list);gfs2_ail_empty_tr (sdp, tr, &tr->tr_ail2_list);list_del (&tr->tr_list); -kfree (tr); +gfs2_trans_free (sdp, tr); }while (!list_empty (&sdp->sd_ail2_list)) { tr = list_first_entry(&sdp->sd_ail2_list, struct gfs2_trans, tr_list);gfs2_ail_empty_tr (sdp, tr, &tr->tr_ail2_list);list_del (&tr->tr_list); -kfree (tr); +gfs2_trans_free (sdp, tr); }spin_unlock (&sdp->sd_ail_lock); }
@@ -1007,7 +1008,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); }/**
fs/gfs2/main.c +9 -0
@@ -143,6 +143,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 ,NULL ); +if (!gfs2_trans_cachep) + goto fail_cachep8; + error =register_shrinker (&gfs2_qd_shrinker);if (error) goto fail_shrinker;
@@ -194,6 +200,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 +244,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 +18 -4
@@ -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_zalloc (gfs2_trans_cachep,GFP_NOFS );if (!tr)return -ENOMEM ;
@@ -53,6 +53,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,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); +sb_start_intwrite (sdp->sd_vfs); error =gfs2_log_reserve (sdp, tr->tr_reserved);
@@ -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 )
@@ -278,3 +281,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
@@ -32,6 +32,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
@@ -172,6 +172,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;