Skip to contentSkip to conversation

fs/remap_range: avoid spurious writeback on zero length request

PATCH Superseded Brian Foster 2 participants 5 messages Nov 28, 2022 – Nov 29, 2022 VFS

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/remap_range: avoid spurious writeback on zero length request

generic_remap_checks() can reduce the effective request length (i.e., after the reflink extend to EOF case is handled) down to zero. If this occurs, __generic_remap_file_range_prep() proceeds through dio serialization, file mapping flush calls, and may invoke file_modified() before returning back to the filesystem caller, all of which immediately check for len == 0 and return.

While this is mostly harmless, it is spurious and not completely without side effect. A filemap write call can submit I/O (but not wait on it) when the specified end byte precedes the start but happens to land on the same aligned page boundary, which can occur from __generic_remap_file_range_prep() when len is 0.

The dedupe path already has a len == 0 check to break out before doing range comparisons. Lift this check a bit earlier in the function to cover the general case of len == 0 and avoid the unnecessary work.

---
 fs/remap_range.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
fs/remap_range.c +2 -3
index 654912d06862..32ea992f9acc 100644
@@ -306,6 +306,8 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 			remap_flags);
 	if (ret)
 		return ret;
+	if (*len == 0)
+		return 0;
 
 	/* Wait for the completion of any pending IOs on both files */
 	inode_dio_wait(inode_in);
@@ -328,9 +330,6 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 	if (remap_flags & REMAP_FILE_DEDUP) {
 		bool		is_same = false;
 
-		if (*len == 0)
-			return 0;
-
 		if (!IS_DAX(inode_in))
 			ret = vfs_dedupe_file_range_compare(file_in, pos_in,
 					file_out, pos_out, *len, &is_same);
Signature · 1 line
2.37.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Brian Foster

generic_remap_checks() can reduce the effective request length (i.e., after the reflink extend to EOF case is handled) down to zero. If this occurs, __generic_remap_file_range_prep() proceeds through dio serialization, file mapping flush calls, and may invoke file_modified() before returning back to the filesystem caller, all of which immediately check for len == 0 and return.

While this is mostly harmless, it is spurious and not completely without side effect. A filemap write call can submit I/O (but not wait on it) when the specified end byte precedes the start but happens to land on the same aligned page boundary, which can occur from __generic_remap_file_range_prep() when len is 0.

Quoted 5 lines

The dedupe path already has a len == 0 check to break out before doing range comparisons. Lift this check a bit earlier in the function to cover the general case of len == 0 and avoid the unnecessary work.

Looks correct,

Should there be an(other) "if (!*len) return 0;" after the generic_remap_check_len call to skip the mtime update if the remap request gets shortened to avoid remapping an unaligned eofblock into the middle of the destination file?

--D

Quoted 30 lines
---
 fs/remap_range.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
fs/remap_range.c +2 -3
index 654912d06862..32ea992f9acc 100644
@@ -306,6 +306,8 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 			remap_flags);
 	if (ret)
 		return ret;
+	if (*len == 0)
+		return 0;
 
 	/* Wait for the completion of any pending IOs on both files */
 	inode_dio_wait(inode_in);
@@ -328,9 +330,6 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 	if (remap_flags & REMAP_FILE_DEDUP) {
 		bool		is_same = false;
 
-		if (*len == 0)
-			return 0;
-
 		if (!IS_DAX(inode_in))
 			ret = vfs_dedupe_file_range_compare(file_in, pos_in,
 					file_out, pos_out, *len, &is_same);
Signature · 1 line
2.37.3
#2 lore raw
Quoted 20 lines · Darrick J. Wong
Quoted 13 lines · Brian Foster

generic_remap_checks() can reduce the effective request length (i.e., after the reflink extend to EOF case is handled) down to zero. If this occurs, __generic_remap_file_range_prep() proceeds through dio serialization, file mapping flush calls, and may invoke file_modified() before returning back to the filesystem caller, all of which immediately check for len == 0 and return.

While this is mostly harmless, it is spurious and not completely without side effect. A filemap write call can submit I/O (but not wait on it) when the specified end byte precedes the start but happens to land on the same aligned page boundary, which can occur from __generic_remap_file_range_prep() when len is 0.

Quoted 5 lines

The dedupe path already has a len == 0 check to break out before doing range comparisons. Lift this check a bit earlier in the function to cover the general case of len == 0 and avoid the unnecessary work.

Quoted 8 lines

Looks correct,

Should there be an(other) "if (!*len) return 0;" after the generic_remap_check_len call to skip the mtime update if the remap request gets shortened to avoid remapping an unaligned eofblock into the middle of the destination file?

Looks sensible to me, though I guess I would do something like the appended diff. Do you want to just fold that into this patch?

Brian

--- 8< ---

fs/remap_range.c +1 -1
index 32ea992f9acc..2f236c9c5802 100644
@@ -347,7 +347,7 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 
 	ret = generic_remap_check_len(inode_in, inode_out, pos_out, len,
 			remap_flags);
-	if (ret)
+	if (ret || *len == 0)
 		return ret;
 
 	/* If can't alter the file contents, we're done. */
#3 lore raw
Quoted 24 lines · Brian Foster
Quoted 23 lines · Darrick J. Wong
Quoted 13 lines · Brian Foster

generic_remap_checks() can reduce the effective request length (i.e., after the reflink extend to EOF case is handled) down to zero. If this occurs, __generic_remap_file_range_prep() proceeds through dio serialization, file mapping flush calls, and may invoke file_modified() before returning back to the filesystem caller, all of which immediately check for len == 0 and return.

While this is mostly harmless, it is spurious and not completely without side effect. A filemap write call can submit I/O (but not wait on it) when the specified end byte precedes the start but happens to land on the same aligned page boundary, which can occur from __generic_remap_file_range_prep() when len is 0.

Quoted 5 lines

The dedupe path already has a len == 0 check to break out before doing range comparisons. Lift this check a bit earlier in the function to cover the general case of len == 0 and avoid the unnecessary work.

Looks correct,

Quoted 8 lines
Quoted 5 lines

Should there be an(other) "if (!*len) return 0;" after the generic_remap_check_len call to skip the mtime update if the remap request gets shortened to avoid remapping an unaligned eofblock into the middle of the destination file?

Looks sensible to me, though I guess I would do something like the appended diff. Do you want to just fold that into this patch?

Yes, could you fold it in and send a v2 with my rvb on it, please?

--D

Quoted 18 lines

Brian

--- 8< ---

fs/remap_range.c +1 -1
index 32ea992f9acc..2f236c9c5802 100644
@@ -347,7 +347,7 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 
 	ret = generic_remap_check_len(inode_in, inode_out, pos_out, len,
 			remap_flags);
-	if (ret)
+	if (ret || *len == 0)
 		return ret;
 
 	/* If can't alter the file contents, we're done. */
#4 lore raw
Quoted 31 lines · Darrick J. Wong
Quoted 30 lines · Brian Foster
Quoted 28 lines · Darrick J. Wong
Quoted 13 lines · Brian Foster

generic_remap_checks() can reduce the effective request length (i.e., after the reflink extend to EOF case is handled) down to zero. If this occurs, __generic_remap_file_range_prep() proceeds through dio serialization, file mapping flush calls, and may invoke file_modified() before returning back to the filesystem caller, all of which immediately check for len == 0 and return.

While this is mostly harmless, it is spurious and not completely without side effect. A filemap write call can submit I/O (but not wait on it) when the specified end byte precedes the start but happens to land on the same aligned page boundary, which can occur from __generic_remap_file_range_prep() when len is 0.

Quoted 5 lines

The dedupe path already has a len == 0 check to break out before doing range comparisons. Lift this check a bit earlier in the function to cover the general case of len == 0 and avoid the unnecessary work.

Looks correct,

Should there be an(other) "if (!*len) return 0;" after the generic_remap_check_len call to skip the mtime update if the remap request gets shortened to avoid remapping an unaligned eofblock into the middle of the destination file?

Quoted 5 lines
Quoted 2 lines

Looks sensible to me, though I guess I would do something like the appended diff. Do you want to just fold that into this patch?

Yes, could you fold it in and send a v2 with my rvb on it, please?

Sure. I'll change both lines to do 'if (ret || *len == 0),' not sure why I didn't do that the first time..

Brian

Quoted 21 lines

--D

Quoted 18 lines

Brian

--- 8< ---

fs/remap_range.c +1 -1
index 32ea992f9acc..2f236c9c5802 100644
@@ -347,7 +347,7 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 
 	ret = generic_remap_check_len(inode_in, inode_out, pos_out, len,
 			remap_flags);
-	if (ret)
+	if (ret || *len == 0)
 		return ret;
 
 	/* If can't alter the file contents, we're done. */