@@ -752,6 +752,55 @@ xfs_file_write_iter(
return ret;
}
+static int xfs_wait_dax_page(
+ atomic_t *count,
+ unsigned int mode)
+{
+ uint iolock = XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL;
+ struct page *page = refcount_to_page(count);
+ struct address_space *mapping = page->mapping;
+ struct inode *inode = mapping->host;
+ struct xfs_inode *ip = XFS_I(inode);
+
+ ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL));
+
+ if (page_ref_count(page) == 1)
+ return 0;
+
+ xfs_iunlock(ip, iolock);
+ schedule();
+ xfs_ilock(ip, iolock);
+
+ if (signal_pending_state(mode, current))
+ return -EINTR;
+ return 1;
+}
+
+static int
+xfs_break_dax_layouts(
+ struct inode *inode,
+ uint iolock)
+{
+ struct page *page;
+ int ret;
+
+ page = dax_layout_busy_page(inode->i_mapping);
+ if (!page)
+ return 0;
+
+ ret = wait_on_atomic_one(&page->_refcount, xfs_wait_dax_page,
+ TASK_INTERRUPTIBLE);
+
+ if (ret <= 0)
+ return ret;
+
+ /*
+ * We slept, so need to retry. Yes, this assumes transient page
+ * pins.
+ */
+ return -EBUSY;
+}
+
int
xfs_break_layouts(
struct inode *inode,
@@ -765,12 +814,25 @@ xfs_break_layouts(
if (flags & XFS_BREAK_REMOTE)
iolock_assert |= XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL;
if (flags & XFS_BREAK_MAPS)
- iolock_assert |= XFS_MMAPLOCK_EXCL;
+ iolock_assert |= XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL;
ASSERT(xfs_isilocked(ip, iolock_assert));
- if (flags & XFS_BREAK_REMOTE)
- ret = xfs_break_leased_layouts(inode, iolock);
+ do {
+ if (flags & XFS_BREAK_REMOTE)
+ ret = xfs_break_leased_layouts(inode, iolock);
+ if (ret)
+ return ret;
+ if (flags & XFS_BREAK_MAPS)
+ ret = xfs_break_dax_layouts(inode, *iolock);
+ /*
+ * EBUSY indicates that we dropped locks and waited for
+ * the dax layout to be released. When that happens we
+ * need to revalidate that no new leases or pinned dax
+ * mappings have been established.
+ */
+ } while (ret == -EBUSY);
+
return ret;
}
xfs_break_dax_layouts(), similar to xfs_break_leased_layouts(), scans for busy / pinned dax pages and waits for those pages to go idle before any potential extent unmap operation. dax_layout_busy_page() handles synchronizing against new page-busy events (get_user_pages). It invalidates all mappings to trigger the get_user_pages slow path which will eventually block on the xfs inode log held in XFS_MMAPLOCK_EXCL mode. If dax_layout_busy_page() finds a busy page it returns it for xfs to wait for the page-idle event that will fire when the page reference count reaches 1 (recall ZONE_DEVICE pages are idle at count 1). While waiting, the XFS_MMAPLOCK_EXCL lock is dropped in order to not deadlock the process that might be trying to elevate the page count of more pages before arranging for any of them to go idle. I.e. the typical case of submitting I/O is that iov_iter_get_pages() elevates the reference count of all pages in the I/O before starting I/O on the first page. Cc: Jan Kara <jack@suse.cz> Cc: Dave Chinner <david@fromorbit.com> Cc: "Darrick J. Wong" <darrick.wong@oracle.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- fs/xfs/xfs_file.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html