smb/client: refresh allocation size after duplicate extents

FSCTL_DUPLICATE_EXTENTS_TO_FILE changes the target file extents on the
server, but the client does not refresh the target AllocationSize/i_blocks.
Callers can observe or use the wrong st_blocks value immediately after the
clone, before a later attribute revalidation corrects it.

For example, create a reflinked file with a leading hole:

        xfs_io -f -c "pwrite -S 0x61 0 64k" src
        touch dst
        chmod 600 dst
        xfs_io -c "reflink src 0 1m 64k" dst
        mkswap dst
        swapon dst

The file still has a hole after mkswap:

        /mnt/scratch/dst:
          [0..7]:       allocated
          [8..2047]:    hole
          [2048..2175]: allocated

The server also reports only the allocated ranges:

        server dst size=1114112 blocks=144

but the client reported EOF-derived blocks:

        client dst size=1114112 blocks=2176

and swapon succeeded:

        swapon_result=success
        /mnt/scratch/dst 1.1M 0B -1

So EOF-derived i_blocks can let a sparse reflinked file pass the CIFS
swapfile hole check.

Fix this by querying FILE_ALL_INFORMATION on the target handle after a
successful duplicate extents request. Update i_blocks from AllocationSize
and keep the refreshed target inode attributes valid so a following stat
does not immediately revalidate again.

If the query fails, mark the cached inode attributes stale so a later
getattr can refresh them.

This also fixes the xfstests generic/370 regression introduced by the
i_blocks accounting change, as tested on a Samba "vfs objects = btrfs"
share.

Fixes: 99cd0a6eeb6c ("smb/client: do not account EOF extension as allocation")
Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Reviewed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 4df6ca03a8de2b24ece7ca9dfe37a2c591f989cc..66b9104e7ca20607111e7dc30e5a84f6e6e68955 100644 (file)
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1490,9 +1490,13 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
                }
        }
 
-       /* force revalidate of size and timestamps of target file now
-          that target is updated on the server */
-       CIFS_I(target_inode)->time = 0;
+       /*
+        * On success, duplicate_extents already updated the target inode attrs
+        * or marked them stale if the refresh failed.  On failure, mark attrs
+        * stale because EOF may have changed before the clone failed.
+        */
+       if (rc)
+               CIFS_I(target_inode)->time = 0;
 unlock:
        /* although unlocking in the reverse order from locking is not
           strictly necessary here it is a little cleaner to be consistent */

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 5f0e268aa644b3690e2bf31676399481fd750987..9bf57a014744f131d1129d8140856ed409f7c7f1 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -2193,10 +2193,14 @@ smb2_duplicate_extents(const unsigned int xid,
                        u64 len, u64 dest_off)
 {
        int rc;
+       int qrc;
        unsigned int ret_data_len;
        struct inode *inode;
+       struct smb2_file_all_info file_inf;
        struct duplicate_extents_to_file dup_ext_buf;
+       struct timespec64 ts;
        struct cifs_tcon *tcon = tlink_tcon(trgtfile->tlink);
+       u64 asize;
 
        /* server fileays advertise duplicate extent support with this flag */
        if ((le32_to_cpu(tcon->fsAttrInfo.Attributes) &
@@ -2232,6 +2236,32 @@ smb2_duplicate_extents(const unsigned int xid,
        if (ret_data_len > 0)
                cifs_dbg(FYI, "Non-zero response length in duplicate extents\n");
 
+       if (rc == 0) {
+               qrc = SMB2_query_info(xid, tcon, trgtfile->fid.persistent_fid,
+                                     trgtfile->fid.volatile_fid, &file_inf);
+               spin_lock(&inode->i_lock);
+               if (qrc == 0) {
+                       asize = le64_to_cpu(file_inf.AllocationSize);
+                       CIFS_I(inode)->time = jiffies;
+                       if (file_inf.LastWriteTime) {
+                               ts = cifs_NTtimeToUnix(file_inf.LastWriteTime);
+                               inode_set_mtime_to_ts(inode, ts);
+                       }
+                       if (file_inf.ChangeTime) {
+                               ts = cifs_NTtimeToUnix(file_inf.ChangeTime);
+                               inode_set_ctime_to_ts(inode, ts);
+                       }
+                       if (file_inf.LastAccessTime) {
+                               ts = cifs_NTtimeToUnix(file_inf.LastAccessTime);
+                               inode_set_atime_to_ts(inode, ts);
+                       }
+                       inode->i_blocks = CIFS_INO_BLOCKS(asize);
+               } else {
+                       CIFS_I(inode)->time = 0; /* force reval */
+               }
+               spin_unlock(&inode->i_lock);
+       }
+
 duplicate_extents_out:
        if (rc)
                trace_smb3_clone_err(xid, srcfile->fid.volatile_fid,