Re: [PATCH RFC] btrfs-progs: receive: fallback to buffered copy if clone failed
From: Filipe Manana <hidden>
Date: 2021-09-29 09:28:01
On Wed, Sep 29, 2021 at 12:55 AM Qu Wenruo [off-list ref] wrote:
quoted hunk ↗ jump to hunk
[BUG] There are two every basic send streams: (a/m/ctime and uuid omitted) Stream 1: (Parent subvolume) subvol ./parent_subv transid=8 chown ./parent_subv/ gid=0 uid=0 chmod ./parent_subv/ mode=755 utimes ./parent_subv/ mkfile ./parent_subv/o257-7-0 rename ./parent_subv/o257-7-0 dest=./parent_subv/source utimes ./parent_subv/ write ./parent_subv/source offset=0 len=16384 chown ./parent_subv/source gid=0 uid=0 chmod ./parent_subv/source mode=600 utimes ./parent_subv/source Stream 2: (snapshot and clone) snapshot ./dest_subv transid=14 parent_transid=10 utimes ./dest_subv/ mkfile ./dest_subv/o258-14-0 rename ./dest_subv/o258-14-0 dest=./dest_subv/reflink utimes ./dest_subv/ clone ./dest_subv/reflink offset=0 len=16384 from=./dest_subv/source clone_offset=0 chown ./dest_subv/reflink gid=0 uid=0 chmod ./dest_subv/reflink mode=600 utimes ./dest_subv/reflink But if we receive the first stream with default mount options, then remount to nodatasum, and try to receive the second stream, it will fail: # mount /mnt/btrfs # btrfs receive -f ~/parent_stream /mnt/btrfs/ At subvol parent_subv # mount -o remount,nodatasum /mnt/btrfs # btrfs receive -f ~/clone_stream /mnt/btrfs/ At snapshot dest_subv ERROR: failed to clone extents to reflink: Invalid argument # echo $? 1 [CAUSE] Btrfs doesn't allow clone source and destination to have different NODATASUM flags. This is to prevent a data extent to be owned by both NODATASUM inode and regular DATASUM inode. For above receive operations, the clone destination is inheriting the NODATASUM flag from mount option, while the clone source has no NODATASUM flag, thus preventing us from doing the clone. [FIX] Btrfs send/receive doesn't require the underlying inode has the same flags (thus we can send from compressed extent and receive on a non-compressed filesystem). So here we can just fall back to buffered write to copy the data from the source file if we got an -EINVAL error. Signed-off-by: Qu Wenruo <redacted> --- Reason for RFC: Such fallback can lead to hidden bugs not being exposed, thus a new warning is added for such fallback case. Personally I really want to do more comprehensive check in user space to ensure it's only mismatching NODATASUM flags causing the problem. Then we can completely remove the warning message. But unfortunately that check can go out-of-sync with kernel and due to the lack of NODATASUM flags interface we're not really able to check that easily. So I took the advice from Filipe to just do a simple fall back. Any feedback on such maybe niche point would help. (Really hope it's me being paranoid again) --- cmds/receive.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-)diff --git a/cmds/receive.c b/cmds/receive.c index 48c774cea587..4cb857a13cdf 100644 --- a/cmds/receive.c +++ b/cmds/receive.c@@ -705,6 +705,51 @@ out: return ret; } +#define BUFFER_SIZE SZ_32K +static int buffered_copy(int src_fd, int dst_fd, u64 src_offset, u64 len,
At the very least leave a blank line between the #define and the function's declaration.
+ u64 dest_offset)
+{
+ unsigned char *buf;
+ u64 cur_offset = 0;
+ int ret = 0;
+
+ buf = calloc(BUFFER_SIZE, 1);It could be simpler: char buf[SZ_32K]; then use ARRAY_SIZE() below.
+ if (!buf)
+ return -ENOMEM;
+
+ while (cur_offset < len) {This is a bit confusing, comparing an offset to a length. Renaming "cur_offset" to "copied" would be more logical imo.
+ u32 copy_len = min_t(u32, BUFFER_SIZE, len - cur_offset);
+ u32 write_offset = 0;
+ ssize_t read_size;
+
+ read_size = pread(src_fd, buf, copy_len, src_offset + cur_offset);
+ if (read_size < 0) {
+ ret = -errno;
+ error("failed to read source file: %m");
+ goto out;
+ }Normally we should only exit if errno is not EINTR, and retry (continue) on the EINTR case.
+
+ /* Write the buffer to dest file */
+ while (write_offset < read_size) {Same here, like "write_offset" to "written".
+ ssize_t write_size;
+
+ write_size = pwrite(dst_fd, buf + write_offset,
+ read_size - write_offset,
+ dest_offset + cur_offset + write_offset);
+ if (write_size < 0) {
+ ret = -errno;
+ error("failed to write source file: %m");
+ goto out;
+ }Same here regarding dealing with EINTR.
quoted hunk ↗ jump to hunk
+ write_offset += write_size; + } + cur_offset += read_size; + } +out: + free(buf); + return ret; +} + static int process_clone(const char *path, u64 offset, u64 len, const u8 *clone_uuid, u64 clone_ctransid, const char *clone_path, u64 clone_offset,@@ -788,8 +833,16 @@ static int process_clone(const char *path, u64 offset, u64 len, ret = ioctl(rctx->write_fd, BTRFS_IOC_CLONE_RANGE, &clone_args); if (ret < 0) { ret = -errno; - error("failed to clone extents to %s: %m", path); - goto out; + if (ret != -EINVAL) { + error("failed to clone extents to %s: %m", path); + goto out; + } + + warning( + "failed to clone extents to %s, fallback to buffered write", + path);
What if we have thousands of clone operations? Is there any rate limited print() in progs like there is for kernel? That's one reason why my proposal had in mind an optional flag to trigger this behaviour. Thanks for doing it, I was planning on doing something similar soon.
+ ret = buffered_copy(clone_fd, rctx->write_fd, clone_offset,
+ len, offset);
}
out:
--
2.33.0-- Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”