2 files changed, 159 insertions, 13 deletions

diff --git a/tests/sys/fs/fusefs/rmdir.cc b/tests/sys/fs/fusefs/rmdir.cc
index 5403e123de7e1..3c3e3ea4d155c 100644
--- a/tests/sys/fs/fusefs/rmdir.cc
+++ b/tests/sys/fs/fusefs/rmdir.cc
@@ -30,6 +30,7 @@
 
 extern "C" {
 #include <fcntl.h>
+#include <semaphore.h>
 }
 
 #include "mockfs.hh"
@@ -55,11 +56,13 @@ void expect_getattr(uint64_t ino, mode_t mode)
 	})));
 }
 
-void expect_lookup(const char *relpath, uint64_t ino)
+void expect_lookup(const char *relpath, uint64_t ino, int times=1)
 {
 	EXPECT_LOOKUP(FUSE_ROOT_ID, relpath)
-	.WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
+	.Times(times)
+	.WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
 		SET_OUT_HEADER_LEN(out, entry);
+		out.body.entry.attr_valid = UINT64_MAX;
 		out.body.entry.attr.mode = S_IFDIR | 0755;
 		out.body.entry.nodeid = ino;
 		out.body.entry.attr.nlink = 2;
@@ -83,13 +86,16 @@ void expect_rmdir(uint64_t parent, const char *relpath, int error)
  * A successful rmdir should clear the parent directory's attribute cache,
  * because the fuse daemon should update its mtime and ctime
  */
-TEST_F(Rmdir, clear_attr_cache)
+TEST_F(Rmdir, parent_attr_cache)
 {
 	const char FULLPATH[] = "mountpoint/some_dir";
 	const char RELPATH[] = "some_dir";
 	struct stat sb;
+	sem_t sem;
 	uint64_t ino = 42;
 
+	ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno);
+
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_GETATTR &&
@@ -105,9 +111,12 @@ TEST_F(Rmdir, clear_attr_cache)
 	})));
 	expect_lookup(RELPATH, ino);
 	expect_rmdir(FUSE_ROOT_ID, RELPATH, 0);
+	expect_forget(ino, 1, &sem);
 
 	ASSERT_EQ(0, rmdir(FULLPATH)) << strerror(errno);
 	EXPECT_EQ(0, stat("mountpoint", &sb)) << strerror(errno);
+	sem_wait(&sem);
+	sem_destroy(&sem);
 }
 
 TEST_F(Rmdir, enotempty)
@@ -124,15 +133,40 @@ TEST_F(Rmdir, enotempty)
 	ASSERT_EQ(ENOTEMPTY, errno);
 }
 
+/* Removing a directory should expire its entry cache */
+TEST_F(Rmdir, entry_cache)
+{
+	const char FULLPATH[] = "mountpoint/some_dir";
+	const char RELPATH[] = "some_dir";
+	sem_t sem;
+	uint64_t ino = 42;
+
+	expect_getattr(1, S_IFDIR | 0755);
+	expect_lookup(RELPATH, ino, 2);
+	expect_rmdir(FUSE_ROOT_ID, RELPATH, 0);
+	expect_forget(ino, 1, &sem);
+
+	ASSERT_EQ(0, rmdir(FULLPATH)) << strerror(errno);
+	ASSERT_EQ(0, access(FULLPATH, F_OK)) << strerror(errno);
+	sem_wait(&sem);
+	sem_destroy(&sem);
+}
+
 TEST_F(Rmdir, ok)
 {
 	const char FULLPATH[] = "mountpoint/some_dir";
 	const char RELPATH[] = "some_dir";
+	sem_t sem;
 	uint64_t ino = 42;
 
+	ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno);
+
 	expect_getattr(FUSE_ROOT_ID, S_IFDIR | 0755);
 	expect_lookup(RELPATH, ino);
 	expect_rmdir(FUSE_ROOT_ID, RELPATH, 0);
+	expect_forget(ino, 1, &sem);
 
 	ASSERT_EQ(0, rmdir(FULLPATH)) << strerror(errno);
+	sem_wait(&sem);
+	sem_destroy(&sem);
 }
diff --git a/tests/sys/fs/fusefs/unlink.cc b/tests/sys/fs/fusefs/unlink.cc
index e4dd782240f94..3471a67fec93b 100644
--- a/tests/sys/fs/fusefs/unlink.cc
+++ b/tests/sys/fs/fusefs/unlink.cc
@@ -29,6 +29,7 @@
 
 extern "C" {
 #include <fcntl.h>
+#include <semaphore.h>
 }
 
 #include "mockfs.hh"
@@ -54,18 +55,61 @@ void expect_getattr(uint64_t ino, mode_t mode)
 	})));
 }
 
-void expect_lookup(const char *relpath, uint64_t ino, int times)
+void expect_lookup(const char *relpath, uint64_t ino, int times, int nlink=1)
 {
-	FuseTest::expect_lookup(relpath, ino, S_IFREG | 0644, 0, times);
+	EXPECT_LOOKUP(FUSE_ROOT_ID, relpath)
+	.Times(times)
+	.WillRepeatedly(Invoke(
+		ReturnImmediate([=](auto in __unused, auto& out) {
+		SET_OUT_HEADER_LEN(out, entry);
+		out.body.entry.attr.mode = S_IFREG | 0644;
+		out.body.entry.nodeid = ino;
+		out.body.entry.attr.nlink = nlink;
+		out.body.entry.attr_valid = UINT64_MAX;
+		out.body.entry.attr.size = 0;
+	})));
 }
 
 };
 
 /*
+ * Unlinking a multiply linked file should update its ctime and nlink.  This
+ * could be handled simply by invalidating the attributes, necessitating a new
+ * GETATTR, but we implement it in-kernel for efficiency's sake.
+ */
+TEST_F(Unlink, attr_cache)
+{
+	const char FULLPATH0[] = "mountpoint/some_file.txt";
+	const char RELPATH0[] = "some_file.txt";
+	const char FULLPATH1[] = "mountpoint/other_file.txt";
+	const char RELPATH1[] = "other_file.txt";
+	uint64_t ino = 42;
+	struct stat sb_old, sb_new;
+	int fd1;
+
+	expect_getattr(1, S_IFDIR | 0755);
+	expect_lookup(RELPATH0, ino, 1, 2);
+	expect_lookup(RELPATH1, ino, 1, 2);
+	expect_open(ino, 0, 1);
+	expect_unlink(1, RELPATH0, 0);
+
+	fd1 = open(FULLPATH1, O_RDONLY);
+	ASSERT_LE(0, fd1) << strerror(errno);
+
+	ASSERT_EQ(0, fstat(fd1, &sb_old)) << strerror(errno);
+	ASSERT_EQ(0, unlink(FULLPATH0)) << strerror(errno);
+	ASSERT_EQ(0, fstat(fd1, &sb_new)) << strerror(errno);
+	EXPECT_NE(sb_old.st_ctime, sb_new.st_ctime);
+	EXPECT_EQ(1u, sb_new.st_nlink);
+
+	leak(fd1);
+}
+
+/*
  * A successful unlink should clear the parent directory's attribute cache,
  * because the fuse daemon should update its mtime and ctime
  */
-TEST_F(Unlink, clear_attr_cache)
+TEST_F(Unlink, parent_attr_cache)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -85,7 +129,8 @@ TEST_F(Unlink, clear_attr_cache)
 		out.body.attr.attr.mode = S_IFDIR | 0755;
 		out.body.attr.attr_valid = UINT64_MAX;
 	})));
-	expect_lookup(RELPATH, ino, 1);
+	/* Use nlink=2 so we don't get a FUSE_FORGET */
+	expect_lookup(RELPATH, ino, 1, 2);
 	expect_unlink(1, RELPATH, 0);
 
 	ASSERT_EQ(0, unlink(FULLPATH)) << strerror(errno);
@@ -106,34 +151,101 @@ TEST_F(Unlink, eperm)
 	ASSERT_EQ(EPERM, errno);
 }
 
+/*
+ * Unlinking a file should expire its entry cache, even if it's multiply linked
+ */
+TEST_F(Unlink, entry_cache)
+{
+	const char FULLPATH[] = "mountpoint/some_file.txt";
+	const char RELPATH[] = "some_file.txt";
+	uint64_t ino = 42;
+
+	expect_getattr(1, S_IFDIR | 0755);
+	expect_lookup(RELPATH, ino, 2, 2);
+	expect_unlink(1, RELPATH, 0);
+
+	ASSERT_EQ(0, unlink(FULLPATH)) << strerror(errno);
+	ASSERT_EQ(0, access(FULLPATH, F_OK)) << strerror(errno);
+}
+
+/*
+ * Unlink a multiply-linked file.  There should be no FUSE_FORGET because the
+ * file is still linked.
+ */
+TEST_F(Unlink, multiply_linked)
+{
+	const char FULLPATH0[] = "mountpoint/some_file.txt";
+	const char RELPATH0[] = "some_file.txt";
+	const char FULLPATH1[] = "mountpoint/other_file.txt";
+	const char RELPATH1[] = "other_file.txt";
+	uint64_t ino = 42;
+
+	expect_getattr(1, S_IFDIR | 0755);
+	expect_lookup(RELPATH0, ino, 1, 2);
+	expect_unlink(1, RELPATH0, 0);
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([=](auto in) {
+			return (in.header.opcode == FUSE_FORGET &&
+				in.header.nodeid == ino);
+		}, Eq(true)),
+		_)
+	).Times(0);
+	expect_lookup(RELPATH1, ino, 1, 1);
+
+	ASSERT_EQ(0, unlink(FULLPATH0)) << strerror(errno);
+
+	/* 
+	 * The final syscall simply ensures that no FUSE_FORGET was ever sent,
+	 * by scheduling an arbitrary different operation after a FUSE_FORGET
+	 * would've been sent.
+	 */
+	ASSERT_EQ(0, access(FULLPATH1, F_OK)) << strerror(errno);
+}
+
 TEST_F(Unlink, ok)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
 	uint64_t ino = 42;
+	sem_t sem;
+
+	ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno);
 
 	expect_getattr(1, S_IFDIR | 0755);
 	expect_lookup(RELPATH, ino, 1);
 	expect_unlink(1, RELPATH, 0);
+	expect_forget(ino, 1, &sem);
 
 	ASSERT_EQ(0, unlink(FULLPATH)) << strerror(errno);
+	sem_wait(&sem);
+	sem_destroy(&sem);
 }
 
 /* Unlink an open file */
 TEST_F(Unlink, open_but_deleted)
 {
-	const char FULLPATH[] = "mountpoint/some_file.txt";
-	const char RELPATH[] = "some_file.txt";
+	const char FULLPATH0[] = "mountpoint/some_file.txt";
+	const char RELPATH0[] = "some_file.txt";
+	const char FULLPATH1[] = "mountpoint/other_file.txt";
+	const char RELPATH1[] = "other_file.txt";
 	uint64_t ino = 42;
 	int fd;
 
 	expect_getattr(1, S_IFDIR | 0755);
-	expect_lookup(RELPATH, ino, 2);
+	expect_lookup(RELPATH0, ino, 2);
 	expect_open(ino, 0, 1);
-	expect_unlink(1, RELPATH, 0);
+	expect_unlink(1, RELPATH0, 0);
+	expect_lookup(RELPATH1, ino, 1, 1);
 
-	fd = open(FULLPATH, O_RDWR);
+	fd = open(FULLPATH0, O_RDWR);
 	ASSERT_LE(0, fd) << strerror(errno);
-	ASSERT_EQ(0, unlink(FULLPATH)) << strerror(errno);
+	ASSERT_EQ(0, unlink(FULLPATH0)) << strerror(errno);
+
+	/* 
+	 * The final syscall simply ensures that no FUSE_FORGET was ever sent,
+	 * by scheduling an arbitrary different operation after a FUSE_FORGET
+	 * would've been sent.
+	 */
+	ASSERT_EQ(0, access(FULLPATH1, F_OK)) << strerror(errno);
 	leak(fd);
 }