Commit 16924853 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: convert log vector chain to use list heads 



Because the next change is going to require sorting log vectors, and
that requires arbitrary rearrangement of the list which cannot be
done easily with a single linked list.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent c0fb4765

fs/xfs/xfs_log.c

+6 −5
Original line number Diff line number Diff line
@@ -944,6 +944,8 @@ xlog_write_unmount_record( 
		.lv_niovecs = 1,

		.lv_iovecp = &reg,

	};

	LIST_HEAD(lv_chain);

	list_add(&vec.lv_list, &lv_chain);



	BUILD_BUG_ON((sizeof(struct xlog_op_header) +

		      sizeof(struct xfs_unmount_log_format)) !=
@@ -952,7 +954,7 @@ xlog_write_unmount_record( 
	/* account for space used by record data */

	ticket->t_curr_res -= sizeof(unmount_rec);



	return xlog_write(log, NULL, &vec, ticket, reg.i_len);

	return xlog_write(log, NULL, &lv_chain, ticket, reg.i_len);

}



/*
@@ -2471,13 +2473,13 @@ int 
xlog_write(

	struct xlog		*log,

	struct xfs_cil_ctx	*ctx,

	struct xfs_log_vec	*log_vector,

	struct list_head	*lv_chain,

	struct xlog_ticket	*ticket,

	uint32_t		len)



{

	struct xlog_in_core	*iclog = NULL;

	struct xfs_log_vec	*lv = log_vector;

	struct xfs_log_vec	*lv;

	uint32_t		record_cnt = 0;

	uint32_t		data_cnt = 0;

	int			error = 0;
@@ -2505,7 +2507,7 @@ xlog_write( 
	if (ctx)

		xlog_cil_set_ctx_write_state(ctx, iclog);



	while (lv) {

	list_for_each_entry(lv, lv_chain, lv_list) {

		/*

		 * If the entire log vec does not fit in the iclog, punt it to

		 * the partial copy loop which can handle this case.
@@ -2526,7 +2528,6 @@ xlog_write( 
			xlog_write_full(lv, ticket, iclog, &log_offset,

					 &len, &record_cnt, &data_cnt);

		}

		lv = lv->lv_next;

	}

	ASSERT(len == 0);

fs/xfs/xfs_log.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
struct xfs_cil_ctx;



struct xfs_log_vec {

	struct xfs_log_vec	*lv_next;	/* next lv in build list */

	struct list_head	lv_list;	/* CIL lv chain ptrs */

	int			lv_niovecs;	/* number of iovecs in lv */

	struct xfs_log_iovec	*lv_iovecp;	/* iovec array */

	struct xfs_log_item	*lv_item;	/* owner */

fs/xfs/xfs_log_cil.c

+30 −24
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ xlog_cil_ctx_alloc(void) 
	INIT_LIST_HEAD(&ctx->committing);

	INIT_LIST_HEAD(&ctx->busy_extents);

	INIT_LIST_HEAD(&ctx->log_items);

	INIT_LIST_HEAD(&ctx->lv_chain);

	INIT_WORK(&ctx->push_work, xlog_cil_push_work);

	return ctx;

}
@@ -338,6 +339,7 @@ xlog_cil_alloc_shadow_bufs( 


			memset(lv, 0, xlog_cil_iovec_space(niovecs));



			INIT_LIST_HEAD(&lv->lv_list);

			lv->lv_item = lip;

			lv->lv_size = buf_size;

			if (ordered)
@@ -353,7 +355,6 @@ xlog_cil_alloc_shadow_bufs( 
			else

				lv->lv_buf_len = 0;

			lv->lv_bytes = 0;

			lv->lv_next = NULL;

		}



		/* Ensure the lv is set up according to ->iop_size */
@@ -480,7 +481,6 @@ xlog_cil_insert_format_items( 
		if (lip->li_lv && shadow->lv_size <= lip->li_lv->lv_size) {

			/* same or smaller, optimise common overwrite case */

			lv = lip->li_lv;

			lv->lv_next = NULL;



			if (ordered)

				goto insert;
@@ -685,14 +685,14 @@ xlog_cil_insert_items( 


static void

xlog_cil_free_logvec(

	struct xfs_log_vec	*log_vector)

	struct list_head	*lv_chain)

{

	struct xfs_log_vec	*lv;



	for (lv = log_vector; lv; ) {

		struct xfs_log_vec *next = lv->lv_next;

	while (!list_empty(lv_chain)) {

		lv = list_first_entry(lv_chain, struct xfs_log_vec, lv_list);

		list_del_init(&lv->lv_list);

		kmem_free(lv);

		lv = next;

	}

}
@@ -792,7 +792,7 @@ xlog_cil_committed( 
		spin_unlock(&ctx->cil->xc_push_lock);

	}



	xfs_trans_committed_bulk(ctx->cil->xc_log->l_ailp, ctx->lv_chain,

	xfs_trans_committed_bulk(ctx->cil->xc_log->l_ailp, &ctx->lv_chain,

					ctx->start_lsn, abort);



	xfs_extent_busy_sort(&ctx->busy_extents);
@@ -803,7 +803,7 @@ xlog_cil_committed( 
	list_del(&ctx->committing);

	spin_unlock(&ctx->cil->xc_push_lock);



	xlog_cil_free_logvec(ctx->lv_chain);

	xlog_cil_free_logvec(&ctx->lv_chain);



	if (!list_empty(&ctx->busy_extents))

		xlog_discard_busy_extents(mp, ctx);
@@ -962,7 +962,6 @@ xlog_cil_order_write( 
static int

xlog_cil_write_chain(

	struct xfs_cil_ctx	*ctx,

	struct xfs_log_vec	*chain,

	uint32_t		chain_len)

{

	struct xlog		*log = ctx->cil->xc_log;
@@ -971,7 +970,7 @@ xlog_cil_write_chain( 
	error = xlog_cil_order_write(ctx->cil, ctx->sequence, _START_RECORD);

	if (error)

		return error;

	return xlog_write(log, ctx, chain, ctx->ticket, chain_len);

	return xlog_write(log, ctx, &ctx->lv_chain, ctx->ticket, chain_len);

}



/*
@@ -1000,6 +999,8 @@ xlog_cil_write_commit_record( 
		.lv_iovecp = &reg,

	};

	int			error;

	LIST_HEAD(lv_chain);

	list_add(&vec.lv_list, &lv_chain);



	if (xlog_is_shutdown(log))

		return -EIO;
@@ -1010,7 +1011,7 @@ xlog_cil_write_commit_record( 


	/* account for space used by record data */

	ctx->ticket->t_curr_res -= reg.i_len;

	error = xlog_write(log, ctx, &vec, ctx->ticket, reg.i_len);

	error = xlog_write(log, ctx, &lv_chain, ctx->ticket, reg.i_len);

	if (error)

		xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);

	return error;
@@ -1076,7 +1077,6 @@ xlog_cil_build_trans_hdr( 
	lvhdr->lv_niovecs = 2;

	lvhdr->lv_iovecp = &hdr->lhdr[0];

	lvhdr->lv_bytes = hdr->lhdr[0].i_len + hdr->lhdr[1].i_len;

	lvhdr->lv_next = ctx->lv_chain;



	tic->t_curr_res -= lvhdr->lv_bytes;

}
@@ -1117,12 +1117,11 @@ xlog_cil_build_lv_chain( 
	uint32_t		*num_iovecs,

	uint32_t		*num_bytes)

{

	struct xfs_log_vec	*lv = NULL;



	list_sort(NULL, &ctx->log_items, xlog_cil_order_cmp);



	while (!list_empty(&ctx->log_items)) {

		struct xfs_log_item	*item;

		struct xfs_log_vec	*lv;



		item = list_first_entry(&ctx->log_items,

					struct xfs_log_item, li_cil);
@@ -1133,19 +1132,17 @@ xlog_cil_build_lv_chain( 
			continue;

		}



		list_del_init(&item->li_cil);

		item->li_order_id = 0;

		if (!ctx->lv_chain)

			ctx->lv_chain = item->li_lv;

		else

			lv->lv_next = item->li_lv;

		lv = item->li_lv;

		item->li_lv = NULL;

		*num_iovecs += lv->lv_niovecs;



		/* we don't write ordered log vectors */

		if (lv->lv_buf_len != XFS_LOG_VEC_ORDERED)

			*num_bytes += lv->lv_bytes;

		*num_iovecs += lv->lv_niovecs;

		list_add_tail(&lv->lv_list, &ctx->lv_chain);



		list_del_init(&item->li_cil);

		item->li_order_id = 0;

		item->li_lv = NULL;

	}

}
@@ -1189,7 +1186,7 @@ xlog_cil_push_work( 
	int			num_bytes = 0;

	int			error = 0;

	struct xlog_cil_trans_hdr thdr;

	struct xfs_log_vec	lvhdr = { NULL };

	struct xfs_log_vec	lvhdr = {};

	xfs_csn_t		push_seq;

	bool			push_commit_stable;

	LIST_HEAD		(whiteouts);
@@ -1299,11 +1296,20 @@ xlog_cil_push_work( 
	 * Build a checkpoint transaction header and write it to the log to

	 * begin the transaction. We need to account for the space used by the

	 * transaction header here as it is not accounted for in xlog_write().

	 * Add the lvhdr to the head of the lv chain we pass to xlog_write() so

	 * it gets written into the iclog first.

	 */

	xlog_cil_build_trans_hdr(ctx, &thdr, &lvhdr, num_iovecs);

	num_bytes += lvhdr.lv_bytes;

	list_add(&lvhdr.lv_list, &ctx->lv_chain);



	error = xlog_cil_write_chain(ctx, &lvhdr, num_bytes);

	/*

	 * Take the lvhdr back off the lv_chain immediately after calling

	 * xlog_cil_write_chain() as it should not be passed to log IO

	 * completion.

	 */

	error = xlog_cil_write_chain(ctx, num_bytes);

	list_del(&lvhdr.lv_list);

	if (error)

		goto out_abort_free_ticket;

fs/xfs/xfs_log_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ struct xfs_cil_ctx { 
	atomic_t		space_used;	/* aggregate size of regions */

	struct list_head	busy_extents;	/* busy extents in chkpt */

	struct list_head	log_items;	/* log items in chkpt */

	struct xfs_log_vec	*lv_chain;	/* logvecs being pushed */

	struct list_head	lv_chain;	/* logvecs being pushed */

	struct list_head	iclog_entry;

	struct list_head	committing;	/* ctx committing list */

	struct work_struct	discard_endio_work;
@@ -508,7 +508,7 @@ struct xlog_ticket *xlog_ticket_alloc(struct xlog *log, int unit_bytes, 
void	xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket);

void	xlog_print_trans(struct xfs_trans *);

int	xlog_write(struct xlog *log, struct xfs_cil_ctx *ctx,

		struct xfs_log_vec *log_vector, struct xlog_ticket *tic,

		struct list_head *lv_chain, struct xlog_ticket *tic,

		uint32_t len);

void	xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);

void	xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);

fs/xfs/xfs_trans.c

+2 −2
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ xfs_log_item_batch_insert( 
void

xfs_trans_committed_bulk(

	struct xfs_ail		*ailp,

	struct xfs_log_vec	*log_vector,

	struct list_head	*lv_chain,

	xfs_lsn_t		commit_lsn,

	bool			aborted)

{
@@ -775,7 +775,7 @@ xfs_trans_committed_bulk( 
	spin_unlock(&ailp->ail_lock);



	/* unpin all the log items */

	for (lv = log_vector; lv; lv = lv->lv_next ) {

	list_for_each_entry(lv, lv_chain, lv_list) {

		struct xfs_log_item	*lip = lv->lv_item;

		xfs_lsn_t		item_lsn;