diff mbox

[v2-UPDATE,3/3] xfs: Add alignment check for DAX mount

Message ID 1462376761-15584-1-git-send-email-toshi.kani@hpe.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kani, Toshi May 4, 2016, 3:46 p.m. UTC 
When a partition is not aligned by 4KB, mount -o dax succeeds,
but any read/write access to the filesystem fails, except for
metadata update.

Call bdev_direct_access to check the alignment when -o dax is
specified.

Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Reviewed-by: Boaz Harrosh <boaz@plexistor.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Boaz Harrosh <boaz@plexistor.com>
---
v2-UPDATE
 - Add a period and fix a typo in error messages (Ross Zwisler)
---
 fs/xfs/xfs_super.c |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kani, Toshi May 5, 2016, 2:19 p.m. UTC | #1 
On Thu, 2016-05-05 at 07:21 -0700, Christoph Hellwig wrote:
> > 
> >  	if (mp->m_flags & XFS_MOUNT_DAX) {
> > +		struct blk_dax_ctl dax = {
> > +			.sector = 0,
> > +			.size = PAGE_SIZE,
> > +		};
>
> I'm pretty sure I already complained last week, but this boiler plate
> code has no business in every file systems.  Also it seems to me like
> this struct blk_dax_ctl calling convention is stupid to start with,
> why not pass the arguments directly and avoid the boilerplate code
> everywhere?

Sorry, I was wondering about if we should also consolidate error messages.
Per the thread below, I am going to add a helper function to do it.
https://lkml.org/lkml/2016/5/4/887

Thanks,
-Toshi

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Christoph Hellwig May 5, 2016, 2:21 p.m. UTC | #2 
>  	if (mp->m_flags & XFS_MOUNT_DAX) {
> +		struct blk_dax_ctl dax = {
> +			.sector = 0,
> +			.size = PAGE_SIZE,
> +		};

I'm pretty sure I already complained last week, but this boiler plate
code has no business in every file systems.  Also it seems to me like
this struct blk_dax_ctl calling convention is stupid to start with,
why not pass the arguments directly and avoid the boilerplate code
everywhere?

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 187e14b..ac18fae 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1557,15 +1557,30 @@  xfs_fs_fill_super(
 		sb->s_flags |= MS_I_VERSION;
 
 	if (mp->m_flags & XFS_MOUNT_DAX) {
+		struct blk_dax_ctl dax = {
+			.sector = 0,
+			.size = PAGE_SIZE,
+		};
 		xfs_warn(mp,
-	"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
+		"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.");
+		"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.");
+		} else if ((error = bdev_direct_access(sb->s_bdev, &dax)) < 0) {
+			switch (error) {
+			case -EOPNOTSUPP:
+				xfs_alert(mp,
+			"Block device does not support DAX. Turning DAX off.");
+				break;
+			case -EINVAL:
+				xfs_alert(mp,
+			"Partition alignment invalid for DAX. Turning DAX off.");
+				break;
+			default:
+				xfs_alert(mp,
+			"DAX access failed (%d). Turning DAX off.", error);
+			}
 			mp->m_flags &= ~XFS_MOUNT_DAX;
 		}
 	}