From: ira.weiny@intel.com To: linux-kernel@vger.kernel.org Cc: Ira Weiny <ira.weiny@intel.com>, Alexander Viro <viro@zeniv.linux.org.uk>, "Darrick J. Wong" <darrick.wong@oracle.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>, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 12/12] fs/xfs: Allow toggle of effective DAX flag Date: Sat, 8 Feb 2020 11:34:45 -0800 Message-ID: <20200208193445.27421-13-ira.weiny@intel.com> (raw) In-Reply-To: <20200208193445.27421-1-ira.weiny@intel.com> From: Ira Weiny <ira.weiny@intel.com> Now that locking of the inode is in place we can allow a DAX state change while under the new lock. Signed-off-by: Ira Weiny <ira.weiny@intel.com> --- Changes from V2: Add in lock_dax_state_static_key static branch enabling. fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_ioctl.c | 15 ++++++++++++--- fs/xfs/xfs_iops.c | 15 +++++++++++---- fs/xfs/xfs_super.c | 16 +++++++++------- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 25fe20740bf7..0064f8eef41d 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -469,6 +469,7 @@ int xfs_break_layouts(struct inode *inode, uint *iolock, /* from xfs_iops.c */ extern void xfs_setup_inode(struct xfs_inode *ip); extern void xfs_setup_iops(struct xfs_inode *ip); +extern void xfs_setup_a_ops(struct xfs_inode *ip); /* * When setting up a newly allocated inode, we need to call diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 0134c9e65efb..0736cf45223d 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1123,12 +1123,11 @@ xfs_diflags_to_linux( inode->i_flags |= S_NOATIME; else inode->i_flags &= ~S_NOATIME; -#if 0 /* disabled until the flag switching races are sorted out */ if (xflags & FS_XFLAG_DAX) inode->i_flags |= S_DAX; else inode->i_flags &= ~S_DAX; -#endif + } static int @@ -1194,6 +1193,10 @@ xfs_ioctl_setattr_dax_invalidate( *join_flags = 0; +#if !defined(CONFIG_FS_DAX) + return -EINVAL; +#endif + /* If the DAX state is not changing, we have nothing to do here. */ if ((fa->fsx_xflags & FS_XFLAG_DAX) && (ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)) @@ -1205,7 +1208,7 @@ xfs_ioctl_setattr_dax_invalidate( if (S_ISDIR(inode->i_mode)) return 0; - flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL; + flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL | XFS_DAX_EXCL; /* lock, flush and invalidate mapping in preparation for flag change */ xfs_ilock(ip, flags); @@ -1526,6 +1529,9 @@ xfs_ioctl_setattr( else ip->i_d.di_cowextsize = 0; + if (join_flags & XFS_DAX_EXCL) + xfs_setup_a_ops(ip); + code = xfs_trans_commit(tp); /* @@ -1635,6 +1641,9 @@ xfs_ioc_setxflags( goto out_drop_write; } + if (join_flags & XFS_DAX_EXCL) + xfs_setup_a_ops(ip); + error = xfs_trans_commit(tp); out_drop_write: mnt_drop_write_file(filp); diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index eebec159d873..15ef51c7f0b3 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1366,6 +1366,16 @@ xfs_setup_inode( } } +void xfs_setup_a_ops(struct xfs_inode *ip) +{ + struct inode *inode = &ip->i_vnode; + + if (IS_DAX(inode)) + inode->i_mapping->a_ops = &xfs_dax_aops; + else + inode->i_mapping->a_ops = &xfs_address_space_operations; +} + void xfs_setup_iops( struct xfs_inode *ip) @@ -1376,10 +1386,7 @@ xfs_setup_iops( case S_IFREG: inode->i_op = &xfs_inode_operations; inode->i_fop = &xfs_file_operations; - if (IS_DAX(inode)) - inode->i_mapping->a_ops = &xfs_dax_aops; - else - inode->i_mapping->a_ops = &xfs_address_space_operations; + xfs_setup_a_ops(ip); break; case S_IFDIR: if (xfs_sb_version_hasasciici(&XFS_M(inode->i_sb)->m_sb)) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 2094386af8ac..af57fe07b56d 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1332,6 +1332,7 @@ xfs_fc_fill_super( struct xfs_mount *mp = sb->s_fs_info; struct inode *root; int flags = 0, error; + bool rtdev_is_dax = false, datadev_is_dax; mp->m_super = sb; @@ -1437,17 +1438,18 @@ xfs_fc_fill_super( if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5) sb->s_flags |= SB_I_VERSION; - if (mp->m_flags & XFS_MOUNT_DAX) { - bool rtdev_is_dax = false, datadev_is_dax; + datadev_is_dax = bdev_dax_supported(mp->m_ddev_targp->bt_bdev, + sb->s_blocksize); + if (mp->m_rtdev_targp) + rtdev_is_dax = bdev_dax_supported(mp->m_rtdev_targp->bt_bdev, + sb->s_blocksize); + if (rtdev_is_dax || datadev_is_dax) + enable_dax_state_static_branch(); + if (mp->m_flags & XFS_MOUNT_DAX) { xfs_warn(mp, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); - datadev_is_dax = bdev_dax_supported(mp->m_ddev_targp->bt_bdev, - sb->s_blocksize); - if (mp->m_rtdev_targp) - rtdev_is_dax = bdev_dax_supported( - mp->m_rtdev_targp->bt_bdev, sb->s_blocksize); if (!rtdev_is_dax && !datadev_is_dax) { xfs_alert(mp, "DAX unsupported by block device. Turning off DAX."); -- 2.21.0
next prev parent reply index Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-08 19:34 [PATCH v3 00/12] Enable per-file/directory DAX operations V3 ira.weiny 2020-02-08 19:34 ` [PATCH v3 01/12] fs/stat: Define DAX statx attribute ira.weiny 2020-02-08 19:34 ` [PATCH v3 02/12] fs/xfs: Isolate the physical DAX flag from effective ira.weiny 2020-02-08 19:34 ` [PATCH v3 03/12] fs/xfs: Separate functionality of xfs_inode_supports_dax() ira.weiny 2020-02-11 5:47 ` Dave Chinner 2020-02-11 16:13 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 04/12] fs/xfs: Clean up DAX support check ira.weiny 2020-02-11 5:57 ` Dave Chinner 2020-02-11 16:28 ` Ira Weiny 2020-02-11 20:38 ` Dave Chinner 2020-02-08 19:34 ` [PATCH v3 05/12] fs: remove unneeded IS_DAX() check ira.weiny 2020-02-11 5:34 ` Dave Chinner 2020-02-11 16:38 ` Ira Weiny 2020-02-11 20:41 ` Dave Chinner 2020-02-12 16:04 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 06/12] fs/xfs: Check if the inode supports DAX under lock ira.weiny 2020-02-11 6:16 ` Dave Chinner 2020-02-11 17:55 ` Ira Weiny 2020-02-11 20:42 ` Dave Chinner 2020-02-12 16:10 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 07/12] fs: Add locking for a dynamic DAX state ira.weiny 2020-02-11 8:00 ` Dave Chinner 2020-02-11 20:14 ` Ira Weiny 2020-02-11 20:59 ` Dan Williams 2020-02-11 21:49 ` Dave Chinner 2020-02-12 6:31 ` Darrick J. Wong 2020-02-08 19:34 ` [PATCH v3 08/12] fs/xfs: Clarify lockdep dependency for xfs_isilocked() ira.weiny 2020-02-08 19:34 ` [PATCH v3 09/12] fs/xfs: Add write DAX lock to xfs layer ira.weiny 2020-02-08 19:34 ` [PATCH v3 10/12] fs: Prevent DAX state change if file is mmap'ed ira.weiny 2020-02-08 19:34 ` [PATCH v3 11/12] fs/xfs: Clean up locking in dax invalidate ira.weiny 2020-02-08 19:34 ` ira.weiny [this message] 2020-02-10 15:15 ` [PATCH v3 00/12] Enable per-file/directory DAX operations V3 Jeff Moyer 2020-02-11 20:17 ` Ira Weiny 2020-02-12 19:49 ` Jeff Moyer 2020-02-13 19:01 ` Ira Weiny 2020-02-13 19:05 ` Ira Weiny 2020-02-13 19:58 ` Darrick J. Wong 2020-02-13 23:29 ` Ira Weiny 2020-02-14 0:16 ` Dan Williams 2020-02-14 20:06 ` Ira Weiny 2020-02-14 21:23 ` Jeff Moyer 2020-02-14 21:58 ` Ira Weiny 2020-02-14 22:06 ` Jeff Moyer 2020-02-14 22:58 ` Jeff Moyer 2020-02-14 23:03 ` Jeff Moyer 2020-02-18 2:35 ` Ira Weiny 2020-02-18 14:22 ` Jeff Moyer 2020-02-18 23:54 ` Ira Weiny 2020-02-20 16:20 ` Ira Weiny 2020-02-20 16:30 ` Darrick J. Wong 2020-02-20 16:49 ` Ira Weiny 2020-02-20 17:00 ` Darrick J. Wong
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=20200208193445.27421-13-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=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 \ --cc=viro@zeniv.linux.org.uk \ /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
Linux-ext4 Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-ext4/0 linux-ext4/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-ext4 linux-ext4/ https://lore.kernel.org/linux-ext4 \ linux-ext4@vger.kernel.org public-inbox-index linux-ext4 Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ext4 AGPL code for this site: git clone https://public-inbox.org/public-inbox.git