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

fs: allow per-device dax status checking for filesystems 



Change bdev_dax_supported so it takes a bdev parameter.  This enables
multi-device filesystems like xfs to check that a dax device can work for
the particular filesystem.  Once that's in place, actually fix all the
parts of XFS where we need to be able to distinguish between datadev and
rtdev.

This patch fixes the problem where we screw up the dax support checking
in xfs if the datadev and rtdev have different dax capabilities.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[rez: Re-added __bdev_dax_supported() for !CONFIG_FS_DAX cases]
Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
parent d25522f1

drivers/dax/super.c

+13 −13
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); 


/**

 * __bdev_dax_supported() - Check if the device supports dax for filesystem

 * @sb: The superblock of the device

 * @bdev: block device to check

 * @blocksize: The block size of the device

 *

 * This is a library function for filesystems to check if the block device
@@ -82,33 +82,33 @@ EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); 
 *

 * Return: negative errno if unsupported, 0 if supported.

 */

int __bdev_dax_supported(struct super_block *sb, int blocksize)

int __bdev_dax_supported(struct block_device *bdev, int blocksize)

{

	struct block_device *bdev = sb->s_bdev;

	struct dax_device *dax_dev;

	pgoff_t pgoff;

	int err, id;

	void *kaddr;

	pfn_t pfn;

	long len;

	char buf[BDEVNAME_SIZE];



	if (blocksize != PAGE_SIZE) {

		pr_debug("VFS (%s): error: unsupported blocksize for dax\n",

				sb->s_id);

		pr_debug("%s: error: unsupported blocksize for dax\n",

				bdevname(bdev, buf));

		return -EINVAL;

	}



	err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);

	if (err) {

		pr_debug("VFS (%s): error: unaligned partition for dax\n",

				sb->s_id);

		pr_debug("%s: error: unaligned partition for dax\n",

				bdevname(bdev, buf));

		return err;

	}



	dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);

	if (!dax_dev) {

		pr_debug("VFS (%s): error: device does not support dax\n",

				sb->s_id);

		pr_debug("%s: error: device does not support dax\n",

				bdevname(bdev, buf));

		return -EOPNOTSUPP;

	}
@@ -119,8 +119,8 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) 
	put_dax(dax_dev);



	if (len < 1) {

		pr_debug("VFS (%s): error: dax access failed (%ld)\n",

				sb->s_id, len);

		pr_debug("%s: error: dax access failed (%ld)\n",

				bdevname(bdev, buf), len);

		return len < 0 ? len : -EIO;

	}
@@ -137,8 +137,8 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) 
	} else if (pfn_t_devmap(pfn)) {

		/* pass */;

	} else {

		pr_debug("VFS (%s): error: dax support not enabled\n",

				sb->s_id);

		pr_debug("%s: error: dax support not enabled\n",

				bdevname(bdev, buf));

		return -EOPNOTSUPP;

	}

fs/ext2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);



	if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {

		err = bdev_dax_supported(sb, blocksize);

		err = bdev_dax_supported(sb->s_bdev, blocksize);

		if (err) {

			ext2_msg(sb, KERN_ERR,

				"DAX unsupported by block device. Turning off DAX.");

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3732,7 +3732,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
					" that may contain inline data");

			sbi->s_mount_opt &= ~EXT4_MOUNT_DAX;

		}

		err = bdev_dax_supported(sb, blocksize);

		err = bdev_dax_supported(sb->s_bdev, blocksize);

		if (err) {

			ext4_msg(sb, KERN_ERR,

				"DAX unsupported by block device. Turning off DAX.");

fs/xfs/xfs_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,8 @@ 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 (bdev_dax_supported(sb, sb->s_blocksize) < 0)

		if (bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),

				sb->s_blocksize) < 0)

			return -EINVAL;

	}

fs/xfs/xfs_iops.c

+25 −5
Original line number Diff line number Diff line
@@ -1195,6 +1195,30 @@ static const struct inode_operations xfs_inline_symlink_inode_operations = { 
	.update_time		= xfs_vn_update_time,

};



/* Figure out if this file actually supports DAX. */

static bool

xfs_inode_supports_dax(

	struct xfs_inode	*ip)

{

	struct xfs_mount	*mp = ip->i_mount;



	/* Only supported on non-reflinked files. */

	if (!S_ISREG(VFS_I(ip)->i_mode) || xfs_is_reflink_inode(ip))

		return false;



	/* DAX mount option or DAX iflag must be set. */

	if (!(mp->m_flags & XFS_MOUNT_DAX) &&

	    !(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))

		return false;



	/* Block size must match page size */

	if (mp->m_sb.sb_blocksize != PAGE_SIZE)

		return false;



	/* Device has to support DAX too. */

	return xfs_find_daxdev_for_inode(VFS_I(ip)) != NULL;

}



STATIC void

xfs_diflags_to_iflags(

	struct inode		*inode,
@@ -1213,11 +1237,7 @@ xfs_diflags_to_iflags( 
		inode->i_flags |= S_SYNC;

	if (flags & XFS_DIFLAG_NOATIME)

		inode->i_flags |= S_NOATIME;

	if (S_ISREG(inode->i_mode) &&

	    ip->i_mount->m_sb.sb_blocksize == PAGE_SIZE &&

	    !xfs_is_reflink_inode(ip) &&

	    (ip->i_mount->m_flags & XFS_MOUNT_DAX ||

	     ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))

	if (xfs_inode_supports_dax(ip))

		inode->i_flags |= S_DAX;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE