From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
"Theodore Y. Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>,
Jeff Moyer <jmoyer@redhat.com>,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH V7 4/9] fs/xfs: Make DAX mount option a tri-state
Date: Sun, 12 Apr 2020 22:40:41 -0700 [thread overview]
Message-ID: <20200413054046.1560106-5-ira.weiny@intel.com> (raw)
In-Reply-To: <20200413054046.1560106-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
As agreed upon[1]. We make the dax mount option a tri-state. '-o dax'
continues to operate the same. We add 'always', 'never', and 'inode'
(default).
[1] https://lore.kernel.org/lkml/20200405061945.GA94792@iweiny-DESK2.sc.intel.com/
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from v6:
Use 2 flag bits rather than a field.
change iflag to inode
Changes from v5:
New Patch
---
fs/xfs/xfs_mount.h | 3 ++-
fs/xfs/xfs_super.c | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 88ab09ed29e7..d581b990e59a 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -233,7 +233,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! */
+#define XFS_MOUNT_DAX (1ULL << 62)
+#define XFS_MOUNT_NODAX (1ULL << 63)
/*
* Max and min values for mount-option defined I/O
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 2094386af8ac..d7bd8f5e00c9 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -47,6 +47,32 @@ static struct kset *xfs_kset; /* top-level xfs sysfs dir */
static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */
#endif
+enum {
+ XFS_DAX_INODE = 0,
+ XFS_DAX_ALWAYS = 1,
+ XFS_DAX_NEVER = 2,
+};
+
+static void xfs_mount_set_dax_mode(struct xfs_mount *mp, u32 val)
+{
+ if (val == XFS_DAX_INODE) {
+ mp->m_flags &= ~(XFS_MOUNT_DAX | XFS_MOUNT_NODAX);
+ } else if (val == XFS_DAX_ALWAYS) {
+ mp->m_flags &= ~XFS_MOUNT_NODAX;
+ mp->m_flags |= XFS_MOUNT_DAX;
+ } else if (val == XFS_DAX_NEVER) {
+ mp->m_flags &= ~XFS_MOUNT_DAX;
+ mp->m_flags |= XFS_MOUNT_NODAX;
+ }
+}
+
+static const struct constant_table dax_param_enums[] = {
+ {"inode", XFS_DAX_INODE },
+ {"always", XFS_DAX_ALWAYS },
+ {"never", XFS_DAX_NEVER },
+ {}
+};
+
/*
* Table driven mount option parser.
*/
@@ -59,7 +85,7 @@ enum {
Opt_filestreams, Opt_quota, Opt_noquota, Opt_usrquota, Opt_grpquota,
Opt_prjquota, Opt_uquota, Opt_gquota, Opt_pquota,
Opt_uqnoenforce, Opt_gqnoenforce, Opt_pqnoenforce, Opt_qnoenforce,
- Opt_discard, Opt_nodiscard, Opt_dax,
+ Opt_discard, Opt_nodiscard, Opt_dax, Opt_dax_enum,
};
static const struct fs_parameter_spec xfs_fs_parameters[] = {
@@ -103,6 +129,7 @@ static const struct fs_parameter_spec xfs_fs_parameters[] = {
fsparam_flag("discard", Opt_discard),
fsparam_flag("nodiscard", Opt_nodiscard),
fsparam_flag("dax", Opt_dax),
+ fsparam_enum("dax", Opt_dax_enum, dax_param_enums),
{}
};
@@ -129,7 +156,6 @@ xfs_fs_show_options(
{ XFS_MOUNT_GRPID, ",grpid" },
{ XFS_MOUNT_DISCARD, ",discard" },
{ XFS_MOUNT_LARGEIO, ",largeio" },
- { XFS_MOUNT_DAX, ",dax" },
{ 0, NULL }
};
struct xfs_mount *mp = XFS_M(root->d_sb);
@@ -185,6 +211,13 @@ xfs_fs_show_options(
if (!(mp->m_qflags & XFS_ALL_QUOTA_ACCT))
seq_puts(m, ",noquota");
+ if (mp->m_flags & XFS_MOUNT_DAX)
+ seq_puts(m, ",dax=always");
+ else if (mp->m_flags & XFS_MOUNT_NODAX)
+ seq_puts(m, ",dax=never");
+ else
+ seq_puts(m, ",dax=inode");
+
return 0;
}
@@ -1244,7 +1277,10 @@ xfs_fc_parse_param(
return 0;
#ifdef CONFIG_FS_DAX
case Opt_dax:
- mp->m_flags |= XFS_MOUNT_DAX;
+ xfs_mount_set_dax_mode(mp, XFS_DAX_ALWAYS);
+ return 0;
+ case Opt_dax_enum:
+ xfs_mount_set_dax_mode(mp, result.uint_32);
return 0;
#endif
default:
@@ -1451,7 +1487,7 @@ xfs_fc_fill_super(
if (!rtdev_is_dax && !datadev_is_dax) {
xfs_alert(mp,
"DAX unsupported by block device. Turning off DAX.");
- mp->m_flags &= ~XFS_MOUNT_DAX;
+ xfs_mount_set_dax_mode(mp, XFS_DAX_NEVER);
}
if (xfs_sb_version_hasreflink(&mp->m_sb)) {
xfs_alert(mp,
--
2.25.1
next prev parent reply other threads:[~2020-04-13 5:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 5:40 [PATCH V7 0/9] Enable per-file/per-directory DAX operations V7 ira.weiny
2020-04-13 5:40 ` [PATCH V7 1/9] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-04-13 15:41 ` Darrick J. Wong
2020-04-13 5:40 ` [PATCH V7 2/9] fs: Remove unneeded IS_DAX() check in io_is_direct() ira.weiny
2020-04-14 6:22 ` Christoph Hellwig
2020-04-13 5:40 ` [PATCH V7 3/9] fs/stat: Define DAX statx attribute ira.weiny
2020-04-14 6:23 ` Christoph Hellwig
2020-04-14 20:39 ` Ira Weiny
2020-04-13 5:40 ` ira.weiny [this message]
2020-04-13 15:46 ` [PATCH V7 4/9] fs/xfs: Make DAX mount option a tri-state Darrick J. Wong
2020-04-13 19:28 ` Ira Weiny
2020-04-14 6:24 ` Christoph Hellwig
2020-04-14 6:25 ` Christoph Hellwig
2020-04-14 20:34 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 5/9] fs/xfs: Create function xfs_inode_enable_dax() ira.weiny
2020-04-13 15:52 ` Darrick J. Wong
2020-04-13 19:39 ` Ira Weiny
2020-04-14 6:27 ` Christoph Hellwig
2020-04-14 20:43 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 6/9] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags() ira.weiny
2020-04-13 16:01 ` Darrick J. Wong
2020-04-14 4:07 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 7/9] fs: Define I_DONTCACNE in VFS layer ira.weiny
2020-04-13 16:09 ` Darrick J. Wong
2020-04-13 16:13 ` Darrick J. Wong
2020-04-13 19:44 ` Ira Weiny
2020-04-14 15:26 ` Jan Kara
2020-04-14 15:45 ` Ira Weiny
2020-04-14 15:59 ` Jan Kara
2020-04-13 5:40 ` [PATCH V7 8/9] fs/xfs: Change xfs_ioctl_setattr_dax_invalidate() ira.weiny
2020-04-13 16:12 ` Darrick J. Wong
2020-04-13 19:46 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 9/9] Documentation/dax: Update Usage section ira.weiny
2020-04-13 16:19 ` Darrick J. Wong
2020-04-14 4:38 ` Ira Weiny
2020-04-14 5:12 ` Dan Williams
2020-04-14 19:48 ` Ira Weiny
2020-04-15 8:23 ` Jan Kara
2020-04-14 5:21 ` Dan Williams
2020-04-14 16:15 ` Darrick J. Wong
2020-04-14 19:04 ` Dan Williams
2020-04-14 19:57 ` Darrick J. Wong
2020-04-14 20:00 ` Ira Weiny
2020-04-14 20:18 ` Darrick J. Wong
2020-04-14 20:54 ` Ira Weiny
2020-04-14 21:02 ` Darrick J. Wong
2020-04-14 19:58 ` Ira Weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200413054046.1560106-5-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).