Commit 813e0c46 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Fix "truncate in progress" hang 



Following on from the recent clean up of gfs2_quotad, this patch moves
the processing of "truncate in progress" inodes from the glock workqueue
into gfs2_quotad. This fixes a hang due to the "truncate in progress"
processing requiring glocks in order to complete.

It might seem odd to use gfs2_quotad for this particular item, but
we have to use a pre-existing thread since creating a thread implies
a GFP_KERNEL memory allocation which is not allowed from the glock
workqueue context. Of the existing threads, gfs2_logd and gfs2_recoverd
may deadlock if used for this operation. gfs2_scand and gfs2_glockd are
both scheduled for removal at some (hopefully not too distant) future
point. That leaves only gfs2_quotad whose workload is generally fairly
light and is easily adapted for this extra task.

Also, as a result of this change, it opens the way for a future patch to
make the reading of the inode's information asynchronous with respect to
the glock workqueue, which is another improvement that has been on the list
for some time now.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 37b2c837

fs/gfs2/glock.c

+29 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "quota.h"

#include "super.h"

#include "util.h"

#include "bmap.h"



struct gfs2_gl_hash_bucket {

        struct hlist_head hb_list;
@@ -289,7 +290,8 @@ static void gfs2_holder_wake(struct gfs2_holder *gh) 
 * do_promote - promote as many requests as possible on the current queue

 * @gl: The glock

 * 

 * Returns: true if there is a blocked holder at the head of the list

 * Returns: 1 if there is a blocked holder at the head of the list, or 2

 *          if a type specific operation is underway.

 */



static int do_promote(struct gfs2_glock *gl)
@@ -312,6 +314,8 @@ restart: 
				ret = glops->go_lock(gh);

				spin_lock(&gl->gl_spin);

				if (ret) {

					if (ret == 1)

						return 2;

					gh->gh_error = ret;

					list_del_init(&gh->gh_list);

					gfs2_holder_wake(gh);
@@ -416,6 +420,7 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret) 
	const struct gfs2_glock_operations *glops = gl->gl_ops;

	struct gfs2_holder *gh;

	unsigned state = ret & LM_OUT_ST_MASK;

	int rv;



	spin_lock(&gl->gl_spin);

	state_change(gl, state);
@@ -470,7 +475,6 @@ retry: 
		gfs2_demote_wake(gl);

	if (state != LM_ST_UNLOCKED) {

		if (glops->go_xmote_bh) {

			int rv;

			spin_unlock(&gl->gl_spin);

			rv = glops->go_xmote_bh(gl, gh);

			if (rv == -EAGAIN)
@@ -481,10 +485,13 @@ retry: 
				goto out;

			}

		}

		do_promote(gl);

		rv = do_promote(gl);

		if (rv == 2)

			goto out_locked;

	}

out:

	clear_bit(GLF_LOCK, &gl->gl_flags);

out_locked:

	spin_unlock(&gl->gl_spin);

	gfs2_glock_put(gl);

}
@@ -584,6 +591,7 @@ __releases(&gl->gl_spin) 
__acquires(&gl->gl_spin)

{

	struct gfs2_holder *gh = NULL;

	int ret;



	if (test_and_set_bit(GLF_LOCK, &gl->gl_flags))

		return;
@@ -602,8 +610,11 @@ __acquires(&gl->gl_spin) 
	} else {

		if (test_bit(GLF_DEMOTE, &gl->gl_flags))

			gfs2_demote_wake(gl);

		if (do_promote(gl) == 0)

		ret = do_promote(gl);

		if (ret == 0)

			goto out;

		if (ret == 2)

			return;

		gh = find_first_waiter(gl);

		gl->gl_target = gh->gh_state;

		if (!(gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))
@@ -1556,6 +1567,20 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp) 
	}

}



void gfs2_glock_finish_truncate(struct gfs2_inode *ip)

{

	struct gfs2_glock *gl = ip->i_gl;

	int ret;



	ret = gfs2_truncatei_resume(ip);

	gfs2_assert_withdraw(gl->gl_sbd, ret == 0);



	spin_lock(&gl->gl_spin);

	clear_bit(GLF_LOCK, &gl->gl_flags);

	run_queue(gl, 1);

	spin_unlock(&gl->gl_spin);

}



static const char *state2str(unsigned state)

{

	switch(state) {

fs/gfs2/glock.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ void gfs2_glock_cb(void *cb_data, unsigned int type, void *data); 
void gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl);

void gfs2_reclaim_glock(struct gfs2_sbd *sdp);

void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);

void gfs2_glock_finish_truncate(struct gfs2_inode *ip);



int __init gfs2_glock_init(void);

void gfs2_glock_exit(void);

fs/gfs2/glops.c

+9 −2
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static int inode_go_demote_ok(struct gfs2_glock *gl) 
static int inode_go_lock(struct gfs2_holder *gh)

{

	struct gfs2_glock *gl = gh->gh_gl;

	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct gfs2_inode *ip = gl->gl_object;

	int error = 0;
@@ -241,8 +242,14 @@ static int inode_go_lock(struct gfs2_holder *gh) 


	if ((ip->i_diskflags & GFS2_DIF_TRUNC_IN_PROG) &&

	    (gl->gl_state == LM_ST_EXCLUSIVE) &&

	    (gh->gh_state == LM_ST_EXCLUSIVE))

		error = gfs2_truncatei_resume(ip);

	    (gh->gh_state == LM_ST_EXCLUSIVE)) {

		spin_lock(&sdp->sd_trunc_lock);

		if (list_empty(&ip->i_trunc_list))

			list_add(&sdp->sd_trunc_list, &ip->i_trunc_list);

		spin_unlock(&sdp->sd_trunc_lock);

		wake_up(&sdp->sd_quota_wait);

		return 1;

	}



	return error;

}

fs/gfs2/incore.h

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ struct gfs2_inode { 
	struct gfs2_alloc *i_alloc;

	u64 i_goal;	/* goal block for allocations */

	struct rw_semaphore i_rw_mutex;

	struct list_head i_trunc_list;

	u32 i_entries;

	u32 i_diskflags;

	u8 i_height;
@@ -550,6 +551,8 @@ struct gfs2_sbd { 
	spinlock_t sd_quota_spin;

	struct mutex sd_quota_mutex;

	wait_queue_head_t sd_quota_wait;

	struct list_head sd_trunc_list;

	spinlock_t sd_trunc_lock;



	unsigned int sd_quota_slots;

	unsigned int sd_quota_chunks;

fs/gfs2/main.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ static void gfs2_init_inode_once(void *foo) 


	inode_init_once(&ip->i_inode);

	init_rwsem(&ip->i_rw_mutex);

	INIT_LIST_HEAD(&ip->i_trunc_list);

	ip->i_alloc = NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE