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

Commit 46eeb521 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: introduce refcount btree definitions 



Add new per-AG refcount btree definitions to the per-AG structures.

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

fs/xfs/libxfs/xfs_alloc.c

+5 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,10 @@ xfs_agf_verify( 
	    be32_to_cpu(agf->agf_btreeblks) > be32_to_cpu(agf->agf_length))

		return false;



	if (xfs_sb_version_hasreflink(&mp->m_sb) &&

	    be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS)

		return false;



	return true;;



}
@@ -2578,6 +2582,7 @@ xfs_alloc_read_agf( 
			be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]);

		pag->pagf_levels[XFS_BTNUM_RMAPi] =

			be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]);

		pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level);

		spin_lock_init(&pag->pagb_lock);

		pag->pagb_count = 0;

		pag->pagb_tree = RB_ROOT;

fs/xfs/libxfs/xfs_btree.c

+3 −2
Original line number Diff line number Diff line
@@ -45,9 +45,10 @@ kmem_zone_t *xfs_btree_cur_zone; 
 */

static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {

	{ XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, 0, XFS_BMAP_MAGIC, XFS_IBT_MAGIC,

	  XFS_FIBT_MAGIC },

	  XFS_FIBT_MAGIC, 0 },

	{ XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, XFS_RMAP_CRC_MAGIC,

	  XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC, XFS_FIBT_CRC_MAGIC }

	  XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC, XFS_FIBT_CRC_MAGIC,

	  XFS_REFC_CRC_MAGIC }

};

#define xfs_btree_magic(cur) \

	xfs_magics[!!((cur)->bc_flags & XFS_BTREE_CRC_BLOCKS)][cur->bc_btnum]

fs/xfs/libxfs/xfs_btree.h

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ union xfs_btree_rec { 
#define	XFS_BTNUM_INO	((xfs_btnum_t)XFS_BTNUM_INOi)

#define	XFS_BTNUM_FINO	((xfs_btnum_t)XFS_BTNUM_FINOi)

#define	XFS_BTNUM_RMAP	((xfs_btnum_t)XFS_BTNUM_RMAPi)

#define	XFS_BTNUM_REFC	((xfs_btnum_t)XFS_BTNUM_REFCi)



/*

 * For logging record fields.
@@ -105,6 +106,7 @@ do { \ 
	case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(__mp, ibt, stat); break; \

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(__mp, fibt, stat); break; \

	case XFS_BTNUM_RMAP: __XFS_BTREE_STATS_INC(__mp, rmap, stat); break; \

	case XFS_BTNUM_REFC: __XFS_BTREE_STATS_INC(__mp, refcbt, stat); break; \

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break;	\

	}       \

} while (0)
@@ -127,6 +129,8 @@ do { \ 
		__XFS_BTREE_STATS_ADD(__mp, fibt, stat, val); break; \

	case XFS_BTNUM_RMAP:	\

		__XFS_BTREE_STATS_ADD(__mp, rmap, stat, val); break; \

	case XFS_BTNUM_REFC:	\

		__XFS_BTREE_STATS_ADD(__mp, refcbt, stat, val); break; \

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break; \

	}       \

} while (0)

fs/xfs/libxfs/xfs_format.h

+27 −4
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ xfs_sb_has_compat_feature( 


#define XFS_SB_FEAT_RO_COMPAT_FINOBT   (1 << 0)		/* free inode btree */

#define XFS_SB_FEAT_RO_COMPAT_RMAPBT   (1 << 1)		/* reverse map btree */

#define XFS_SB_FEAT_RO_COMPAT_REFLINK  (1 << 2)		/* reflinked files */

#define XFS_SB_FEAT_RO_COMPAT_ALL \

		(XFS_SB_FEAT_RO_COMPAT_FINOBT | \

		 XFS_SB_FEAT_RO_COMPAT_RMAPBT)
@@ -546,6 +547,12 @@ static inline bool xfs_sb_version_hasrmapbt(struct xfs_sb *sbp) 
		(sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RMAPBT);

}



static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp)

{

	return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&

		(sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_REFLINK);

}



/*

 * end of superblock version macros

 */
@@ -641,14 +648,17 @@ typedef struct xfs_agf { 
	uuid_t		agf_uuid;	/* uuid of filesystem */



	__be32		agf_rmap_blocks;	/* rmapbt blocks used */

	__be32		agf_padding;		/* padding */

	__be32		agf_refcount_blocks;	/* refcountbt blocks used */



	__be32		agf_refcount_root;	/* refcount tree root block */

	__be32		agf_refcount_level;	/* refcount btree levels */



	/*

	 * reserve some contiguous space for future logged fields before we add

	 * the unlogged fields. This makes the range logging via flags and

	 * structure offsets much simpler.

	 */

	__be64		agf_spare64[15];

	__be64		agf_spare64[14];



	/* unlogged fields, written during buffer writeback. */

	__be64		agf_lsn;	/* last write sequence */
@@ -1041,9 +1051,14 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) 
 * 16 bits of the XFS_XFLAG_s range.

 */

#define XFS_DIFLAG2_DAX_BIT	0	/* use DAX for this inode */

#define XFS_DIFLAG2_REFLINK_BIT	1	/* file's blocks may be shared */

#define XFS_DIFLAG2_COWEXTSIZE_BIT   2  /* copy on write extent size hint */

#define XFS_DIFLAG2_DAX		(1 << XFS_DIFLAG2_DAX_BIT)

#define XFS_DIFLAG2_REFLINK     (1 << XFS_DIFLAG2_REFLINK_BIT)

#define XFS_DIFLAG2_COWEXTSIZE  (1 << XFS_DIFLAG2_COWEXTSIZE_BIT)



#define XFS_DIFLAG2_ANY		(XFS_DIFLAG2_DAX)

#define XFS_DIFLAG2_ANY \

	(XFS_DIFLAG2_DAX | XFS_DIFLAG2_REFLINK | XFS_DIFLAG2_COWEXTSIZE)



/*

 * Inode number format:
@@ -1353,7 +1368,8 @@ struct xfs_owner_info { 
#define XFS_RMAP_OWN_AG		(-5ULL)	/* AG freespace btree blocks */

#define XFS_RMAP_OWN_INOBT	(-6ULL)	/* Inode btree blocks */

#define XFS_RMAP_OWN_INODES	(-7ULL)	/* Inode chunk */

#define XFS_RMAP_OWN_MIN	(-8ULL) /* guard */

#define XFS_RMAP_OWN_REFC	(-8ULL) /* refcount tree */

#define XFS_RMAP_OWN_MIN	(-9ULL) /* guard */



#define XFS_RMAP_NON_INODE_OWNER(owner)	(!!((owner) & (1ULL << 63)))
@@ -1433,6 +1449,13 @@ typedef __be32 xfs_rmap_ptr_t; 
	 XFS_FIBT_BLOCK(mp) + 1 : \

	 XFS_IBT_BLOCK(mp) + 1)



/*

 * Reference Count Btree format definitions

 *

 */

#define	XFS_REFC_CRC_MAGIC	0x52334643	/* 'R3FC' */





/*

 * BMAP Btree format definitions

 *

fs/xfs/libxfs/xfs_rmap_btree.c

+20 −2
Original line number Diff line number Diff line
@@ -512,6 +512,24 @@ void 
xfs_rmapbt_compute_maxlevels(

	struct xfs_mount		*mp)

{

	/*

	 * On a non-reflink filesystem, the maximum number of rmap

	 * records is the number of blocks in the AG, hence the max

	 * rmapbt height is log_$maxrecs($agblocks).  However, with

	 * reflink each AG block can have up to 2^32 (per the refcount

	 * record format) owners, which means that theoretically we

	 * could face up to 2^64 rmap records.

	 *

	 * That effectively means that the max rmapbt height must be

	 * XFS_BTREE_MAXLEVELS.  "Fortunately" we'll run out of AG

	 * blocks to feed the rmapbt long before the rmapbt reaches

	 * maximum height.  The reflink code uses ag_resv_critical to

	 * disallow reflinking when less than 10% of the per-AG metadata

	 * block reservation since the fallback is a regular file copy.

	 */

	if (xfs_sb_version_hasreflink(&mp->m_sb))

		mp->m_rmap_maxlevels = XFS_BTREE_MAXLEVELS;

	else

		mp->m_rmap_maxlevels = xfs_btree_compute_maxlevels(mp,

				mp->m_rmap_mnr, mp->m_sb.sb_agblocks);

}