Commit 6851a3db authored Sep 18, 2017 by Ross Zwisler Committed by Darrick J. Wong Sep 26, 2017

xfs: validate bdev support for DAX inode flag



Currently only the blocksize is checked, but we should really be calling
bdev_dax_supported() which also tests to make sure we can get a
struct dax_device and that the dax_direct_access() path is working.

This is the same check that we do for the "-o dax" mount option in
xfs_fs_fill_super().

This does not fix the race issues that caused the XFS DAX inode option to
be disabled, so that option will still be disabled.  If/when we re-enable
it, though, I think we will want this issue to have been fixed.  I also do
think that we want to fix this in stable kernels.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
CC: stable@vger.kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 60915f83

fs/xfs/xfs_ioctl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1088,6 +1088,7 @@ xfs_ioctl_setattr_dax_invalidate(
		int *join_flags)
		{
		struct inode *inode = VFS_I(ip);
		struct super_block *sb = inode->i_sb;
		int error;

		*join_flags = 0;
		@@ -1100,7 +1101,7 @@ xfs_ioctl_setattr_dax_invalidate(
		if (fa->fsx_xflags & FS_XFLAG_DAX) {
		if (!(S_ISREG(inode->i_mode) \|\| S_ISDIR(inode->i_mode)))
		return -EINVAL;
		if (ip->i_mount->m_sb.sb_blocksize != PAGE_SIZE)
		if (bdev_dax_supported(sb, sb->s_blocksize) < 0)
		return -EINVAL;
		}

Admin message