From nobody Wed Apr 06 22:17:22 2022 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 019D01A87DBB; Wed, 6 Apr 2022 22:17: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 4KYf5G6SYWz3KqG; Wed, 6 Apr 2022 22:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649283442; 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=IeQIOMBFPd2s7Ih8fHOCaOeLQp5YEZpg+G0BRt4fEf4=; b=mQR9uJIzictWRJf4+EPlwU0NWbI9p6HZZKVYbiC4JZ8csTAfzU4tedKATYRPZ8rxLXyjLM kPjtIjySFPGYpxHZgIGhw6l9mzpUfUU/grcT2YuDf0dSwlzq3qce3o6CF9V6vUVFF2KVPW DVUjWWqMG83xsc4mz3GX00CUer6BQ0LZJpCDygRimqH2usfOsguSTCSRms1FsrDgWoORb1 TsNynxxcBGQJD4Pi6fY2MgCHoq5Vpo+ibClu5MEv9cmj0quCrx8Ri5rK68O+QduI+YbpjG X5ealwSkdc7klkptYoEjQoSIwM4OQELIlrvJ66jAXV8n49Q4gmDud/8/4rbDZQ== 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 BA31623A0C; Wed, 6 Apr 2022 22:17: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 236MHMgA086323; Wed, 6 Apr 2022 22:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236MHMtw086322; Wed, 6 Apr 2022 22:17:22 GMT (envelope-from git) Date: Wed, 6 Apr 2022 22:17:22 GMT Message-Id: <202204062217.236MHMtw086322@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: 32273253667b - main - fusefs: fix two bugs regarding VOP_RECLAIM of the root inode 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: 32273253667b941c376cf08383006b3a0cbc5ca2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649283442; 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=IeQIOMBFPd2s7Ih8fHOCaOeLQp5YEZpg+G0BRt4fEf4=; b=Ov33AZrpawZW0CwOSimkbq40ZeRs2CwzMegkip1DY7hejq9Fb2pIWiBOgjnr2E7qBOUAdT rCMQdytlrcpJbFwNhRXarf73JvW0Tj5s/5lPjMqubK2dCq/lOxxe0+Jt6wPinPhm55ua5J 9Qwaj2zaUvX3SlzOWuaTix1n7r9vmxMDtXWvsrQEF9wX3yHmE6WQX+hakFcZD2JohHy9MD T2pXzcUaMPfnfdTFBQE4SRatuwpnJwGhgyGHMfcSZ80AuzJsoux3JDKDV+1yHY+3OJvoQo cMAO+16rkwOxBWwYY3qDwqilHCTJsSPRqT2bd9yAaPXHVpbKga6tQpKI8G3AUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649283442; a=rsa-sha256; cv=none; b=rd4mF/kLS0B1nRRSNi+6/a3BVdXABiNzTe5R2AJysQ7hG3mlSghN9nkavdPpKdISl8gVqe fY8bk/5t8VE16iVAgPXoIbik/CWXimVOzWAFUwXaDO25FuqKtKQdap9evdUH4AFpMlDnls QSHHpEmeizFr0+N0mm4+cHTl57E056up9PcHKfiSlBpY2U+ee+/COVQZ9dfico7B0hSSj9 qURS5zKIZrpcdNdyhHcr9PVzJyMmiKDSRdnDnXV+b3Tq3FpFBctB/yA2YbaJPg/ug9hMUG HFSHZ+GLSYDRDZZ9+e0nrCRw/pwwow1Jx/wnI7hAcpUwic2cKx8DRUPHwjhElQ== 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=32273253667b941c376cf08383006b3a0cbc5ca2 commit 32273253667b941c376cf08383006b3a0cbc5ca2 Author: Alan Somers AuthorDate: 2022-04-02 19:31:24 +0000 Commit: Alan Somers CommitDate: 2022-04-06 22:16:52 +0000 fusefs: fix two bugs regarding VOP_RECLAIM of the root inode * We never send FUSE_LOOKUP for the root inode, since its inode number is hard-coded to 1. Therefore, we should not send FUSE_FORGET for it, lest the server see its lookup count fall below 0. * During VOP_RECLAIM, if we are reclaiming the root inode, we must clear the file system's vroot pointer. Otherwise it will be left pointing at a reclaimed vnode, which will cause future VOP_LOOKUP operations to fail. Previously we only cleared that pointer during VFS_UMOUNT. I don't know of any real-world way to trigger this bug. MFC after: 2 weeks Reviewed by: pfg Differential Revision: https://reviews.freebsd.org/D34753 --- sys/fs/fuse/fuse_vnops.c | 19 ++++++++++++++++++- tests/sys/fs/fusefs/destroy.cc | 1 - tests/sys/fs/fusefs/dev_fuse_poll.cc | 1 - tests/sys/fs/fusefs/forget.cc | 33 +++++++++++++++++++++++++++++++++ tests/sys/fs/fusefs/lookup.cc | 2 -- 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index acded47f75a3..4374c854a5be 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1980,7 +1980,24 @@ fuse_vnop_reclaim(struct vop_reclaim_args *ap) fuse_filehandle_close(vp, fufh, td, NULL); } - if (!fuse_isdeadfs(vp) && fvdat->nlookup > 0) { + if (VTOI(vp) == 1) { + /* + * Don't send FUSE_FORGET for the root inode, because + * we never send FUSE_LOOKUP for it (see + * fuse_vfsop_root) and we don't want the server to see + * mismatched lookup counts. + */ + struct fuse_data *data; + struct vnode *vroot; + + data = fuse_get_mpdata(vnode_mount(vp)); + FUSE_LOCK(); + vroot = data->vroot; + data->vroot = NULL; + FUSE_UNLOCK(); + if (vroot) + vrele(vroot); + } else if (!fuse_isdeadfs(vp) && fvdat->nlookup > 0) { fuse_internal_forget_send(vnode_mount(vp), td, NULL, VTOI(vp), fvdat->nlookup); } diff --git a/tests/sys/fs/fusefs/destroy.cc b/tests/sys/fs/fusefs/destroy.cc index e72464382d4e..91c22ba6975e 100644 --- a/tests/sys/fs/fusefs/destroy.cc +++ b/tests/sys/fs/fusefs/destroy.cc @@ -141,7 +141,6 @@ TEST_F(Destroy, ok) uint64_t ino = 42; expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 2); - expect_forget(FUSE_ROOT_ID, 1); expect_forget(ino, 2); expect_destroy(0); diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_fuse_poll.cc index 951777701e1e..5ac66a915ea5 100644 --- a/tests/sys/fs/fusefs/dev_fuse_poll.cc +++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc @@ -93,7 +93,6 @@ TEST_P(DevFusePoll, access) /* Ensure that we wake up pollers during unmount */ TEST_P(DevFusePoll, destroy) { - expect_forget(FUSE_ROOT_ID, 1); expect_destroy(0); m_mock->unmount(); diff --git a/tests/sys/fs/fusefs/forget.cc b/tests/sys/fs/fusefs/forget.cc index 84fc271df57c..d520ba84dbdd 100644 --- a/tests/sys/fs/fusefs/forget.cc +++ b/tests/sys/fs/fusefs/forget.cc @@ -32,6 +32,7 @@ extern "C" { #include +#include #include #include @@ -145,3 +146,35 @@ TEST_F(Forget, invalidate_names) /* Access the file again, causing another lookup */ ASSERT_EQ(0, access(FULLFPATH, F_OK)) << strerror(errno); } + +/* + * Reclaiming the root inode should not send a FUSE_FORGET request, nor should + * it interfere with further lookup operations. + */ +TEST_F(Forget, root) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + uint64_t ino = 42; + mode_t mode = S_IFREG | 0755; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillRepeatedly(Invoke( + ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = mode; + out.body.entry.nodeid = ino; + out.body.entry.attr.nlink = 1; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = UINT64_MAX; + }))); + + /* access(2) the file to force a lookup. */ + ASSERT_EQ(0, access(FULLPATH, F_OK)) << strerror(errno); + + reclaim_vnode("mountpoint"); + nap(); + + /* Access it again, to make sure it's still possible. */ + ASSERT_EQ(0, access(FULLPATH, F_OK)) << strerror(errno); +} diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index 2dfa10730ec8..32e2a08eb949 100644 --- a/tests/sys/fs/fusefs/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc @@ -263,7 +263,6 @@ TEST_F(Lookup, dotdot_no_parent_nid) ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { SET_OUT_HEADER_LEN(out, open); }))); - expect_forget(FUSE_ROOT_ID, 1, NULL); expect_forget(foo_ino, 1, NULL); fd = open("mountpoint/foo/bar", O_EXEC| O_DIRECTORY); @@ -574,7 +573,6 @@ TEST_F(LookupExportable, dotdot_no_parent_nid) ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { SET_OUT_HEADER_LEN(out, open); }))); - expect_forget(FUSE_ROOT_ID, 1, NULL); expect_forget(foo_ino, 1, NULL); EXPECT_LOOKUP(bar_ino, "..") .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {