copy_file_range: fix fallback when source create on same txg

In 019dea0a5 we removed the conversion from EAGAIN->EXDEV inside
zfs_clone_range(), but forgot to add a test for EAGAIN to the
copy_file_range() entry points to trigger fallback to a content copy.

This commit fixes that.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Kay Pedersen <mail@mkwg.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #15170
Closes #15172

diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
index 0ffed347fdb7f7e7467714e6653772a07755d83e..ab72e91b4f9ac90f5e81b6731384338c984fccc5 100644 (file)
--- a/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -6288,7 +6288,8 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap)
 
        error = zfs_clone_range(VTOZ(invp), ap->a_inoffp, VTOZ(outvp),
            ap->a_outoffp, &len, ap->a_outcred);
-       if (error == EXDEV || error == EINVAL || error == EOPNOTSUPP)
+       if (error == EXDEV || error == EAGAIN || error == EINVAL ||
+           error == EOPNOTSUPP)
                goto bad_locked_fallback;
        *ap->a_lenp = (size_t)len;
 out_locked:

diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c
index 43ba9a4982023023da689523035d15159c3824a7..2abbf44df5879afc7607379dfe00309dc3f8d2cc 100644 (file)
--- a/module/os/linux/zfs/zpl_file_range.c
+++ b/module/os/linux/zfs/zpl_file_range.c
@@ -103,7 +103,8 @@ zpl_copy_file_range(struct file *src_file, loff_t src_off,
         * Since Linux 5.3 the filesystem driver is responsible for executing
         * an appropriate fallback, and a generic fallback function is provided.
         */
-       if (ret == -EOPNOTSUPP || ret == -EINVAL || ret == -EXDEV)
+       if (ret == -EOPNOTSUPP || ret == -EINVAL || ret == -EXDEV ||
+           ret == -EAGAIN)
                ret = generic_copy_file_range(src_file, src_off, dst_file,
                    dst_off, len, flags);
 #else
@@ -111,7 +112,7 @@ zpl_copy_file_range(struct file *src_file, loff_t src_off,
         * Before Linux 5.3 the filesystem has to return -EOPNOTSUPP to signal
         * to the kernel that it should fallback to a content copy.
         */
-       if (ret == -EINVAL || ret == -EXDEV)
+       if (ret == -EINVAL || ret == -EXDEV || ret == -EAGAIN)
                ret = -EOPNOTSUPP;
 #endif /* HAVE_VFS_GENERIC_COPY_FILE_RANGE */
 

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 8a3b08139b6b0f317ec0a8c5bdf638ab6ea5b7ab..fceb56dfc029ac463161d6222a12c2d1b12a92fa 100644 (file)
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -1246,9 +1246,10 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp,
                    &nbps);
                if (error != 0) {
                        /*
-                        * If we are tyring to clone a block that was created
-                        * in the current transaction group. Return an error,
-                        * so the caller can fallback to just copying the data.
+                        * If we are trying to clone a block that was created
+                        * in the current transaction group, error will be
+                        * EAGAIN here, which we can just return to the caller
+                        * so it can fallback if it likes.
                         */
                        break;
                }

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index 4747b9837337406657ed9ba5be48ba3ee8f7e79c..2c8d5cb0ecbbf0fb03667f47ef1592074b0b013b 100644 (file)
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -41,7 +41,8 @@ tests = ['block_cloning_copyfilerange', 'block_cloning_copyfilerange_partial',
     'block_cloning_ficlonerange_partial',
     'block_cloning_disabled_copyfilerange', 'block_cloning_disabled_ficlone',
     'block_cloning_disabled_ficlonerange',
-    'block_cloning_copyfilerange_cross_dataset']
+    'block_cloning_copyfilerange_cross_dataset',
+    'block_cloning_copyfilerange_fallback_same_txg']
 tags = ['functional', 'block_cloning']
 
 [tests/functional/chattr:Linux]

diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in
index 5c4b3a7bcdc1640e081aa1abcd8704f724b6a73d..e1bbe063ab4c4e0839a5cfc867ccd426c0cad147 100755 (executable)
--- a/tests/test-runner/bin/zts-report.py.in
+++ b/tests/test-runner/bin/zts-report.py.in
@@ -304,6 +304,8 @@ elif sys.platform.startswith('linux'):
             ['SKIP', cfr_reason],
         'block_cloning/block_cloning_copyfilerange_cross_dataset':
             ['SKIP', cfr_cross_reason],
+        'block_cloning/block_cloning_copyfilerange_fallback_same_txg':
+            ['SKIP', cfr_cross_reason],
     })
 
 

diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am
index 3b6b2ef734d094af198c89c10bdd1c796bd7624e..66aff5026f8fb6467a359bd7f11b59763162a669 100644 (file)
--- a/tests/zfs-tests/tests/Makefile.am
+++ b/tests/zfs-tests/tests/Makefile.am
@@ -441,9 +441,10 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
        functional/block_cloning/cleanup.ksh \
        functional/block_cloning/setup.ksh \
        functional/block_cloning/block_cloning_copyfilerange_cross_dataset.ksh \
+       functional/block_cloning/block_cloning_copyfilerange_fallback.ksh \
+       functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh \
        functional/block_cloning/block_cloning_copyfilerange.ksh \
        functional/block_cloning/block_cloning_copyfilerange_partial.ksh \
-       functional/block_cloning/block_cloning_copyfilerange_fallback.ksh \
        functional/block_cloning/block_cloning_disabled_copyfilerange.ksh \
        functional/block_cloning/block_cloning_disabled_ficlone.ksh \
        functional/block_cloning/block_cloning_disabled_ficlonerange.ksh \

diff --git a/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh b/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
new file mode 100755 (executable)
index 0000000..3451f88
--- /dev/null
+++ b/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
@@ -0,0 +1,66 @@
+#!/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or https://opensource.org/licenses/CDDL-1.0.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2023, Klara Inc.
+# Copyright (c) 2023, Rob Norris <robn@despairlabs.com>
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/block_cloning/block_cloning.kshlib
+
+verify_runnable "global"
+
+if [[ $(linux_version) -lt $(linux_version "4.5") ]]; then
+  log_unsupported "copy_file_range not available before Linux 4.5"
+fi
+
+claim="copy_file_range will fall back to copy when cloning on same txg"
+
+log_assert $claim
+
+typeset timeout=$(get_tunable TXG_TIMEOUT)
+
+function cleanup
+{
+       datasetexists $TESTPOOL && destroy_pool $TESTPOOL
+       set_tunable64 TXG_TIMEOUT $timeout
+}
+
+log_onexit cleanup
+
+log_must zpool create -o feature@block_cloning=enabled $TESTPOOL $DISKS
+
+log_must set_tunable64 TXG_TIMEOUT 5000
+
+log_must dd if=/dev/urandom of=/$TESTPOOL/file bs=128K count=4
+log_must clonefile -f /$TESTPOOL/file /$TESTPOOL/clone 0 0 524288
+
+log_must sync_pool $TESTPOOL
+
+log_must have_same_content /$TESTPOOL/file /$TESTPOOL/clone
+
+typeset blocks=$(unique_blocks $TESTPOOL file $TESTPOOL clone)
+log_must [ "$blocks" = "" ]
+
+log_pass $claim
+