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

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

xfs: add initial DAX support 



Add initial DAX support to XFS. To do this we need a new mount
option to turn DAX on filesystem, and we need to propagate this into
the inode flags whenever an inode is instantiated so that the
per-inode checks throughout the code Do The Right Thing.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 6e1ba0bc

fs/xfs/xfs_iops.c

+12 −12
Original line number Diff line number Diff line
@@ -1195,22 +1195,22 @@ xfs_diflags_to_iflags( 
	struct inode		*inode,

	struct xfs_inode	*ip)

{

	if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE)

	uint16_t		flags = ip->i_d.di_flags;



	inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | S_SYNC |

			    S_NOATIME | S_DAX);



	if (flags & XFS_DIFLAG_IMMUTABLE)

		inode->i_flags |= S_IMMUTABLE;

	else

		inode->i_flags &= ~S_IMMUTABLE;

	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)

	if (flags & XFS_DIFLAG_APPEND)

		inode->i_flags |= S_APPEND;

	else

		inode->i_flags &= ~S_APPEND;

	if (ip->i_d.di_flags & XFS_DIFLAG_SYNC)

	if (flags & XFS_DIFLAG_SYNC)

		inode->i_flags |= S_SYNC;

	else

		inode->i_flags &= ~S_SYNC;

	if (ip->i_d.di_flags & XFS_DIFLAG_NOATIME)

	if (flags & XFS_DIFLAG_NOATIME)

		inode->i_flags |= S_NOATIME;

	else

		inode->i_flags &= ~S_NOATIME;

	/* XXX: Also needs an on-disk per inode flag! */

	if (ip->i_mount->m_flags & XFS_MOUNT_DAX)

		inode->i_flags |= S_DAX;

}



/*

fs/xfs/xfs_mount.h

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ typedef struct xfs_mount { 
						   allocator */

#define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */



#define XFS_MOUNT_DAX		(1ULL << 62)	/* TEST ONLY! */





/*

 * Default minimum read and write sizes.

fs/xfs/xfs_super.c

+23 −2
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */ 
#define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */

#define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */



#define MNTOPT_DAX	"dax"		/* Enable direct access to bdev pages */



/*

 * Table driven mount option parser.

 *
@@ -363,6 +365,10 @@ xfs_parseargs( 
			mp->m_flags |= XFS_MOUNT_DISCARD;

		} else if (!strcmp(this_char, MNTOPT_NODISCARD)) {

			mp->m_flags &= ~XFS_MOUNT_DISCARD;

#ifdef CONFIG_FS_DAX

		} else if (!strcmp(this_char, MNTOPT_DAX)) {

			mp->m_flags |= XFS_MOUNT_DAX;

#endif

		} else {

			xfs_warn(mp, "unknown mount option [%s].", this_char);

			return -EINVAL;
@@ -452,7 +458,7 @@ done: 
}



struct proc_xfs_info {

	int	flag;

	uint64_t	flag;

	char		*str;

};
@@ -474,6 +480,7 @@ xfs_showargs( 
		{ XFS_MOUNT_GRPID,		"," MNTOPT_GRPID },

		{ XFS_MOUNT_DISCARD,		"," MNTOPT_DISCARD },

		{ XFS_MOUNT_SMALL_INUMS,	"," MNTOPT_32BITINODE },

		{ XFS_MOUNT_DAX,		"," MNTOPT_DAX },

		{ 0, NULL }

	};

	static struct proc_xfs_info xfs_info_unset[] = {
@@ -1507,6 +1514,20 @@ xfs_fs_fill_super( 
	if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)

		sb->s_flags |= MS_I_VERSION;



	if (mp->m_flags & XFS_MOUNT_DAX) {

		xfs_warn(mp,

	"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");

		if (sb->s_blocksize != PAGE_SIZE) {

			xfs_alert(mp,

		"Filesystem block size invalid for DAX Turning DAX off.");

			mp->m_flags &= ~XFS_MOUNT_DAX;

		} else if (!sb->s_bdev->bd_disk->fops->direct_access) {

			xfs_alert(mp,

		"Block device does not support DAX Turning DAX off.");

			mp->m_flags &= ~XFS_MOUNT_DAX;

		}

	}



	error = xfs_mountfs(mp);

	if (error)

		goto out_filestream_unmount;