GFS2: Pre-pull patch posting (fixes)
Hi,
Here are a couple of patches which between them fix a problem where occasionally it was possible for the GFS2 module to be unloaded before all the glocks were deallocated, which, needless to say, made the slab allocator unhappy,
Steve.
PATCH 1/2 GFS2: Wait for unlock completion on umount
This patch adds a wait on umount between the point at which we dispose of all glocks and the point at which we unmount the lock protocol. This ensures that we've received all the replies to our unlock requests before we stop the locking.
--- fs/gfs2/incore.h | 2 ++ fs/gfs2/lock_dlm.c | 7 ++++++- fs/gfs2/ops_fstype.c | 2 ++ fs/gfs2/super.c | 3 +++ 4 files changed, 13 insertions(+), 1 deletions(-)
fs/gfs2/incore.h +2 -0
@@ -544,6 +544,8 @@ struct gfs2_sbd {struct gfs2_holder sd_live_gh;struct gfs2_glock *sd_rename_gl;struct gfs2_glock *sd_trans_gl; +wait_queue_head_t sd_glock_wait; +atomic_t sd_glock_disposal;/* Inode Stuff */
fs/gfs2/lock_dlm.c +6 -1
@@ -21,6 +21,7 @@ static void gdlm_ast(void *arg) {struct gfs2_glock *gl = arg;unsigned ret = gl->gl_state; +struct gfs2_sbd *sdp = gl->gl_sbd;BUG_ON (gl->gl_lksb.sb_flags &DLM_SBF_DEMOTED );
@@ -30,6 +31,8 @@ static void gdlm_ast(void *arg)switch (gl->gl_lksb.sb_status) {case -DLM_EUNLOCK :/* Unlocked, so glock can be freed */ kmem_cache_free (gfs2_glock_cachep, gl); +if (atomic_dec_and_test (&sdp->sd_glock_disposal)) +wake_up (&sdp->sd_glock_wait);return ;case -DLM_ECANCEL :/* Cancel while getting lock */ ret |=LM_OUT_CANCELED ;
@@ -167,7 +170,8 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl,static void gdlm_put_lock (struct kmem_cache *cachep,void *ptr) {struct gfs2_glock *gl = ptr; -struct lm_lockstruct *ls = &gl->gl_sbd->sd_lockstruct; +struct gfs2_sbd *sdp = gl->gl_sbd; +struct lm_lockstruct *ls = &sdp->sd_lockstruct;int error;if (gl->gl_lksb.sb_lkid ==0 ) {
@@ -183,6 +187,7 @@ static void gdlm_put_lock(struct kmem_cache *cachep, void *ptr) (unsigned long long)gl->gl_name.ln_number, error);return ; } +atomic_inc (&sdp->sd_glock_disposal); }static void gdlm_cancel (struct gfs2_glock *gl)
fs/gfs2/ops_fstype.c +2 -0
@@ -82,6 +82,8 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)gfs2_tune_init (&sdp->sd_tune); +init_waitqueue_head (&sdp->sd_glock_wait); +atomic_set (&sdp->sd_glock_disposal,0 );spin_lock_init (&sdp->sd_statfs_spin);spin_lock_init (&sdp->sd_rindex_spin);
fs/gfs2/super.c +3 -0
@@ -21,6 +21,7 @@#include <linux/gfs2_ondisk.h> #include <linux/crc32.h> #include <linux/time.h> +#include <linux/wait.h> #include "gfs2.h" #include "incore.h"
@@ -860,6 +861,8 @@ restart:gfs2_jindex_free (sdp);/* Take apart glock structures and buffer lists */ gfs2_gl_hash_clear (sdp); +/* Wait for dlm to reply to all our unlock requests */ +wait_event (sdp->sd_glock_wait,atomic_read (&sdp->sd_glock_disposal) ==0 );/* Unmount the locking protocol */ gfs2_lm_unmount (sdp);
Signature · 1 line
1.6.2.5
PATCH 2/2 GFS2: Extend umount wait coverage to full glock lifetime
Although all glocks are, by the time of the umount glock wait, scheduled for demotion, some of them haven't made it far enough through the process for the original set of waiting code to wait for them.
This extends the ref count to the whole glock lifetime in order to ensure that the waiting does catch all glocks. It does make it a bit more invasive, but it seems the only sensible solution at the moment.
--- fs/gfs2/glock.c | 4 ++++ fs/gfs2/glock.h | 2 +- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/ops_fstype.c | 10 +++++++++- fs/gfs2/super.c | 2 -- 5 files changed, 17 insertions(+), 7 deletions(-)
fs/gfs2/glock.c +4 -0
@@ -769,6 +769,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,if (!gl)return -ENOMEM ; +atomic_inc (&sdp->sd_glock_disposal); gl->gl_flags =0 ; gl->gl_name = name;atomic_set (&gl->gl_ref,1 );
@@ -1538,6 +1539,9 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp)up_write (&gfs2_umount_flush_sem);msleep (10 ); } +flush_workqueue (glock_workqueue); +wait_event (sdp->sd_glock_wait,atomic_read (&sdp->sd_glock_disposal) ==0 ); +gfs2_dump_lockstate (sdp); }void gfs2_glock_finish_truncate (struct gfs2_inode *ip)
fs/gfs2/glock.h +1 -1
@@ -123,7 +123,7 @@ struct lm_lockops {int (*lm_mount) (struct gfs2_sbd *sdp,const char *fsname);void (*lm_unmount) (struct gfs2_sbd *sdp);void (*lm_withdraw) (struct gfs2_sbd *sdp); -void (*lm_put_lock) (struct kmem_cache *cachep,void *gl); +void (*lm_put_lock) (struct kmem_cache *cachep,struct gfs2_glock *gl);unsigned int (*lm_lock) (struct gfs2_glock *gl,unsigned int req_state,unsigned int flags);void (*lm_cancel) (struct gfs2_glock *gl);
fs/gfs2/lock_dlm.c +3 -3
@@ -167,15 +167,16 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl,return LM_OUT_ASYNC ; } -static void gdlm_put_lock (struct kmem_cache *cachep,void *ptr) +static void gdlm_put_lock (struct kmem_cache *cachep,struct gfs2_glock *gl) { -struct gfs2_glock *gl = ptr;struct gfs2_sbd *sdp = gl->gl_sbd;struct lm_lockstruct *ls = &sdp->sd_lockstruct;int error;if (gl->gl_lksb.sb_lkid ==0 ) {kmem_cache_free (cachep, gl); +if (atomic_dec_and_test (&sdp->sd_glock_disposal)) +wake_up (&sdp->sd_glock_wait);return ; }
@@ -187,7 +188,6 @@ static void gdlm_put_lock(struct kmem_cache *cachep, void *ptr) (unsigned long long)gl->gl_name.ln_number, error);return ; } -atomic_inc (&sdp->sd_glock_disposal); }static void gdlm_cancel (struct gfs2_glock *gl)
fs/gfs2/ops_fstype.c +9 -1
@@ -985,9 +985,17 @@ static const match_table_t nolock_tokens = { { Opt_err, NULL }, }; +static void nolock_put_lock (struct kmem_cache *cachep,struct gfs2_glock *gl) +{ +struct gfs2_sbd *sdp = gl->gl_sbd; +kmem_cache_free (cachep, gl); +if (atomic_dec_and_test (&sdp->sd_glock_disposal)) +wake_up (&sdp->sd_glock_wait); +} +static const struct lm_lockops nolock_ops = { .lm_proto_name ="lock_nolock" , - .lm_put_lock = kmem_cache_free, + .lm_put_lock = nolock_put_lock, .lm_tokens = &nolock_tokens, };
fs/gfs2/super.c +0 -2
@@ -861,8 +861,6 @@ restart:gfs2_jindex_free (sdp);/* Take apart glock structures and buffer lists */ gfs2_gl_hash_clear (sdp); -/* Wait for dlm to reply to all our unlock requests */ -wait_event (sdp->sd_glock_wait,atomic_read (&sdp->sd_glock_disposal) ==0 );/* Unmount the locking protocol */ gfs2_lm_unmount (sdp);
Signature · 1 line
1.6.2.5