From nobody Mon Nov 29 01:36:22 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 30D1718A8D9D; Mon, 29 Nov 2021 01:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J2ScQ4zRlz3tdl; Mon, 29 Nov 2021 01:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C72B196F2; Mon, 29 Nov 2021 01:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AT1aMhG034023; Mon, 29 Nov 2021 01:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AT1aM5L034022; Mon, 29 Nov 2021 01:36:22 GMT (envelope-from git) Date: Mon, 29 Nov 2021 01:36:22 GMT Message-Id: <202111290136.1AT1aM5L034022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 65d70b3bae0c - main - fusefs: fix copy_file_range when extending a file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65d70b3bae0c70798b0a2b8ed129bc146fed1cce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638149782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FB8tBVMWGY+FuzOE2GyRClL4Wv8+StJv2oNmkbJCc60=; b=MkU1mo0THHAhFSTDZKNNzCdJyUtUQMaB8FIRlDa6udRd9cDjC5UmkYMwD3k0HStk6ajXhq AlMgT94eWRyh9dCwsHtvrR98laYQXh0sVG0RqQUO2gbN9BFwGwLII1g1pgOem4H8XZayrL yvddtAHxF0Oxd+KHl0GiYYWkqUzhSnzaKNS5+pXhC862ZyTuig9NUGmZ+yjwWqSYsb8OV1 0fEZiFix0bWwR1hDq/MEkjmCiHl82GcnwvRqu5ABvsmn+8vEG4dzxYesZLPR9Ef/NvU83Z C32Pm3Xu/CKklSfcC0krb8Rn8AicCJATSvni+je8WR4e8XhdvCE6iLlGc+DfIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638149782; a=rsa-sha256; cv=none; b=keXA+qvP1e4bAxbD1DzxS9achqt1Hu1/BzJhrdgl6VR2kFGZn5q29h4S9xWgmHUboJXTwi GTDMYYwLnCC51iAeVQHdV4hDhrtKRq7YVRxm+gJBvU9tMnpKIEgPMB83W0lE0ttD0YLEq2 fGxvCLcTFdqO/lgRb80YypcKFgfYmty24ISsFzwXM4uO7Q2/2T/O94jN2FZnvtMOQrD1oj 25F7LdDp4FKSbR8EUgyetGhm442yP0UucSQoz69+9v043P/vC/+cmv9vOEMi+0t78KuQ5k uNAFAzvJNLkVH2zaI2uTtgCDr7azLcP5zb01CUILg2pYxhI8wnxefpJu93a0yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=65d70b3bae0c70798b0a2b8ed129bc146fed1cce commit 65d70b3bae0c70798b0a2b8ed129bc146fed1cce Author: Alan Somers AuthorDate: 2021-11-29 01:35:58 +0000 Commit: Alan Somers CommitDate: 2021-11-29 01:35:58 +0000 fusefs: fix copy_file_range when extending a file When copy_file_range extends a file, it must update the cached file size. MFC after: 2 weeks Reviewed by: rmacklem, pfg Differential Revision: https://reviews.freebsd.org/D33151 --- sys/fs/fuse/fuse_vnops.c | 3 +++ tests/sys/fs/fusefs/copy_file_range.cc | 47 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index e61a3cda80a7..d87639ec3f79 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -650,6 +650,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) struct vnode *invp = ap->a_invp; struct vnode *outvp = ap->a_outvp; struct mount *mp = vnode_mount(invp); + struct fuse_vnode_data *outfvdat = VTOFUD(outvp); struct fuse_dispatcher fdi; struct fuse_filehandle *infufh, *outfufh; struct fuse_copy_file_range_in *fcfri; @@ -731,6 +732,8 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) *ap->a_inoffp += fwo->size; *ap->a_outoffp += fwo->size; fuse_internal_clear_suid_on_write(outvp, outcred, td); + if (*ap->a_outoffp > outfvdat->cached_attrs.va_size) + fuse_vnode_setsize(outvp, *ap->a_outoffp, false); } fdisp_destroy(&fdi); diff --git a/tests/sys/fs/fusefs/copy_file_range.cc b/tests/sys/fs/fusefs/copy_file_range.cc index bb8eecf8b862..03a892d35d29 100644 --- a/tests/sys/fs/fusefs/copy_file_range.cc +++ b/tests/sys/fs/fusefs/copy_file_range.cc @@ -353,6 +353,53 @@ TEST_F(CopyFileRange, same_file) ASSERT_EQ(len, copy_file_range(fd, &off_in, fd, &off_out, len, 0)); } +/* + * copy_file_range can extend the size of a file + * */ +TEST_F(CopyFileRange, extend) +{ + const char FULLPATH[] = "mountpoint/src.txt"; + const char RELPATH[] = "src.txt"; + struct stat sb; + const uint64_t ino = 4; + const uint64_t fh = 0xdeadbeefa7ebabe; + off_t fsize = 65536; + off_t off_in = 0; + off_t off_out = 65536; + ssize_t len = 65536; + int fd; + + expect_lookup(RELPATH, ino, S_IFREG | 0644, fsize, 1); + expect_open(ino, 0, 1, fh); + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_COPY_FILE_RANGE && + in.header.nodeid == ino && + in.body.copy_file_range.fh_in == fh && + (off_t)in.body.copy_file_range.off_in == off_in && + in.body.copy_file_range.nodeid_out == ino && + in.body.copy_file_range.fh_out == fh && + (off_t)in.body.copy_file_range.off_out == off_out && + in.body.copy_file_range.len == (size_t)len && + in.body.copy_file_range.flags == 0); + }, Eq(true)), + _) + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, write); + out.body.write.size = len; + }))); + + fd = open(FULLPATH, O_RDWR); + ASSERT_GE(fd, 0); + ASSERT_EQ(len, copy_file_range(fd, &off_in, fd, &off_out, len, 0)); + + /* Check that cached attributes were updated appropriately */ + ASSERT_EQ(0, fstat(fd, &sb)) << strerror(errno); + EXPECT_EQ(fsize + len, sb.st_size); + + leak(fd); +} + /* With older protocol versions, no FUSE_COPY_FILE_RANGE should be attempted */ TEST_F(CopyFileRange_7_27, fallback) {