Skip to contentSkip to conversation

smb/client: flush dirty data before punching a hole

PATCH New Huiwen He 1 participant 1 message Jul 15

Subsystems (2)
lore
Share & tools
lore

Huiwen He

author
#0 lore raw

PATCH v2 1/1 smb/client: flush dirty data before punching a hole

From: Huiwen He <[email protected]>

Punching a hole after a large buffered write may leave the range reported as data. Reproduce it with:

  xfs_io -f \
    -c "pwrite -b 3m -S 0x61 0 3m" \
    -c "fpunch 1m 1m" \
    -c "seek -h 0" \
    -c "seek -d 1m" \
    /mnt/test/repro

Punching 1 MiB at offset 1 MiB should produce:

  0          1 MiB       2 MiB       3 MiB
  |  DATA    |   HOLE    |   DATA    | EOF

Instead, the entire file is reported as data. SEEK_HOLE(0) returns EOF, and SEEK_DATA(1M) returns 1M.

This happens because a dirty folio spanning the punched range can be written back after the punch and refill the hole.

Fix this by flushing and waiting for dirty data in the punched range before invalidating the page cache and issuing FSCTL_SET_ZERO_DATA.

The xfstests generic/539 pass against Samba/ksmbd with this change.

---
Changes in v2:
- Rebased onto the cifs-2.6 for-next, No functional changes.

Link to v1:
https://lore.kernel.org/linux-cifs/[email protected]

 fs/smb/client/smb2ops.c | 9 +++++++++
 1 file changed, 9 insertions(+)
fs/smb/client/smb2ops.c +9 -0
index 05f2ab6d345a..cbd51a08e97e 100644
@@ -3519,6 +3519,15 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
 		goto out;
 
 	filemap_invalidate_lock(inode->i_mapping);
+	/*
+	 * Flush dirty data first, otherwise a dirty folio spanning the punched
+	 * range may be written back after the ioctl and refill the hole.
+	 */
+	rc = filemap_write_and_wait_range(inode->i_mapping, offset,
+					  offset + len - 1);
+	if (rc < 0)
+		goto unlock;
+
 	/*
 	 * We implement the punch hole through ioctl, so we need remove the page
 	 * caches first, otherwise the data may be inconsistent with the server.
Signature · 1 line
2.43.0