Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77d61fe4 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: log bmap intent items 



Provide a mechanism for higher levels to create BUI/BUD items, submit
them to the log, and a stub function to deal with recovered BUI items.
These parts will be connected to the rmapbt in a later patch.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 6413a014

fs/xfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ xfs-y += xfs_log.o \ 
				   xfs_rmap_item.o \

				   xfs_log_recover.o \

				   xfs_trans_ail.o \

				   xfs_trans_bmap.o \

				   xfs_trans_buf.o \

				   xfs_trans_extfree.o \

				   xfs_trans_inode.o \

fs/xfs/libxfs/xfs_bmap.h

+13 −0
Original line number Diff line number Diff line
@@ -207,4 +207,17 @@ int xfs_bmapi_reserve_delalloc(struct xfs_inode *ip, xfs_fileoff_t aoff, 
		xfs_filblks_t len, struct xfs_bmbt_irec *got,

		struct xfs_bmbt_irec *prev, xfs_extnum_t *lastx, int eof);



enum xfs_bmap_intent_type {

	XFS_BMAP_MAP = 1,

	XFS_BMAP_UNMAP,

};



struct xfs_bmap_intent {

	struct list_head			bi_list;

	enum xfs_bmap_intent_type		bi_type;

	struct xfs_inode			*bi_owner;

	int					bi_whichfork;

	struct xfs_bmbt_irec			bi_bmap;

};



#endif	/* __XFS_BMAP_H__ */

fs/xfs/xfs_bmap_item.c

+69 −0
Original line number Diff line number Diff line
@@ -22,12 +22,18 @@ 
#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_inode.h"

#include "xfs_trans.h"

#include "xfs_trans_priv.h"

#include "xfs_buf_item.h"

#include "xfs_bmap_item.h"

#include "xfs_log.h"

#include "xfs_bmap.h"

#include "xfs_icache.h"

#include "xfs_trace.h"





kmem_zone_t	*xfs_bui_zone;
@@ -372,3 +378,66 @@ xfs_bud_init( 


	return budp;

}



/*

 * Process a bmap update intent item that was recovered from the log.

 * We need to update some inode's bmbt.

 */

int

xfs_bui_recover(

	struct xfs_mount		*mp,

	struct xfs_bui_log_item		*buip)

{

	int				error = 0;

	struct xfs_map_extent		*bmap;

	xfs_fsblock_t			startblock_fsb;

	xfs_fsblock_t			inode_fsb;

	bool				op_ok;



	ASSERT(!test_bit(XFS_BUI_RECOVERED, &buip->bui_flags));



	/* Only one mapping operation per BUI... */

	if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) {

		set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);

		xfs_bui_release(buip);

		return -EIO;

	}



	/*

	 * First check the validity of the extent described by the

	 * BUI.  If anything is bad, then toss the BUI.

	 */

	bmap = &buip->bui_format.bui_extents[0];

	startblock_fsb = XFS_BB_TO_FSB(mp,

			   XFS_FSB_TO_DADDR(mp, bmap->me_startblock));

	inode_fsb = XFS_BB_TO_FSB(mp, XFS_FSB_TO_DADDR(mp,

			XFS_INO_TO_FSB(mp, bmap->me_owner)));

	switch (bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK) {

	case XFS_BMAP_MAP:

	case XFS_BMAP_UNMAP:

		op_ok = true;

		break;

	default:

		op_ok = false;

		break;

	}

	if (!op_ok || startblock_fsb == 0 ||

	    bmap->me_len == 0 ||

	    inode_fsb == 0 ||

	    startblock_fsb >= mp->m_sb.sb_dblocks ||

	    bmap->me_len >= mp->m_sb.sb_agblocks ||

	    inode_fsb >= mp->m_sb.sb_dblocks ||

	    (bmap->me_flags & ~XFS_BMAP_EXTENT_FLAGS)) {

		/*

		 * This will pull the BUI from the AIL and

		 * free the memory associated with it.

		 */

		set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);

		xfs_bui_release(buip);

		return -EIO;

	}



	set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);

	xfs_bui_release(buip);

	return error;

}

fs/xfs/xfs_bmap_item.h

+1 −0
Original line number Diff line number Diff line
@@ -93,5 +93,6 @@ struct xfs_bud_log_item *xfs_bud_init(struct xfs_mount *, 
		struct xfs_bui_log_item *);

void xfs_bui_item_free(struct xfs_bui_log_item *);

void xfs_bui_release(struct xfs_bui_log_item *);

int xfs_bui_recover(struct xfs_mount *mp, struct xfs_bui_log_item *buip);



#endif	/* __XFS_BMAP_ITEM_H__ */

fs/xfs/xfs_log_recover.c

+177 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "xfs_rmap_item.h"

#include "xfs_buf_item.h"

#include "xfs_refcount_item.h"

#include "xfs_bmap_item.h"



#define BLK_AVG(blk1, blk2)	((blk1+blk2) >> 1)
@@ -1927,6 +1928,8 @@ xlog_recover_reorder_trans( 
		case XFS_LI_RUD:

		case XFS_LI_CUI:

		case XFS_LI_CUD:

		case XFS_LI_BUI:

		case XFS_LI_BUD:

			trace_xfs_log_recover_item_reorder_tail(log,

							trans, item, pass);

			list_move_tail(&item->ri_list, &inode_list);
@@ -3670,6 +3673,125 @@ xlog_recover_cud_pass2( 
	return 0;

}



/*

 * Copy an BUI format buffer from the given buf, and into the destination

 * BUI format structure.  The BUI/BUD items were designed not to need any

 * special alignment handling.

 */

static int

xfs_bui_copy_format(

	struct xfs_log_iovec		*buf,

	struct xfs_bui_log_format	*dst_bui_fmt)

{

	struct xfs_bui_log_format	*src_bui_fmt;

	uint				len;



	src_bui_fmt = buf->i_addr;

	len = xfs_bui_log_format_sizeof(src_bui_fmt->bui_nextents);



	if (buf->i_len == len) {

		memcpy(dst_bui_fmt, src_bui_fmt, len);

		return 0;

	}

	return -EFSCORRUPTED;

}



/*

 * This routine is called to create an in-core extent bmap update

 * item from the bui format structure which was logged on disk.

 * It allocates an in-core bui, copies the extents from the format

 * structure into it, and adds the bui to the AIL with the given

 * LSN.

 */

STATIC int

xlog_recover_bui_pass2(

	struct xlog			*log,

	struct xlog_recover_item	*item,

	xfs_lsn_t			lsn)

{

	int				error;

	struct xfs_mount		*mp = log->l_mp;

	struct xfs_bui_log_item		*buip;

	struct xfs_bui_log_format	*bui_formatp;



	bui_formatp = item->ri_buf[0].i_addr;



	if (bui_formatp->bui_nextents != XFS_BUI_MAX_FAST_EXTENTS)

		return -EFSCORRUPTED;

	buip = xfs_bui_init(mp);

	error = xfs_bui_copy_format(&item->ri_buf[0], &buip->bui_format);

	if (error) {

		xfs_bui_item_free(buip);

		return error;

	}

	atomic_set(&buip->bui_next_extent, bui_formatp->bui_nextents);



	spin_lock(&log->l_ailp->xa_lock);

	/*

	 * The RUI has two references. One for the RUD and one for RUI to ensure

	 * it makes it into the AIL. Insert the RUI into the AIL directly and

	 * drop the RUI reference. Note that xfs_trans_ail_update() drops the

	 * AIL lock.

	 */

	xfs_trans_ail_update(log->l_ailp, &buip->bui_item, lsn);

	xfs_bui_release(buip);

	return 0;

}





/*

 * This routine is called when an BUD format structure is found in a committed

 * transaction in the log. Its purpose is to cancel the corresponding BUI if it

 * was still in the log. To do this it searches the AIL for the BUI with an id

 * equal to that in the BUD format structure. If we find it we drop the BUD

 * reference, which removes the BUI from the AIL and frees it.

 */

STATIC int

xlog_recover_bud_pass2(

	struct xlog			*log,

	struct xlog_recover_item	*item)

{

	struct xfs_bud_log_format	*bud_formatp;

	struct xfs_bui_log_item		*buip = NULL;

	struct xfs_log_item		*lip;

	__uint64_t			bui_id;

	struct xfs_ail_cursor		cur;

	struct xfs_ail			*ailp = log->l_ailp;



	bud_formatp = item->ri_buf[0].i_addr;

	if (item->ri_buf[0].i_len != sizeof(struct xfs_bud_log_format))

		return -EFSCORRUPTED;

	bui_id = bud_formatp->bud_bui_id;



	/*

	 * Search for the BUI with the id in the BUD format structure in the

	 * AIL.

	 */

	spin_lock(&ailp->xa_lock);

	lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);

	while (lip != NULL) {

		if (lip->li_type == XFS_LI_BUI) {

			buip = (struct xfs_bui_log_item *)lip;

			if (buip->bui_format.bui_id == bui_id) {

				/*

				 * Drop the BUD reference to the BUI. This

				 * removes the BUI from the AIL and frees it.

				 */

				spin_unlock(&ailp->xa_lock);

				xfs_bui_release(buip);

				spin_lock(&ailp->xa_lock);

				break;

			}

		}

		lip = xfs_trans_ail_cursor_next(ailp, &cur);

	}



	xfs_trans_ail_cursor_done(&cur);

	spin_unlock(&ailp->xa_lock);



	return 0;

}



/*

 * This routine is called when an inode create format structure is found in a

 * committed transaction in the log.  It's purpose is to initialise the inodes
@@ -3899,6 +4021,8 @@ xlog_recover_ra_pass2( 
	case XFS_LI_RUD:

	case XFS_LI_CUI:

	case XFS_LI_CUD:

	case XFS_LI_BUI:

	case XFS_LI_BUD:

	default:

		break;

	}
@@ -3926,6 +4050,8 @@ xlog_recover_commit_pass1( 
	case XFS_LI_RUD:

	case XFS_LI_CUI:

	case XFS_LI_CUD:

	case XFS_LI_BUI:

	case XFS_LI_BUD:

		/* nothing to do in pass 1 */

		return 0;

	default:
@@ -3964,6 +4090,10 @@ xlog_recover_commit_pass2( 
		return xlog_recover_cui_pass2(log, item, trans->r_lsn);

	case XFS_LI_CUD:

		return xlog_recover_cud_pass2(log, item);

	case XFS_LI_BUI:

		return xlog_recover_bui_pass2(log, item, trans->r_lsn);

	case XFS_LI_BUD:

		return xlog_recover_bud_pass2(log, item);

	case XFS_LI_DQUOT:

		return xlog_recover_dquot_pass2(log, buffer_list, item,

						trans->r_lsn);
@@ -4591,6 +4721,46 @@ xlog_recover_cancel_cui( 
	spin_lock(&ailp->xa_lock);

}



/* Recover the BUI if necessary. */

STATIC int

xlog_recover_process_bui(

	struct xfs_mount		*mp,

	struct xfs_ail			*ailp,

	struct xfs_log_item		*lip)

{

	struct xfs_bui_log_item		*buip;

	int				error;



	/*

	 * Skip BUIs that we've already processed.

	 */

	buip = container_of(lip, struct xfs_bui_log_item, bui_item);

	if (test_bit(XFS_BUI_RECOVERED, &buip->bui_flags))

		return 0;



	spin_unlock(&ailp->xa_lock);

	error = xfs_bui_recover(mp, buip);

	spin_lock(&ailp->xa_lock);



	return error;

}



/* Release the BUI since we're cancelling everything. */

STATIC void

xlog_recover_cancel_bui(

	struct xfs_mount		*mp,

	struct xfs_ail			*ailp,

	struct xfs_log_item		*lip)

{

	struct xfs_bui_log_item		*buip;



	buip = container_of(lip, struct xfs_bui_log_item, bui_item);



	spin_unlock(&ailp->xa_lock);

	xfs_bui_release(buip);

	spin_lock(&ailp->xa_lock);

}



/* Is this log item a deferred action intent? */

static inline bool xlog_item_is_intent(struct xfs_log_item *lip)

{
@@ -4598,6 +4768,7 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip) 
	case XFS_LI_EFI:

	case XFS_LI_RUI:

	case XFS_LI_CUI:

	case XFS_LI_BUI:

		return true;

	default:

		return false;
@@ -4664,6 +4835,9 @@ xlog_recover_process_intents( 
		case XFS_LI_CUI:

			error = xlog_recover_process_cui(log->l_mp, ailp, lip);

			break;

		case XFS_LI_BUI:

			error = xlog_recover_process_bui(log->l_mp, ailp, lip);

			break;

		}

		if (error)

			goto out;
@@ -4714,6 +4888,9 @@ xlog_recover_cancel_intents( 
		case XFS_LI_CUI:

			xlog_recover_cancel_cui(log->l_mp, ailp, lip);

			break;

		case XFS_LI_BUI:

			xlog_recover_cancel_bui(log->l_mp, ailp, lip);

			break;

		}



		lip = xfs_trans_ail_cursor_next(ailp, &cur);