fs, dax: unify IOMAP_F_DIRTY read vs write handling policy in the dax core

djbw · djbw · commit aaa422c4c3f6 · 2017-11-13T16:38:44.000-08:00
While reviewing whether MAP_SYNC should strengthen its current guarantee
of syncing writes from the initiating process to also include
third-party readers observing dirty metadata, Dave pointed out that the
check of IOMAP_WRITE is misplaced.

The policy of what to with IOMAP_F_DIRTY should be separated from the
generic filesystem mechanism of reporting dirty metadata. Move this
policy to the fs-dax core to simplify the per-filesystem iomap handlers,
and further centralize code that implements the MAP_SYNC policy. This
otherwise should not change behavior, it just makes it easier to change
behavior in the future.

Reviewed-by: Jan Kara &lt;jack@suse.cz&gt;
Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Darrick J. Wong &lt;darrick.wong@oracle.com&gt;
Cc: Ross Zwisler &lt;ross.zwisler@linux.intel.com&gt;
Reported-by: Dave Chinner &lt;david@fromorbit.com&gt;
Signed-off-by: Dan Williams &lt;dan.j.williams@intel.com&gt;
diff --git a/fs/dax.c b/fs/dax.c
@@ -1079,6 +1079,17 @@ static int dax_fault_return(int error)
 	return VM_FAULT_SIGBUS;
 }
 
+/*
+ * MAP_SYNC on a dax mapping guarantees dirty metadata is
+ * flushed on write-faults (non-cow), but not read-faults.
+ */
+static bool dax_fault_is_synchronous(unsigned long flags,
+		struct vm_area_struct *vma, struct iomap *iomap)
+{
+	return (flags & IOMAP_WRITE) && (vma->vm_flags & VM_SYNC)
+		&& (iomap->flags & IOMAP_F_DIRTY);
+}
+
 static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
 			       const struct iomap_ops *ops)
 {
@@ -1170,7 +1181,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
 		goto finish_iomap;
 	}
 
-	sync = (vma->vm_flags & VM_SYNC) && (iomap.flags & IOMAP_F_DIRTY);
+	sync = dax_fault_is_synchronous(flags, vma, &iomap);
 
 	switch (iomap.type) {
 	case IOMAP_MAPPED:
@@ -1390,7 +1401,7 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
 	if (iomap.offset + iomap.length < pos + PMD_SIZE)
 		goto finish_iomap;
 
-	sync = (vma->vm_flags & VM_SYNC) && (iomap.flags & IOMAP_F_DIRTY);
+	sync = dax_fault_is_synchronous(iomap_flags, vma, &iomap);
 
 	switch (iomap.type) {
 	case IOMAP_MAPPED:
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
@@ -3479,7 +3479,7 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
 	}
 
 	iomap->flags = 0;
-	if ((flags & IOMAP_WRITE) && ext4_inode_datasync_dirty(inode))
+	if (ext4_inode_datasync_dirty(inode))
 		iomap->flags |= IOMAP_F_DIRTY;
 	iomap->bdev = inode->i_sb->s_bdev;
 	iomap->dax_dev = sbi->s_daxdev;
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
@@ -1087,8 +1087,8 @@ xfs_file_iomap_begin(
 		trace_xfs_iomap_found(ip, offset, length, 0, &imap);
 	}
 
-	if ((flags & IOMAP_WRITE) && xfs_ipincount(ip) &&
-	    (ip->i_itemp->ili_fsync_fields & ~XFS_ILOG_TIMESTAMP))
+	if (xfs_ipincount(ip) && (ip->i_itemp->ili_fsync_fields
+				& ~XFS_ILOG_TIMESTAMP))
 		iomap->flags |= IOMAP_F_DIRTY;
 
 	xfs_bmbt_to_iomap(ip, iomap, &imap);

Original file line number	Diff line number	Diff line change
`@@ -3479,7 +3479,7 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,`
`3479`	`3479`	`}`
`3480`	`3480`
`3481`	`3481`	`iomap->flags = 0;`
`3482`		`- if ((flags & IOMAP_WRITE) && ext4_inode_datasync_dirty(inode))`
	`3482`	`+ if (ext4_inode_datasync_dirty(inode))`
`3483`	`3483`	`iomap->flags \|= IOMAP_F_DIRTY;`
`3484`	`3484`	`iomap->bdev = inode->i_sb->s_bdev;`
`3485`	`3485`	`iomap->dax_dev = sbi->s_daxdev;`
Original file line number	Diff line number	Diff line change
`@@ -1087,8 +1087,8 @@ xfs_file_iomap_begin(`
`1087`	`1087`	`trace_xfs_iomap_found(ip, offset, length, 0, &imap);`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`		`- if ((flags & IOMAP_WRITE) && xfs_ipincount(ip) &&`
`1091`		`- (ip->i_itemp->ili_fsync_fields & ~XFS_ILOG_TIMESTAMP))`
	`1090`	`+ if (xfs_ipincount(ip) && (ip->i_itemp->ili_fsync_fields`
	`1091`	`+ & ~XFS_ILOG_TIMESTAMP))`
`1092`	`1092`	`iomap->flags \|= IOMAP_F_DIRTY;`
`1093`	`1093`
`1094`	`1094`	`xfs_bmbt_to_iomap(ip, iomap, &imap);`