From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbcEDPy7 (ORCPT ); Wed, 4 May 2016 11:54:59 -0400 Received: from g4t3426.houston.hp.com ([15.201.208.54]:52296 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752936AbcEDPy5 (ORCPT ); Wed, 4 May 2016 11:54:57 -0400 From: Toshi Kani To: dan.j.williams@intel.com, david@fromorbit.com Cc: jack@suse.cz, hch@infradead.org, boaz@plexistor.com, tytso@mit.edu, adilger.kernel@dilger.ca, ross.zwisler@linux.intel.com, toshi.kani@hpe.com, micah.parrish@hpe.com, linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2-UPDATE 3/3] xfs: Add alignment check for DAX mount Date: Wed, 4 May 2016 09:46:01 -0600 Message-Id: <1462376761-15584-1-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.5.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Boaz Harrosh Reviewed-by: Ross Zwisler Cc: Dave Chinner Cc: Dan Williams Cc: Ross Zwisler Cc: Christoph Hellwig Cc: Boaz Harrosh --- 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(-) 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; } }