Commit d69a3c65 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Move log buffer lists into transaction 



Over time, we hope to be able to improve the concurrency available
in the log code. This is one small step towards that, by moving
the buffer lists from the super block, and into the transaction
structure, so that each transaction builds its own buffer lists.

At transaction commit time, the buffer lists are merged into
the currently accumulating transaction. That transaction then
is passed into the before and after commit functions at journal
flush time. Thus there should be no change in overall behaviour
yet.

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

fs/gfs2/glops.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
	struct gfs2_trans tr;



	memset(&tr, 0, sizeof(tr));

	INIT_LIST_HEAD(&tr.tr_buf);

	INIT_LIST_HEAD(&tr.tr_databuf);

	tr.tr_revokes = atomic_read(&gl->gl_ail_count);



	if (!tr.tr_revokes)

fs/gfs2/incore.h

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct gfs2_log_header_host { 
 */



struct gfs2_log_operations {

	void (*lo_before_commit) (struct gfs2_sbd *sdp);

	void (*lo_before_commit) (struct gfs2_sbd *sdp, struct gfs2_trans *tr);

	void (*lo_after_commit) (struct gfs2_sbd *sdp, struct gfs2_trans *tr);

	void (*lo_before_scan) (struct gfs2_jdesc *jd,

				struct gfs2_log_header_host *head, int pass);
@@ -476,6 +476,8 @@ struct gfs2_trans { 
	unsigned int tr_num_revoke_rm;



	struct list_head tr_list;

	struct list_head tr_databuf;

	struct list_head tr_buf;



	unsigned int tr_first;

	struct list_head tr_ail1_list;
@@ -756,9 +758,7 @@ struct gfs2_sbd { 
	unsigned int sd_log_num_rg;

	unsigned int sd_log_num_databuf;



	struct list_head sd_log_le_buf;

	struct list_head sd_log_le_revoke;

	struct list_head sd_log_le_databuf;

	struct list_head sd_log_le_ordered;

	spinlock_t sd_ordered_lock;

fs/gfs2/log.c

+25 −3
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) 
		tr->tr_first = sdp->sd_log_flush_head;



	gfs2_ordered_write(sdp);

	lops_before_commit(sdp);

	lops_before_commit(sdp, tr);

	gfs2_log_flush_bio(sdp, WRITE);



	if (sdp->sd_log_head != sdp->sd_log_flush_head) {
@@ -744,6 +744,27 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) 
	kfree(tr);

}



/**

 * gfs2_merge_trans - Merge a new transaction into a cached transaction

 * @old: Original transaction to be expanded

 * @new: New transaction to be merged

 */



static void gfs2_merge_trans(struct gfs2_trans *old, struct gfs2_trans *new)

{

	WARN_ON_ONCE(old->tr_attached != 1);



	old->tr_num_buf_new	+= new->tr_num_buf_new;

	old->tr_num_databuf_new	+= new->tr_num_databuf_new;

	old->tr_num_buf_rm	+= new->tr_num_buf_rm;

	old->tr_num_databuf_rm	+= new->tr_num_databuf_rm;

	old->tr_num_revoke	+= new->tr_num_revoke;

	old->tr_num_revoke_rm	+= new->tr_num_revoke_rm;



	list_splice_tail_init(&new->tr_databuf, &old->tr_databuf);

	list_splice_tail_init(&new->tr_buf, &old->tr_buf);

}



static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	unsigned int reserved;
@@ -766,8 +787,9 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
			     sdp->sd_jdesc->jd_blocks);

	sdp->sd_log_blks_reserved = reserved;



	if (sdp->sd_log_tr == NULL &&

	    (tr->tr_num_buf_new || tr->tr_num_databuf_new)) {

	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_t_gh.gh_gl);

		sdp->sd_log_tr = tr;

		tr->tr_attached = 1;

fs/gfs2/lops.c

+15 −17
Original line number Diff line number Diff line
@@ -491,24 +491,23 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
	gfs2_log_unlock(sdp);

}



static void buf_lo_before_commit(struct gfs2_sbd *sdp)

static void buf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	unsigned int limit = buf_limit(sdp); /* 503 for 4k blocks */



	gfs2_before_commit(sdp, limit, sdp->sd_log_num_buf,

			   &sdp->sd_log_le_buf, 0);

	if (tr == NULL)

		return;

	gfs2_before_commit(sdp, limit, sdp->sd_log_num_buf, &tr->tr_buf, 0);

}



static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	struct list_head *head = &sdp->sd_log_le_buf;

	struct list_head *head;

	struct gfs2_bufdata *bd;



	if (tr == NULL) {

		gfs2_assert(sdp, list_empty(head));

	if (tr == NULL)

		return;

	}



	head = &tr->tr_buf;

	while (!list_empty(head)) {

		bd = list_entry(head->next, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);
@@ -620,7 +619,7 @@ static void buf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass) 
	        jd->jd_jid, sdp->sd_replayed_blocks, sdp->sd_found_blocks);

}



static void revoke_lo_before_commit(struct gfs2_sbd *sdp)

static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	struct gfs2_meta_header *mh;

	unsigned int offset;
@@ -760,12 +759,12 @@ static void revoke_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass) 
 *

 */



static void databuf_lo_before_commit(struct gfs2_sbd *sdp)

static void databuf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	unsigned int limit = buf_limit(sdp) / 2;



	gfs2_before_commit(sdp, limit, sdp->sd_log_num_databuf,

			   &sdp->sd_log_le_databuf, 1);

	if (tr == NULL)

		return;

	gfs2_before_commit(sdp, limit, sdp->sd_log_num_databuf, &tr->tr_databuf, 1);

}



static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
@@ -840,14 +839,13 @@ static void databuf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass) 


static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	struct list_head *head = &sdp->sd_log_le_databuf;

	struct list_head *head;

	struct gfs2_bufdata *bd;



	if (tr == NULL) {

		gfs2_assert(sdp, list_empty(head));

	if (tr == NULL)

		return;

	}



	head = &tr->tr_databuf;

	while (!list_empty(head)) {

		bd = list_entry(head->next, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);

fs/gfs2/lops.h

+3 −2
Original line number Diff line number Diff line
@@ -46,12 +46,13 @@ static inline unsigned int databuf_limit(struct gfs2_sbd *sdp) 
	return limit;

}



static inline void lops_before_commit(struct gfs2_sbd *sdp)

static inline void lops_before_commit(struct gfs2_sbd *sdp,

				      struct gfs2_trans *tr)

{

	int x;

	for (x = 0; gfs2_log_ops[x]; x++)

		if (gfs2_log_ops[x]->lo_before_commit)

			gfs2_log_ops[x]->lo_before_commit(sdp);

			gfs2_log_ops[x]->lo_before_commit(sdp, tr);

}



static inline void lops_after_commit(struct gfs2_sbd *sdp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE