Commit 74b17c21 authored by Dave Chinner's avatar Dave Chinner Committed by openeuler-sync-bot
Browse files

xfs: reflect sb features in xfs_mount 

mainline inclusion
from mainline-v5.14-rc4
commit a1d86e8d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4KIAO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a1d86e8dec8c1325d301c9d5594bb794bc428fc3



--------------------------------

Currently on-disk feature checks require decoding the superblock
fileds and so can be non-trivial. We have almost 400 hundred
individual feature checks in the XFS code, so this is a significant
amount of code. To reduce runtime check overhead, pre-process all
the version flags into a features field in the xfs_mount at mount
time so we can convert all the feature checks to a simple flag
check.

There is also a need to convert the dynamic feature flags to update
the m_features field. This is required for attr, attr2 and quota
features. New xfs_mount based wrappers are added for this.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>

Conflicts:
	fs/xfs/libxfs/xfs_sb.c

Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
(cherry picked from commit fd78d2ab)
parent a8c85830

fs/xfs/libxfs/xfs_format.h

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static inline bool xfs_sb_version_hasprojid32bit(struct xfs_sb *sbp) 
		(sbp->sb_features2 & XFS_SB_VERSION2_PROJID32BIT));

}



static inline void xfs_sb_version_addprojid32bit(struct xfs_sb *sbp)

static inline void xfs_sb_version_addprojid32(struct xfs_sb *sbp)

{

	sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT;

	sbp->sb_features2 |= XFS_SB_VERSION2_PROJID32BIT;

fs/xfs/libxfs/xfs_sb.c

+64 −0
Original line number Diff line number Diff line
@@ -30,6 +30,70 @@ 
 * Physical superblock buffer manipulations. Shared with libxfs in userspace.

 */



uint64_t

xfs_sb_version_to_features(

	struct xfs_sb	*sbp)

{

	uint64_t	features = 0;



	/* optional V4 features */

	if (sbp->sb_rblocks > 0)

		features |= XFS_FEAT_REALTIME;

	if (sbp->sb_versionnum & XFS_SB_VERSION_ATTRBIT)

		features |= XFS_FEAT_ATTR;

	if (sbp->sb_versionnum & XFS_SB_VERSION_QUOTABIT)

		features |= XFS_FEAT_QUOTA;

	if (sbp->sb_versionnum & XFS_SB_VERSION_ALIGNBIT)

		features |= XFS_FEAT_ALIGN;

	if (sbp->sb_versionnum & XFS_SB_VERSION_LOGV2BIT)

		features |= XFS_FEAT_LOGV2;

	if (sbp->sb_versionnum & XFS_SB_VERSION_DALIGNBIT)

		features |= XFS_FEAT_DALIGN;

	if (sbp->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT)

		features |= XFS_FEAT_EXTFLG;

	if (sbp->sb_versionnum & XFS_SB_VERSION_SECTORBIT)

		features |= XFS_FEAT_SECTOR;

	if (sbp->sb_versionnum & XFS_SB_VERSION_BORGBIT)

		features |= XFS_FEAT_ASCIICI;

	if (sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) {

		if (sbp->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT)

			features |= XFS_FEAT_LAZYSBCOUNT;

		if (sbp->sb_features2 & XFS_SB_VERSION2_ATTR2BIT)

			features |= XFS_FEAT_ATTR2;

		if (sbp->sb_features2 & XFS_SB_VERSION2_PROJID32BIT)

			features |= XFS_FEAT_PROJID32;

		if (sbp->sb_features2 & XFS_SB_VERSION2_FTYPE)

			features |= XFS_FEAT_FTYPE;

	}



	if (XFS_SB_VERSION_NUM(sbp) != XFS_SB_VERSION_5)

		return features;



	/* Always on V5 features */

	features |= XFS_FEAT_ALIGN | XFS_FEAT_LOGV2 | XFS_FEAT_EXTFLG |

		    XFS_FEAT_LAZYSBCOUNT | XFS_FEAT_ATTR2 | XFS_FEAT_PROJID32 |

		    XFS_FEAT_V3INODES | XFS_FEAT_CRC | XFS_FEAT_PQUOTINO;



	/* Optional V5 features */

	if (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_FINOBT)

		features |= XFS_FEAT_FINOBT;

	if (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RMAPBT)

		features |= XFS_FEAT_RMAPBT;

	if (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_REFLINK)

		features |= XFS_FEAT_REFLINK;

	if (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_INOBTCNT)

		features |= XFS_FEAT_INOBTCNT;

	if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_FTYPE)

		features |= XFS_FEAT_FTYPE;

	if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_SPINODES)

		features |= XFS_FEAT_SPINODES;

	if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_META_UUID)

		features |= XFS_FEAT_META_UUID;

	if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_BIGTIME)

		features |= XFS_FEAT_BIGTIME;

	return features;

}



/*

 * Reference counting access wrappers to the perag structures.

 * Because we never free per-ag structures, the only thing we

fs/xfs/libxfs/xfs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ extern void xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp); 
extern void	xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from);

extern void	xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from);

extern void	xfs_sb_quota_from_disk(struct xfs_sb *sbp);

extern uint64_t	xfs_sb_version_to_features(struct xfs_sb *sbp);



extern int	xfs_update_secondary_sbs(struct xfs_mount *mp);

fs/xfs/xfs_log_recover.c

+1 −0
Original line number Diff line number Diff line
@@ -3317,6 +3317,7 @@ xlog_do_recover( 
	xfs_buf_relse(bp);



	/* re-initialise in-core superblock and geometry structures */

	mp->m_features |= xfs_sb_version_to_features(sbp);

	xfs_reinit_percpu_counters(mp);

	error = xfs_initialize_perag(mp, sbp->sb_agcount, &mp->m_maxagi);

	if (error) {

fs/xfs/xfs_mount.c

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ xfs_readsb( 
		goto reread;

	}



	mp->m_features |= xfs_sb_version_to_features(sbp);

	xfs_reinit_percpu_counters(mp);



	/* no need to be quiet anymore, so reset the buf ops */