[Cluster-devel] [GFS2 PATCH 0/3] GFS2: Reduce contention on gfs2_log_lock

[Cluster-devel] [GFS2 PATCH 0/3] GFS2: Reduce contention on gfs2_log_lock

[Bob Peterson]

Simultaneous writes from a single node were very slow due to
contention for the gfs2_log_lock. This lock is used to protect the
journaled data and metadata buffer lists, and the list headers in the
superblock that hold pointers to them. The log_lock is used whenever
a metadata block is added to a transaction (which happens a lot).
The problem is, the vast majority of times this call is made (e.g.
to function gfs2_trans_add_meta) the metadata buffer is already in
the log (in the superblock's list), and therefore, the locking is not
needed, and causes unnecessary contention. Since it's a spin_lock,
this consumes lots of CPU time. The more simultaneous writers, the
more CPUs are contending for the spin_lock. In other words, they
wait for permission to add a buffer to the journal, when in fact,
most of the time, the buffer is already there.

This is a series of patches designed to reduce contention on the
gfs2_log_lock. It works by not locking the log lock unless it
determines the metadata block is not already in the transaction.
It can safely do that by checking the value in the bd while the
buffer_head is locked.

IMPORTANT: This patch hinges on a lock inversion: I switched the
order of the gfs2_log_lock and the ail lock throughout gfs2.
Without doing that, you can't provide adequate protection of the
lists in the superblock without holding the gfs2_log_lock for long
periods of time. There were other places where the log_lock was
locked unnecessarily, and I've tried to eliminate them.

Also note that this patch tries to separate the log_lock, which
protects the sd_log_le_buf (and similar) and its constituent
bd_list members, and the sd_ail_lock which protects the active
items lists.

Also, prior to this patch, the allocation of new gfs2_bufdata items
was protected by the gfs2_log_lock. Now it's entirely protected by
lock_buffer in a new function, lock_bh_get_bd.

I consider these experimental patches for now; so not the final
solution. Testing is still ongoing, but positive. I'm just looking
for feedback at this point.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
Bob Peterson (3):
  GFS2: Switch tr_touched to flag in transaction
  GFS2: Inline function meta_lo_add
  GFS2: Reduce contention on gfs2_log_lock

 fs/gfs2/aops.c    |  23 ++++--------
 fs/gfs2/glops.c   |   4 +--
 fs/gfs2/incore.h  |  10 ++++--
 fs/gfs2/log.c     |  12 +++----
 fs/gfs2/lops.c    |   3 +-
 fs/gfs2/meta_io.c |  17 +++++----
 fs/gfs2/trans.c   | 103 ++++++++++++++++++++++++------------------------------
 7 files changed, 80 insertions(+), 92 deletions(-)

-- 
2.9.3

[Cluster-devel] [GFS2 PATCH 1/3] GFS2: Switch tr_touched to flag in transaction

[Bob Peterson]

This patch eliminates the int variable tr_touched in favor of a
new flag in the transaction. This is a step toward reducing contention
on the gfs2_log_lock spin_lock.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
 fs/gfs2/incore.h  | 10 +++++++---
 fs/gfs2/log.c     |  6 +++---
 fs/gfs2/meta_io.c |  6 +++---
 fs/gfs2/trans.c   | 19 ++++++++++---------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 00d8dc2..c45084a 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -470,15 +470,19 @@ struct gfs2_quota_data {
 	struct rcu_head qd_rcu;
 };
 
+enum {
+	TR_TOUCHED = 1,
+	TR_ATTACHED = 2,
+	TR_ALLOCED = 3,
+};
+
 struct gfs2_trans {
 	unsigned long tr_ip;
 
 	unsigned int tr_blocks;
 	unsigned int tr_revokes;
 	unsigned int tr_reserved;
-	unsigned int tr_touched:1;
-	unsigned int tr_attached:1;
-	unsigned int tr_alloced:1;
+	unsigned long tr_flags;
 
 	unsigned int tr_num_buf_new;
 	unsigned int tr_num_databuf_new;
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 5028a9d..4fb76c0 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -799,7 +799,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
 
 static void gfs2_merge_trans(struct gfs2_trans *old, struct gfs2_trans *new)
 {
-	WARN_ON_ONCE(old->tr_attached != 1);
+	WARN_ON_ONCE(!test_bit(TR_ATTACHED, &old->tr_flags));
 
 	old->tr_num_buf_new	+= new->tr_num_buf_new;
 	old->tr_num_databuf_new	+= new->tr_num_databuf_new;
@@ -823,9 +823,9 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
 	if (sdp->sd_log_tr) {
 		gfs2_merge_trans(sdp->sd_log_tr, tr);
 	} else if (tr->tr_num_buf_new || tr->tr_num_databuf_new) {
-		gfs2_assert_withdraw(sdp, tr->tr_alloced);
+		gfs2_assert_withdraw(sdp, test_bit(TR_ALLOCED, &tr->tr_flags));
 		sdp->sd_log_tr = tr;
-		tr->tr_attached = 1;
+		set_bit(TR_ATTACHED, &tr->tr_flags);
 	}
 
 	sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm;
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 373639a5..a88a347 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -293,7 +293,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
 	wait_on_buffer(bh);
 	if (unlikely(!buffer_uptodate(bh))) {
 		struct gfs2_trans *tr = current->journal_info;
-		if (tr && tr->tr_touched)
+		if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
 			gfs2_io_error_bh(sdp, bh);
 		brelse(bh);
 		*bhp = NULL;
@@ -320,7 +320,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
 
 	if (!buffer_uptodate(bh)) {
 		struct gfs2_trans *tr = current->journal_info;
-		if (tr && tr->tr_touched)
+		if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
 			gfs2_io_error_bh(sdp, bh);
 		return -EIO;
 	}
@@ -346,7 +346,7 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
 			tr->tr_num_buf_rm++;
 		else
 			tr->tr_num_databuf_rm++;
-		tr->tr_touched = 1;
+		set_bit(TR_TOUCHED, &tr->tr_flags);
 		was_pinned = 1;
 		brelse(bh);
 	}
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 0c1bde3..5d7f5b0 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -48,7 +48,7 @@ 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_alloced = 1;
+	set_bit(TR_ALLOCED, &tr->tr_flags);
 	if (blocks)
 		tr->tr_reserved += 6 + blocks;
 	if (revokes)
@@ -78,7 +78,8 @@ static void gfs2_print_trans(const struct gfs2_trans *tr)
 {
 	pr_warn("Transaction created at: %pSR\n", (void *)tr->tr_ip);
 	pr_warn("blocks=%u revokes=%u reserved=%u touched=%u\n",
-		tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
+		tr->tr_blocks, tr->tr_revokes, tr->tr_reserved,
+		test_bit(TR_TOUCHED, &tr->tr_flags));
 	pr_warn("Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
 		tr->tr_num_buf_new, tr->tr_num_buf_rm,
 		tr->tr_num_databuf_new, tr->tr_num_databuf_rm,
@@ -89,12 +90,12 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
 {
 	struct gfs2_trans *tr = current->journal_info;
 	s64 nbuf;
-	int alloced = tr->tr_alloced;
+	int alloced = test_bit(TR_ALLOCED, &tr->tr_flags);
 
 	BUG_ON(!tr);
 	current->journal_info = NULL;
 
-	if (!tr->tr_touched) {
+	if (!test_bit(TR_TOUCHED, &tr->tr_flags)) {
 		gfs2_log_release(sdp, tr->tr_reserved);
 		if (alloced) {
 			kfree(tr);
@@ -112,8 +113,8 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
 		gfs2_print_trans(tr);
 
 	gfs2_log_commit(sdp, tr);
-	if (alloced && !tr->tr_attached)
-			kfree(tr);
+	if (alloced && !test_bit(TR_ATTACHED, &tr->tr_flags))
+		kfree(tr);
 	up_read(&sdp->sd_log_flush_lock);
 
 	if (sdp->sd_vfs->s_flags & MS_SYNCHRONOUS)
@@ -182,7 +183,7 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
 		gfs2_log_lock(sdp);
 	}
 	gfs2_assert(sdp, bd->bd_gl == gl);
-	tr->tr_touched = 1;
+	set_bit(TR_TOUCHED, &tr->tr_flags);
 	if (list_empty(&bd->bd_list)) {
 		set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
 		set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
@@ -201,7 +202,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
 	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
 
 	tr = current->journal_info;
-	tr->tr_touched = 1;
+	set_bit(TR_TOUCHED, &tr->tr_flags);
 	if (!list_empty(&bd->bd_list))
 		return;
 	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
@@ -256,7 +257,7 @@ void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
 
 	BUG_ON(!list_empty(&bd->bd_list));
 	gfs2_add_revoke(sdp, bd);
-	tr->tr_touched = 1;
+	set_bit(TR_TOUCHED, &tr->tr_flags);
 	tr->tr_num_revoke++;
 }
 
-- 
2.9.3

[Cluster-devel] [GFS2 PATCH 2/3] GFS2: Inline function meta_lo_add

[Bob Peterson]

This patch simply combines function meta_lo_add with its only
caller, trans_add_meta. This makes the code easier to read and
will make it easier to reduce contention on gfs2_log_lock.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
 fs/gfs2/trans.c | 49 ++++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 5d7f5b0..483c5a7 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -195,16 +195,35 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
 	unlock_buffer(bh);
 }
 
-static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
+void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
 {
+
+	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
+	struct gfs2_bufdata *bd;
 	struct gfs2_meta_header *mh;
 	struct gfs2_trans *tr;
 	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
 
+	lock_buffer(bh);
+	gfs2_log_lock(sdp);
+	bd = bh->b_private;
+	if (bd == NULL) {
+		gfs2_log_unlock(sdp);
+		unlock_buffer(bh);
+		lock_page(bh->b_page);
+		if (bh->b_private == NULL)
+			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
+		else
+			bd = bh->b_private;
+		unlock_page(bh->b_page);
+		lock_buffer(bh);
+		gfs2_log_lock(sdp);
+	}
+	gfs2_assert(sdp, bd->bd_gl == gl);
 	tr = current->journal_info;
 	set_bit(TR_TOUCHED, &tr->tr_flags);
 	if (!list_empty(&bd->bd_list))
-		return;
+		goto out_unlock;
 	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
 	set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
 	mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
@@ -222,31 +241,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
 	mh->mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
 	list_add(&bd->bd_list, &tr->tr_buf);
 	tr->tr_num_buf_new++;
-}
-
-void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
-{
-
-	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
-	struct gfs2_bufdata *bd;
-
-	lock_buffer(bh);
-	gfs2_log_lock(sdp);
-	bd = bh->b_private;
-	if (bd == NULL) {
-		gfs2_log_unlock(sdp);
-		unlock_buffer(bh);
-		lock_page(bh->b_page);
-		if (bh->b_private == NULL)
-			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
-		else
-			bd = bh->b_private;
-		unlock_page(bh->b_page);
-		lock_buffer(bh);
-		gfs2_log_lock(sdp);
-	}
-	gfs2_assert(sdp, bd->bd_gl == gl);
-	meta_lo_add(sdp, bd);
+out_unlock:
 	gfs2_log_unlock(sdp);
 	unlock_buffer(bh);
 }
-- 
2.9.3

[Cluster-devel] [GFS2 PATCH 3/3] GFS2: Reduce contention on gfs2_log_lock

[Bob Peterson]

This patch reworks some of the log locks to provide less contention.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
 fs/gfs2/aops.c    | 23 ++++++-------------
 fs/gfs2/glops.c   |  4 ++--
 fs/gfs2/log.c     |  6 ++---
 fs/gfs2/lops.c    |  3 ++-
 fs/gfs2/meta_io.c | 11 +++++----
 fs/gfs2/trans.c   | 67 +++++++++++++++++++++++++------------------------------
 6 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 5a6f52e..d3cd30d 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -986,23 +986,13 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock)
 
 static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
 {
-	struct gfs2_bufdata *bd;
-
 	lock_buffer(bh);
-	gfs2_log_lock(sdp);
 	clear_buffer_dirty(bh);
-	bd = bh->b_private;
-	if (bd) {
-		if (!list_empty(&bd->bd_list) && !buffer_pinned(bh))
-			list_del_init(&bd->bd_list);
-		else
-			gfs2_remove_from_journal(bh, REMOVE_JDATA);
-	}
+	gfs2_remove_from_journal(bh, REMOVE_JDATA);
 	bh->b_bdev = NULL;
 	clear_buffer_mapped(bh);
 	clear_buffer_req(bh);
 	clear_buffer_new(bh);
-	gfs2_log_unlock(sdp);
 	unlock_buffer(bh);
 }
 
@@ -1157,7 +1147,6 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
 	 * on dirty buffers like we used to here again.
 	 */
 
-	gfs2_log_lock(sdp);
 	spin_lock(&sdp->sd_ail_lock);
 	head = bh = page_buffers(page);
 	do {
@@ -1174,25 +1163,27 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
 
 	head = bh = page_buffers(page);
 	do {
+		lock_buffer(bh);
 		bd = bh->b_private;
 		if (bd) {
 			gfs2_assert_warn(sdp, bd->bd_bh == bh);
+			gfs2_log_lock(sdp);
 			if (!list_empty(&bd->bd_list))
 				list_del_init(&bd->bd_list);
+			gfs2_log_unlock(sdp);
 			bd->bd_bh = NULL;
 			bh->b_private = NULL;
-			kmem_cache_free(gfs2_bufdata_cachep, bd);
 		}
-
+		unlock_buffer(bh);
+		if (bd)
+			kmem_cache_free(gfs2_bufdata_cachep, bd);
 		bh = bh->b_this_page;
 	} while (bh != head);
-	gfs2_log_unlock(sdp);
 
 	return try_to_free_buffers(page);
 
 cannot_release:
 	spin_unlock(&sdp->sd_ail_lock);
-	gfs2_log_unlock(sdp);
 	return 0;
 }
 
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 5db59d4..fced99b 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -61,7 +61,6 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
 	struct buffer_head *bh;
 	const unsigned long b_state = (1UL << BH_Dirty)|(1UL << BH_Pinned)|(1UL << BH_Lock);
 
-	gfs2_log_lock(sdp);
 	spin_lock(&sdp->sd_ail_lock);
 	list_for_each_entry_safe_reverse(bd, tmp, head, bd_ail_gl_list) {
 		if (nr_revokes == 0)
@@ -72,12 +71,13 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
 				continue;
 			gfs2_ail_error(gl, bh);
 		}
+		gfs2_log_lock(sdp);
 		gfs2_trans_add_revoke(sdp, bd);
+		gfs2_log_unlock(sdp);
 		nr_revokes--;
 	}
 	GLOCK_BUG_ON(gl, !fsync && atomic_read(&gl->gl_ail_count));
 	spin_unlock(&sdp->sd_ail_lock);
-	gfs2_log_unlock(sdp);
 }
 
 
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 4fb76c0..4d5f3a1 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -624,8 +624,8 @@ done:
 		if (!sdp->sd_log_blks_reserved)
 			atomic_dec(&sdp->sd_log_blks_free);
 	}
-	gfs2_log_lock(sdp);
 	spin_lock(&sdp->sd_ail_lock);
+	gfs2_log_lock(sdp);
 	list_for_each_entry(tr, &sdp->sd_ail1_list, tr_list) {
 		list_for_each_entry_safe(bd, tmp, &tr->tr_ail2_list, bd_ail_st_list) {
 			if (max_revokes == 0)
@@ -637,8 +637,8 @@ done:
 		}
 	}
 out_of_blocks:
-	spin_unlock(&sdp->sd_ail_lock);
 	gfs2_log_unlock(sdp);
+	spin_unlock(&sdp->sd_ail_lock);
 
 	if (!sdp->sd_log_num_revoke) {
 		atomic_inc(&sdp->sd_log_blks_free);
@@ -756,6 +756,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
 	sdp->sd_log_head = sdp->sd_log_flush_head;
 	sdp->sd_log_blks_reserved = 0;
 	sdp->sd_log_commited_revoke = 0;
+	gfs2_log_unlock(sdp);
 
 	spin_lock(&sdp->sd_ail_lock);
 	if (tr && !list_empty(&tr->tr_ail1_list)) {
@@ -763,7 +764,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
 		tr = NULL;
 	}
 	spin_unlock(&sdp->sd_ail_lock);
-	gfs2_log_unlock(sdp);
 
 	if (type != NORMAL_FLUSH) {
 		if (!sdp->sd_log_idle) {
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 49d5a1b..d6a3bdb 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -98,12 +98,13 @@ static void maybe_release_space(struct gfs2_bufdata *bd)
 static void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
 		       struct gfs2_trans *tr)
 {
-	struct gfs2_bufdata *bd = bh->b_private;
+	struct gfs2_bufdata *bd;
 
 	BUG_ON(!buffer_uptodate(bh));
 	BUG_ON(!buffer_pinned(bh));
 
 	lock_buffer(bh);
+	bd = bh->b_private;
 	mark_buffer_dirty(bh);
 	clear_buffer_pinned(bh);
 
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index a88a347..d870b15 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -341,18 +341,24 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
 	if (test_clear_buffer_pinned(bh)) {
 		trace_gfs2_pin(bd, 0);
 		atomic_dec(&sdp->sd_log_pinned);
+		gfs2_log_lock(sdp);
 		list_del_init(&bd->bd_list);
 		if (meta == REMOVE_META)
 			tr->tr_num_buf_rm++;
 		else
 			tr->tr_num_databuf_rm++;
 		set_bit(TR_TOUCHED, &tr->tr_flags);
+		gfs2_log_unlock(sdp);
 		was_pinned = 1;
 		brelse(bh);
 	}
 	if (bd) {
 		spin_lock(&sdp->sd_ail_lock);
-		if (bd->bd_tr) {
+		if (!meta && !was_pinned && !list_empty(&bd->bd_list)) {
+			gfs2_log_lock(sdp);
+			list_del_init(&bd->bd_list);
+			gfs2_log_unlock(sdp);
+		} else if (bd->bd_tr) {
 			gfs2_trans_add_revoke(sdp, bd);
 		} else if (was_pinned) {
 			bh->b_private = NULL;
@@ -374,16 +380,13 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
 
 void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen)
 {
-	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
 	struct buffer_head *bh;
 
 	while (blen) {
 		bh = gfs2_getbuf(ip->i_gl, bstart, NO_CREATE);
 		if (bh) {
 			lock_buffer(bh);
-			gfs2_log_lock(sdp);
 			gfs2_remove_from_journal(bh, REMOVE_META);
-			gfs2_log_unlock(sdp);
 			unlock_buffer(bh);
 			brelse(bh);
 		}
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 483c5a7..f7addc5 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -123,18 +123,37 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
 		sb_end_intwrite(sdp->sd_vfs);
 }
 
-static struct gfs2_bufdata *gfs2_alloc_bufdata(struct gfs2_glock *gl,
-					       struct buffer_head *bh,
-					       const struct gfs2_log_operations *lops)
+/* lock_bh_get_bd - lock buffer_head and return its bd
+ *
+ * This function locks the buffer_head and returns its bd.
+ * If there's no bd, a new one is created, protected by the bh lock.
+ */
+static struct gfs2_bufdata *lock_bh_get_bd(struct gfs2_glock *gl,
+					   struct buffer_head *bh,
+					   const struct gfs2_log_operations *lops)
 {
 	struct gfs2_bufdata *bd;
 
+	lock_buffer(bh);
+	bd = bh->b_private;
+	if (bd)
+		goto out;
+
+	unlock_buffer(bh);
 	bd = kmem_cache_zalloc(gfs2_bufdata_cachep, GFP_NOFS | __GFP_NOFAIL);
 	bd->bd_bh = bh;
 	bd->bd_gl = gl;
 	bd->bd_ops = lops;
 	INIT_LIST_HEAD(&bd->bd_list);
+	lock_buffer(bh);
+	if (bh->b_private) { /* someone prempted us */
+		kmem_cache_free(gfs2_bufdata_cachep, bd);
+		bd = bh->b_private;
+		goto out;
+	}
+	gfs2_assert(gl->gl_name.ln_sbd, bd->bd_gl == gl);
 	bh->b_private = bd;
+out:
 	return bd;
 }
 
@@ -169,29 +188,17 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
 		return;
 	}
 
-	lock_buffer(bh);
-	gfs2_log_lock(sdp);
-	bd = bh->b_private;
-	if (bd == NULL) {
-		gfs2_log_unlock(sdp);
-		unlock_buffer(bh);
-		if (bh->b_private == NULL)
-			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_databuf_lops);
-		else
-			bd = bh->b_private;
-		lock_buffer(bh);
-		gfs2_log_lock(sdp);
-	}
-	gfs2_assert(sdp, bd->bd_gl == gl);
+	bd = lock_bh_get_bd(gl, bh, &gfs2_databuf_lops);
 	set_bit(TR_TOUCHED, &tr->tr_flags);
 	if (list_empty(&bd->bd_list)) {
+		gfs2_pin(sdp, bd->bd_bh);
 		set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
 		set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
-		gfs2_pin(sdp, bd->bd_bh);
 		tr->tr_num_databuf_new++;
+		gfs2_log_lock(sdp);
 		list_add_tail(&bd->bd_list, &tr->tr_databuf);
+		gfs2_log_unlock(sdp);
 	}
-	gfs2_log_unlock(sdp);
 	unlock_buffer(bh);
 }
 
@@ -204,26 +211,12 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
 	struct gfs2_trans *tr;
 	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
 
-	lock_buffer(bh);
-	gfs2_log_lock(sdp);
-	bd = bh->b_private;
-	if (bd == NULL) {
-		gfs2_log_unlock(sdp);
-		unlock_buffer(bh);
-		lock_page(bh->b_page);
-		if (bh->b_private == NULL)
-			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
-		else
-			bd = bh->b_private;
-		unlock_page(bh->b_page);
-		lock_buffer(bh);
-		gfs2_log_lock(sdp);
-	}
-	gfs2_assert(sdp, bd->bd_gl == gl);
+	bd = lock_bh_get_bd(gl, bh, &gfs2_buf_lops);
 	tr = current->journal_info;
 	set_bit(TR_TOUCHED, &tr->tr_flags);
 	if (!list_empty(&bd->bd_list))
 		goto out_unlock;
+	gfs2_pin(sdp, bd->bd_bh);
 	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
 	set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
 	mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
@@ -236,13 +229,13 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
 		printk(KERN_INFO "GFS2:adding buf while frozen\n");
 		gfs2_assert_withdraw(sdp, 0);
 	}
-	gfs2_pin(sdp, bd->bd_bh);
 	mh->__pad0 = cpu_to_be64(0);
 	mh->mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
+	gfs2_log_lock(sdp);
 	list_add(&bd->bd_list, &tr->tr_buf);
+	gfs2_log_unlock(sdp);
 	tr->tr_num_buf_new++;
 out_unlock:
-	gfs2_log_unlock(sdp);
 	unlock_buffer(bh);
 }
 
-- 
2.9.3

[Cluster-devel] [GFS2 PATCH 1/3] GFS2: Switch tr_touched to flag in transaction

[Steven Whitehouse]

Hi,

This looks like a good change to do anyway, irrespective of the other 
patches.

Acked-by: Steven Whitehouse <swhiteho@redhat.com>

Steve.


On 25/01/17 19:58, Bob Peterson wrote:
> This patch eliminates the int variable tr_touched in favor of a
> new flag in the transaction. This is a step toward reducing contention
> on the gfs2_log_lock spin_lock.
>
> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> ---
>   fs/gfs2/incore.h  | 10 +++++++---
>   fs/gfs2/log.c     |  6 +++---
>   fs/gfs2/meta_io.c |  6 +++---
>   fs/gfs2/trans.c   | 19 ++++++++++---------
>   4 files changed, 23 insertions(+), 18 deletions(-)
>
> diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
> index 00d8dc2..c45084a 100644
> --- a/fs/gfs2/incore.h
> +++ b/fs/gfs2/incore.h
> @@ -470,15 +470,19 @@ struct gfs2_quota_data {
>   	struct rcu_head qd_rcu;
>   };
>   
> +enum {
> +	TR_TOUCHED = 1,
> +	TR_ATTACHED = 2,
> +	TR_ALLOCED = 3,
> +};
> +
>   struct gfs2_trans {
>   	unsigned long tr_ip;
>   
>   	unsigned int tr_blocks;
>   	unsigned int tr_revokes;
>   	unsigned int tr_reserved;
> -	unsigned int tr_touched:1;
> -	unsigned int tr_attached:1;
> -	unsigned int tr_alloced:1;
> +	unsigned long tr_flags;
>   
>   	unsigned int tr_num_buf_new;
>   	unsigned int tr_num_databuf_new;
> diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
> index 5028a9d..4fb76c0 100644
> --- a/fs/gfs2/log.c
> +++ b/fs/gfs2/log.c
> @@ -799,7 +799,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
>   
>   static void gfs2_merge_trans(struct gfs2_trans *old, struct gfs2_trans *new)
>   {
> -	WARN_ON_ONCE(old->tr_attached != 1);
> +	WARN_ON_ONCE(!test_bit(TR_ATTACHED, &old->tr_flags));
>   
>   	old->tr_num_buf_new	+= new->tr_num_buf_new;
>   	old->tr_num_databuf_new	+= new->tr_num_databuf_new;
> @@ -823,9 +823,9 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
>   	if (sdp->sd_log_tr) {
>   		gfs2_merge_trans(sdp->sd_log_tr, tr);
>   	} else if (tr->tr_num_buf_new || tr->tr_num_databuf_new) {
> -		gfs2_assert_withdraw(sdp, tr->tr_alloced);
> +		gfs2_assert_withdraw(sdp, test_bit(TR_ALLOCED, &tr->tr_flags));
>   		sdp->sd_log_tr = tr;
> -		tr->tr_attached = 1;
> +		set_bit(TR_ATTACHED, &tr->tr_flags);
>   	}
>   
>   	sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm;
> diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
> index 373639a5..a88a347 100644
> --- a/fs/gfs2/meta_io.c
> +++ b/fs/gfs2/meta_io.c
> @@ -293,7 +293,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
>   	wait_on_buffer(bh);
>   	if (unlikely(!buffer_uptodate(bh))) {
>   		struct gfs2_trans *tr = current->journal_info;
> -		if (tr && tr->tr_touched)
> +		if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
>   			gfs2_io_error_bh(sdp, bh);
>   		brelse(bh);
>   		*bhp = NULL;
> @@ -320,7 +320,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
>   
>   	if (!buffer_uptodate(bh)) {
>   		struct gfs2_trans *tr = current->journal_info;
> -		if (tr && tr->tr_touched)
> +		if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
>   			gfs2_io_error_bh(sdp, bh);
>   		return -EIO;
>   	}
> @@ -346,7 +346,7 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
>   			tr->tr_num_buf_rm++;
>   		else
>   			tr->tr_num_databuf_rm++;
> -		tr->tr_touched = 1;
> +		set_bit(TR_TOUCHED, &tr->tr_flags);
>   		was_pinned = 1;
>   		brelse(bh);
>   	}
> diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
> index 0c1bde3..5d7f5b0 100644
> --- a/fs/gfs2/trans.c
> +++ b/fs/gfs2/trans.c
> @@ -48,7 +48,7 @@ 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_alloced = 1;
> +	set_bit(TR_ALLOCED, &tr->tr_flags);
>   	if (blocks)
>   		tr->tr_reserved += 6 + blocks;
>   	if (revokes)
> @@ -78,7 +78,8 @@ static void gfs2_print_trans(const struct gfs2_trans *tr)
>   {
>   	pr_warn("Transaction created at: %pSR\n", (void *)tr->tr_ip);
>   	pr_warn("blocks=%u revokes=%u reserved=%u touched=%u\n",
> -		tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
> +		tr->tr_blocks, tr->tr_revokes, tr->tr_reserved,
> +		test_bit(TR_TOUCHED, &tr->tr_flags));
>   	pr_warn("Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
>   		tr->tr_num_buf_new, tr->tr_num_buf_rm,
>   		tr->tr_num_databuf_new, tr->tr_num_databuf_rm,
> @@ -89,12 +90,12 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
>   {
>   	struct gfs2_trans *tr = current->journal_info;
>   	s64 nbuf;
> -	int alloced = tr->tr_alloced;
> +	int alloced = test_bit(TR_ALLOCED, &tr->tr_flags);
>   
>   	BUG_ON(!tr);
>   	current->journal_info = NULL;
>   
> -	if (!tr->tr_touched) {
> +	if (!test_bit(TR_TOUCHED, &tr->tr_flags)) {
>   		gfs2_log_release(sdp, tr->tr_reserved);
>   		if (alloced) {
>   			kfree(tr);
> @@ -112,8 +113,8 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
>   		gfs2_print_trans(tr);
>   
>   	gfs2_log_commit(sdp, tr);
> -	if (alloced && !tr->tr_attached)
> -			kfree(tr);
> +	if (alloced && !test_bit(TR_ATTACHED, &tr->tr_flags))
> +		kfree(tr);
>   	up_read(&sdp->sd_log_flush_lock);
>   
>   	if (sdp->sd_vfs->s_flags & MS_SYNCHRONOUS)
> @@ -182,7 +183,7 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
>   		gfs2_log_lock(sdp);
>   	}
>   	gfs2_assert(sdp, bd->bd_gl == gl);
> -	tr->tr_touched = 1;
> +	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	if (list_empty(&bd->bd_list)) {
>   		set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
>   		set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
> @@ -201,7 +202,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
>   	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
>   
>   	tr = current->journal_info;
> -	tr->tr_touched = 1;
> +	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	if (!list_empty(&bd->bd_list))
>   		return;
>   	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
> @@ -256,7 +257,7 @@ void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
>   
>   	BUG_ON(!list_empty(&bd->bd_list));
>   	gfs2_add_revoke(sdp, bd);
> -	tr->tr_touched = 1;
> +	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	tr->tr_num_revoke++;
>   }
>   

[Cluster-devel] [GFS2 PATCH 2/3] GFS2: Inline function meta_lo_add

[Steven Whitehouse]

Hi,

Acked-by: Steven Whitehouse <swhiteho@redhat.com>

Steve.


On 25/01/17 19:58, Bob Peterson wrote:
> This patch simply combines function meta_lo_add with its only
> caller, trans_add_meta. This makes the code easier to read and
> will make it easier to reduce contention on gfs2_log_lock.
>
> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> ---
>   fs/gfs2/trans.c | 49 ++++++++++++++++++++++---------------------------
>   1 file changed, 22 insertions(+), 27 deletions(-)
>
> diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
> index 5d7f5b0..483c5a7 100644
> --- a/fs/gfs2/trans.c
> +++ b/fs/gfs2/trans.c
> @@ -195,16 +195,35 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
>   	unlock_buffer(bh);
>   }
>   
> -static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
> +void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
>   {
> +
> +	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
> +	struct gfs2_bufdata *bd;
>   	struct gfs2_meta_header *mh;
>   	struct gfs2_trans *tr;
>   	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
>   
> +	lock_buffer(bh);
> +	gfs2_log_lock(sdp);
> +	bd = bh->b_private;
> +	if (bd == NULL) {
> +		gfs2_log_unlock(sdp);
> +		unlock_buffer(bh);
> +		lock_page(bh->b_page);
> +		if (bh->b_private == NULL)
> +			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
> +		else
> +			bd = bh->b_private;
> +		unlock_page(bh->b_page);
> +		lock_buffer(bh);
> +		gfs2_log_lock(sdp);
> +	}
> +	gfs2_assert(sdp, bd->bd_gl == gl);
>   	tr = current->journal_info;
>   	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	if (!list_empty(&bd->bd_list))
> -		return;
> +		goto out_unlock;
>   	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
>   	set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
>   	mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
> @@ -222,31 +241,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
>   	mh->mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
>   	list_add(&bd->bd_list, &tr->tr_buf);
>   	tr->tr_num_buf_new++;
> -}
> -
> -void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
> -{
> -
> -	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
> -	struct gfs2_bufdata *bd;
> -
> -	lock_buffer(bh);
> -	gfs2_log_lock(sdp);
> -	bd = bh->b_private;
> -	if (bd == NULL) {
> -		gfs2_log_unlock(sdp);
> -		unlock_buffer(bh);
> -		lock_page(bh->b_page);
> -		if (bh->b_private == NULL)
> -			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
> -		else
> -			bd = bh->b_private;
> -		unlock_page(bh->b_page);
> -		lock_buffer(bh);
> -		gfs2_log_lock(sdp);
> -	}
> -	gfs2_assert(sdp, bd->bd_gl == gl);
> -	meta_lo_add(sdp, bd);
> +out_unlock:
>   	gfs2_log_unlock(sdp);
>   	unlock_buffer(bh);
>   }

[Cluster-devel] [GFS2 PATCH 3/3] GFS2: Reduce contention on gfs2_log_lock

[Steven Whitehouse]

Hi,


On 25/01/17 19:58, Bob Peterson wrote:
> This patch reworks some of the log locks to provide less contention.
This is a very complicated patch, with not a lot of explanation (I know 
there is more detail on the cover letter, but it should be on the patch 
itself, since the cover letter will not go into the git tree). I'm not 
sure I understand the reason for switching the locking order here. The 
original intent was simply to avoid taking the log lock in cases where 
the bh was already in the log.

I would expect gfs2_trans_add_meta to land up looking something like this:

     lock_buffer(bh);
     if (buffer_pinned(bh)) {
         /* If the buffer is pinned, then we know it must have a bd 
attached and be in the log already */
         set_bit(TR_TOUCHED, &tr->tr_flags);
         goto out;
     }
     gfs2_log_lock(sdp);

     .... rest of function unchanged here

     gfs2_log_unlock(sdp);
out:
     unlock_buffer(bh);
}

That is unless the test in meta_lo_add() "if 
(!list_empty(&bd->bd_list))" is not equivalent to testing 
buffer_pinned() for some reason, but even if that is the case, all we 
need to do is find a better test than "if (buffer_pinned(bh))" I think, 
which at worst case might mean adding an additional flag to the bh which 
would follow the on/off the bd->bd_list state,

Steve.

> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
> ---
>   fs/gfs2/aops.c    | 23 ++++++-------------
>   fs/gfs2/glops.c   |  4 ++--
>   fs/gfs2/log.c     |  6 ++---
>   fs/gfs2/lops.c    |  3 ++-
>   fs/gfs2/meta_io.c | 11 +++++----
>   fs/gfs2/trans.c   | 67 +++++++++++++++++++++++++------------------------------
>   6 files changed, 51 insertions(+), 63 deletions(-)
>
> diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
> index 5a6f52e..d3cd30d 100644
> --- a/fs/gfs2/aops.c
> +++ b/fs/gfs2/aops.c
> @@ -986,23 +986,13 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock)
>   
>   static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
>   {
> -	struct gfs2_bufdata *bd;
> -
>   	lock_buffer(bh);
> -	gfs2_log_lock(sdp);
>   	clear_buffer_dirty(bh);
> -	bd = bh->b_private;
> -	if (bd) {
> -		if (!list_empty(&bd->bd_list) && !buffer_pinned(bh))
> -			list_del_init(&bd->bd_list);
> -		else
> -			gfs2_remove_from_journal(bh, REMOVE_JDATA);
> -	}
> +	gfs2_remove_from_journal(bh, REMOVE_JDATA);
>   	bh->b_bdev = NULL;
>   	clear_buffer_mapped(bh);
>   	clear_buffer_req(bh);
>   	clear_buffer_new(bh);
> -	gfs2_log_unlock(sdp);
>   	unlock_buffer(bh);
>   }
>   
> @@ -1157,7 +1147,6 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
>   	 * on dirty buffers like we used to here again.
>   	 */
>   
> -	gfs2_log_lock(sdp);
>   	spin_lock(&sdp->sd_ail_lock);
>   	head = bh = page_buffers(page);
>   	do {
> @@ -1174,25 +1163,27 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
>   
>   	head = bh = page_buffers(page);
>   	do {
> +		lock_buffer(bh);
>   		bd = bh->b_private;
>   		if (bd) {
>   			gfs2_assert_warn(sdp, bd->bd_bh == bh);
> +			gfs2_log_lock(sdp);
>   			if (!list_empty(&bd->bd_list))
>   				list_del_init(&bd->bd_list);
> +			gfs2_log_unlock(sdp);
>   			bd->bd_bh = NULL;
>   			bh->b_private = NULL;
> -			kmem_cache_free(gfs2_bufdata_cachep, bd);
>   		}
> -
> +		unlock_buffer(bh);
> +		if (bd)
> +			kmem_cache_free(gfs2_bufdata_cachep, bd);
>   		bh = bh->b_this_page;
>   	} while (bh != head);
> -	gfs2_log_unlock(sdp);
>   
>   	return try_to_free_buffers(page);
>   
>   cannot_release:
>   	spin_unlock(&sdp->sd_ail_lock);
> -	gfs2_log_unlock(sdp);
>   	return 0;
>   }
>   
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index 5db59d4..fced99b 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -61,7 +61,6 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
>   	struct buffer_head *bh;
>   	const unsigned long b_state = (1UL << BH_Dirty)|(1UL << BH_Pinned)|(1UL << BH_Lock);
>   
> -	gfs2_log_lock(sdp);
>   	spin_lock(&sdp->sd_ail_lock);
>   	list_for_each_entry_safe_reverse(bd, tmp, head, bd_ail_gl_list) {
>   		if (nr_revokes == 0)
> @@ -72,12 +71,13 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
>   				continue;
>   			gfs2_ail_error(gl, bh);
>   		}
> +		gfs2_log_lock(sdp);
>   		gfs2_trans_add_revoke(sdp, bd);
> +		gfs2_log_unlock(sdp);
>   		nr_revokes--;
>   	}
>   	GLOCK_BUG_ON(gl, !fsync && atomic_read(&gl->gl_ail_count));
>   	spin_unlock(&sdp->sd_ail_lock);
> -	gfs2_log_unlock(sdp);
>   }
>   
>   
> diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
> index 4fb76c0..4d5f3a1 100644
> --- a/fs/gfs2/log.c
> +++ b/fs/gfs2/log.c
> @@ -624,8 +624,8 @@ done:
>   		if (!sdp->sd_log_blks_reserved)
>   			atomic_dec(&sdp->sd_log_blks_free);
>   	}
> -	gfs2_log_lock(sdp);
>   	spin_lock(&sdp->sd_ail_lock);
> +	gfs2_log_lock(sdp);
>   	list_for_each_entry(tr, &sdp->sd_ail1_list, tr_list) {
>   		list_for_each_entry_safe(bd, tmp, &tr->tr_ail2_list, bd_ail_st_list) {
>   			if (max_revokes == 0)
> @@ -637,8 +637,8 @@ done:
>   		}
>   	}
>   out_of_blocks:
> -	spin_unlock(&sdp->sd_ail_lock);
>   	gfs2_log_unlock(sdp);
> +	spin_unlock(&sdp->sd_ail_lock);
>   
>   	if (!sdp->sd_log_num_revoke) {
>   		atomic_inc(&sdp->sd_log_blks_free);
> @@ -756,6 +756,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
>   	sdp->sd_log_head = sdp->sd_log_flush_head;
>   	sdp->sd_log_blks_reserved = 0;
>   	sdp->sd_log_commited_revoke = 0;
> +	gfs2_log_unlock(sdp);
>   
>   	spin_lock(&sdp->sd_ail_lock);
>   	if (tr && !list_empty(&tr->tr_ail1_list)) {
> @@ -763,7 +764,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl,
>   		tr = NULL;
>   	}
>   	spin_unlock(&sdp->sd_ail_lock);
> -	gfs2_log_unlock(sdp);
>   
>   	if (type != NORMAL_FLUSH) {
>   		if (!sdp->sd_log_idle) {
> diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
> index 49d5a1b..d6a3bdb 100644
> --- a/fs/gfs2/lops.c
> +++ b/fs/gfs2/lops.c
> @@ -98,12 +98,13 @@ static void maybe_release_space(struct gfs2_bufdata *bd)
>   static void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
>   		       struct gfs2_trans *tr)
>   {
> -	struct gfs2_bufdata *bd = bh->b_private;
> +	struct gfs2_bufdata *bd;
>   
>   	BUG_ON(!buffer_uptodate(bh));
>   	BUG_ON(!buffer_pinned(bh));
>   
>   	lock_buffer(bh);
> +	bd = bh->b_private;
>   	mark_buffer_dirty(bh);
>   	clear_buffer_pinned(bh);
>   
> diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
> index a88a347..d870b15 100644
> --- a/fs/gfs2/meta_io.c
> +++ b/fs/gfs2/meta_io.c
> @@ -341,18 +341,24 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
>   	if (test_clear_buffer_pinned(bh)) {
>   		trace_gfs2_pin(bd, 0);
>   		atomic_dec(&sdp->sd_log_pinned);
> +		gfs2_log_lock(sdp);
>   		list_del_init(&bd->bd_list);
>   		if (meta == REMOVE_META)
>   			tr->tr_num_buf_rm++;
>   		else
>   			tr->tr_num_databuf_rm++;
>   		set_bit(TR_TOUCHED, &tr->tr_flags);
> +		gfs2_log_unlock(sdp);
>   		was_pinned = 1;
>   		brelse(bh);
>   	}
>   	if (bd) {
>   		spin_lock(&sdp->sd_ail_lock);
> -		if (bd->bd_tr) {
> +		if (!meta && !was_pinned && !list_empty(&bd->bd_list)) {
> +			gfs2_log_lock(sdp);
> +			list_del_init(&bd->bd_list);
> +			gfs2_log_unlock(sdp);
> +		} else if (bd->bd_tr) {
>   			gfs2_trans_add_revoke(sdp, bd);
>   		} else if (was_pinned) {
>   			bh->b_private = NULL;
> @@ -374,16 +380,13 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
>   
>   void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen)
>   {
> -	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
>   	struct buffer_head *bh;
>   
>   	while (blen) {
>   		bh = gfs2_getbuf(ip->i_gl, bstart, NO_CREATE);
>   		if (bh) {
>   			lock_buffer(bh);
> -			gfs2_log_lock(sdp);
>   			gfs2_remove_from_journal(bh, REMOVE_META);
> -			gfs2_log_unlock(sdp);
>   			unlock_buffer(bh);
>   			brelse(bh);
>   		}
> diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
> index 483c5a7..f7addc5 100644
> --- a/fs/gfs2/trans.c
> +++ b/fs/gfs2/trans.c
> @@ -123,18 +123,37 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
>   		sb_end_intwrite(sdp->sd_vfs);
>   }
>   
> -static struct gfs2_bufdata *gfs2_alloc_bufdata(struct gfs2_glock *gl,
> -					       struct buffer_head *bh,
> -					       const struct gfs2_log_operations *lops)
> +/* lock_bh_get_bd - lock buffer_head and return its bd
> + *
> + * This function locks the buffer_head and returns its bd.
> + * If there's no bd, a new one is created, protected by the bh lock.
> + */
> +static struct gfs2_bufdata *lock_bh_get_bd(struct gfs2_glock *gl,
> +					   struct buffer_head *bh,
> +					   const struct gfs2_log_operations *lops)
>   {
>   	struct gfs2_bufdata *bd;
>   
> +	lock_buffer(bh);
> +	bd = bh->b_private;
> +	if (bd)
> +		goto out;
> +
> +	unlock_buffer(bh);
>   	bd = kmem_cache_zalloc(gfs2_bufdata_cachep, GFP_NOFS | __GFP_NOFAIL);
>   	bd->bd_bh = bh;
>   	bd->bd_gl = gl;
>   	bd->bd_ops = lops;
>   	INIT_LIST_HEAD(&bd->bd_list);
> +	lock_buffer(bh);
> +	if (bh->b_private) { /* someone prempted us */
> +		kmem_cache_free(gfs2_bufdata_cachep, bd);
> +		bd = bh->b_private;
> +		goto out;
> +	}
> +	gfs2_assert(gl->gl_name.ln_sbd, bd->bd_gl == gl);
>   	bh->b_private = bd;
> +out:
>   	return bd;
>   }
>   
> @@ -169,29 +188,17 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
>   		return;
>   	}
>   
> -	lock_buffer(bh);
> -	gfs2_log_lock(sdp);
> -	bd = bh->b_private;
> -	if (bd == NULL) {
> -		gfs2_log_unlock(sdp);
> -		unlock_buffer(bh);
> -		if (bh->b_private == NULL)
> -			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_databuf_lops);
> -		else
> -			bd = bh->b_private;
> -		lock_buffer(bh);
> -		gfs2_log_lock(sdp);
> -	}
> -	gfs2_assert(sdp, bd->bd_gl == gl);
> +	bd = lock_bh_get_bd(gl, bh, &gfs2_databuf_lops);
>   	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	if (list_empty(&bd->bd_list)) {
> +		gfs2_pin(sdp, bd->bd_bh);
>   		set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
>   		set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
> -		gfs2_pin(sdp, bd->bd_bh);
>   		tr->tr_num_databuf_new++;
> +		gfs2_log_lock(sdp);
>   		list_add_tail(&bd->bd_list, &tr->tr_databuf);
> +		gfs2_log_unlock(sdp);
>   	}
> -	gfs2_log_unlock(sdp);
>   	unlock_buffer(bh);
>   }
>   
> @@ -204,26 +211,12 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
>   	struct gfs2_trans *tr;
>   	enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
>   
> -	lock_buffer(bh);
> -	gfs2_log_lock(sdp);
> -	bd = bh->b_private;
> -	if (bd == NULL) {
> -		gfs2_log_unlock(sdp);
> -		unlock_buffer(bh);
> -		lock_page(bh->b_page);
> -		if (bh->b_private == NULL)
> -			bd = gfs2_alloc_bufdata(gl, bh, &gfs2_buf_lops);
> -		else
> -			bd = bh->b_private;
> -		unlock_page(bh->b_page);
> -		lock_buffer(bh);
> -		gfs2_log_lock(sdp);
> -	}
> -	gfs2_assert(sdp, bd->bd_gl == gl);
> +	bd = lock_bh_get_bd(gl, bh, &gfs2_buf_lops);
>   	tr = current->journal_info;
>   	set_bit(TR_TOUCHED, &tr->tr_flags);
>   	if (!list_empty(&bd->bd_list))
>   		goto out_unlock;
> +	gfs2_pin(sdp, bd->bd_bh);
>   	set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
>   	set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
>   	mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
> @@ -236,13 +229,13 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
>   		printk(KERN_INFO "GFS2:adding buf while frozen\n");
>   		gfs2_assert_withdraw(sdp, 0);
>   	}
> -	gfs2_pin(sdp, bd->bd_bh);
>   	mh->__pad0 = cpu_to_be64(0);
>   	mh->mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
> +	gfs2_log_lock(sdp);
>   	list_add(&bd->bd_list, &tr->tr_buf);
> +	gfs2_log_unlock(sdp);
>   	tr->tr_num_buf_new++;
>   out_unlock:
> -	gfs2_log_unlock(sdp);
>   	unlock_buffer(bh);
>   }
>