5 files changed, 39 insertions, 123 deletions

diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc
index b46700646aa27..a725b68658786 100644
--- a/tests/sys/fs/fusefs/io.cc
+++ b/tests/sys/fs/fusefs/io.cc
@@ -77,7 +77,7 @@ static void compare(const void *tbuf, const void *controlbuf, off_t baseofs,
 }
 
 class Io: public FuseTest,
-	  public WithParamInterface<tuple<uint32_t, uint32_t, bool>> {
+	  public WithParamInterface<tuple<bool, uint32_t, bool, bool>> {
 public:
 int m_backing_fd, m_control_fd, m_test_fd;
 off_t m_filesize;
@@ -95,9 +95,12 @@ void SetUp()
 		FAIL() << strerror(errno);
 	srandom(22'9'1982);	// Seed with my birthday
 
-	m_init_flags = get<0>(GetParam());
+	if (get<0>(GetParam()))
+		m_init_flags |= FUSE_ASYNC_READ;
 	m_maxwrite = get<1>(GetParam());
-	m_async = get<2>(GetParam());
+	if (get<2>(GetParam()))
+		m_init_flags |= FUSE_WRITEBACK_CACHE;
+	m_async = get<3>(GetParam());
 
 	FuseTest::SetUp();
 	if (IsSkipped())
@@ -316,15 +319,6 @@ void do_write(ssize_t size, off_t offs)
 class IoCacheable: public Io {
 public:
 virtual void SetUp() {
-	const char *node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
-	ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val == 0)
-		GTEST_SKIP() <<
-			"fusefs data caching must be enabled for this test";
 	Io::SetUp();
 }
 };
@@ -492,11 +486,13 @@ TEST_P(Io, resize_a_valid_buffer_while_extending)
 }
 
 INSTANTIATE_TEST_CASE_P(Io, Io,
-	Combine(Values(0, FUSE_ASYNC_READ),		/* m_init_flags */
+	Combine(Bool(),					/* async read */
 		Values(0x1000, 0x10000, 0x20000),	/* m_maxwrite */
+		Bool(),					/* writeback cache */
 		Bool()));				/* m_async */
 
 INSTANTIATE_TEST_CASE_P(Io, IoCacheable,
-	Combine(Values(0, FUSE_ASYNC_READ),		/* m_init_flags */
+	Combine(Bool(),					/* async read */
 		Values(0x1000, 0x10000, 0x20000),	/* m_maxwrite */
+		Bool(),					/* writeback cache */
 		Bool()));				/* m_async */
diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc
index 8131e1f69636c..957284048a4fa 100644
--- a/tests/sys/fs/fusefs/notify.cc
+++ b/tests/sys/fs/fusefs/notify.cc
@@ -84,20 +84,11 @@ void expect_lookup(uint64_t parent, const char *relpath, uint64_t ino,
 class NotifyWriteback: public Notify {
 public:
 virtual void SetUp() {
-	const char *node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
+	m_init_flags |= FUSE_WRITEBACK_CACHE;
 	m_async = true;
 	Notify::SetUp();
 	if (IsSkipped())
 		return;
-
-	ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val != 2)
-		GTEST_SKIP() << "vfs.fusefs.data_cache_mode must be set to 2 "
-			"(writeback) for this test";
 }
 
 void expect_write(uint64_t ino, uint64_t offset, uint64_t size,
diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc
index 285c17c55b595..ec543c0d6492e 100644
--- a/tests/sys/fs/fusefs/read.cc
+++ b/tests/sys/fs/fusefs/read.cc
@@ -92,24 +92,7 @@ class AsyncRead: public AioRead {
 	}
 };
 
-class ReadCacheable: public Read {
-public:
-virtual void SetUp() {
-	const char *node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
-	FuseTest::SetUp();
-
-	ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val == 0)
-		GTEST_SKIP() <<
-			"fusefs data caching must be enabled for this test";
-}
-};
-
-class ReadAhead: public ReadCacheable,
+class ReadAhead: public Read,
 		 public WithParamInterface<tuple<bool, int>>
 {
 	virtual void SetUp() {
@@ -121,7 +104,7 @@ class ReadAhead: public ReadCacheable,
 
 		m_maxreadahead = val * get<1>(GetParam());
 		m_noclusterr = get<0>(GetParam());
-		ReadCacheable::SetUp();
+		Read::SetUp();
 	}
 };
 
@@ -359,6 +342,12 @@ TEST_F(Read, direct_io_pread)
 
 	ASSERT_EQ(bufsize, pread(fd, buf, bufsize, offset)) << strerror(errno);
 	ASSERT_EQ(0, memcmp(buf, CONTENTS, bufsize));
+
+	// With FOPEN_DIRECT_IO, the cache should be bypassed.  The server will
+	// get a 2nd read request.
+	expect_read(ino, offset, bufsize, bufsize, CONTENTS);
+	ASSERT_EQ(bufsize, pread(fd, buf, bufsize, offset)) << strerror(errno);
+	ASSERT_EQ(0, memcmp(buf, CONTENTS, bufsize));
 	/* Deliberately leak fd.  close(2) will be tested in release.cc */
 }
 
@@ -423,7 +412,7 @@ TEST_F(Read, eio)
  * indicates EOF, because of a server-side truncation.  We should invalidate
  * all cached attributes.  We may update the file size, 
  */
-TEST_F(ReadCacheable, eof)
+TEST_F(Read, eof)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -453,8 +442,8 @@ TEST_F(ReadCacheable, eof)
 	/* Deliberately leak fd.  close(2) will be tested in release.cc */
 }
 
-/* Like ReadCacheable.eof, but causes an entire buffer to be invalidated */
-TEST_F(ReadCacheable, eof_of_whole_buffer)
+/* Like Read.eof, but causes an entire buffer to be invalidated */
+TEST_F(Read, eof_of_whole_buffer)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -490,7 +479,7 @@ TEST_F(ReadCacheable, eof_of_whole_buffer)
  * With the keep_cache option, the kernel may keep its read cache across
  * multiple open(2)s.
  */
-TEST_F(ReadCacheable, keep_cache)
+TEST_F(Read, keep_cache)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -556,7 +545,7 @@ TEST_F(Read, keep_cache_disabled)
 	/* Deliberately leak fd0 and fd1. */
 }
 
-TEST_F(ReadCacheable, mmap)
+TEST_F(Read, mmap)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -602,7 +591,7 @@ TEST_F(ReadCacheable, mmap)
  * A read via mmap comes up short, indicating that the file was truncated
  * server-side.
  */
-TEST_F(ReadCacheable, mmap_eof)
+TEST_F(Read, mmap_eof)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -680,7 +669,7 @@ TEST_F(Read, o_direct)
 	ASSERT_EQ(0, lseek(fd, 0, SEEK_SET)) << strerror(errno);
 	ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno);
 	ASSERT_EQ(0, memcmp(buf, CONTENTS, bufsize));
-	
+
 	/* Deliberately leak fd.  close(2) will be tested in release.cc */
 }
 
@@ -761,7 +750,7 @@ TEST_F(Read_7_8, read)
  * If cacheing is enabled, the kernel should try to read an entire cache block
  * at a time.
  */
-TEST_F(ReadCacheable, cache_block)
+TEST_F(Read, cache_block)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -796,7 +785,7 @@ TEST_F(ReadCacheable, cache_block)
 }
 
 /* Reading with sendfile should work (though it obviously won't be 0-copy) */
-TEST_F(ReadCacheable, sendfile)
+TEST_F(Read, sendfile)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -843,7 +832,7 @@ TEST_F(ReadCacheable, sendfile)
 
 /* sendfile should fail gracefully if fuse declines the read */
 /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236466 */
-TEST_F(ReadCacheable, DISABLED_sendfile_eio)
+TEST_F(Read, DISABLED_sendfile_eio)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
diff --git a/tests/sys/fs/fusefs/setattr.cc b/tests/sys/fs/fusefs/setattr.cc
index 05fa61b071229..0c3bd31c72cdc 100644
--- a/tests/sys/fs/fusefs/setattr.cc
+++ b/tests/sys/fs/fusefs/setattr.cc
@@ -415,8 +415,7 @@ TEST_F(Setattr, truncate) {
 
 /*
  * Truncating a file should discard cached data past the truncation point.
- * This is a regression test for bug 233783.  The bug only applies when
- * vfs.fusefs.data_cache_mode=1 or 2, but the test should pass regardless.
+ * This is a regression test for bug 233783.
  *
  * There are two distinct failure modes.  The first one is a failure to zero
  * the portion of the file's final buffer past EOF.  It can be reproduced by
@@ -476,11 +475,6 @@ TEST_F(Setattr, truncate_discards_cached_data) {
 		out.body.attr.attr.mode = mode;
 		out.body.attr.attr.size = cur_size;
 	})));
-	/* 
-	 * The exact pattern of FUSE_WRITE operations depends on the setting of
-	 * vfs.fusefs.data_cache_mode.  But it's not important for this test.
-	 * Just set the mocks to accept anything
-	 */
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_WRITE);
@@ -510,7 +504,6 @@ TEST_F(Setattr, truncate_discards_cached_data) {
 		cur_size = trunc_size;
 	})));
 
-	/* exact pattern of FUSE_READ depends on vfs.fusefs.data_cache_mode */
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_READ);
@@ -534,7 +527,7 @@ TEST_F(Setattr, truncate_discards_cached_data) {
 	ASSERT_EQ(static_cast<ssize_t>(w0_size),
 		pwrite(fd, w0buf, w0_size, w0_offset));
 	should_have_data = true;
-	/* Fill the cache, if data_cache_mode == 1 */
+	/* Fill the cache */
 	ASSERT_EQ(static_cast<ssize_t>(r0_size),
 		pread(fd, r0buf, r0_size, r0_offset));
 	/* 1st truncate should discard cached data */
diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc
index ae46a742af409..8a4acf58caf5b 100644
--- a/tests/sys/fs/fusefs/write.cc
+++ b/tests/sys/fs/fusefs/write.cc
@@ -117,23 +117,6 @@ void maybe_expect_write(uint64_t ino, uint64_t offset, uint64_t size,
 
 };
 
-class WriteCacheable: public Write {
-public:
-virtual void SetUp() {
-	const char *node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
-	FuseTest::SetUp();
-
-	ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val == 0)
-		GTEST_SKIP() <<
-			"fusefs data caching must be enabled for this test";
-}
-};
-
 sig_atomic_t Write::s_sigxfsz = 0;
 
 class Write_7_8: public FuseTest {
@@ -167,50 +150,14 @@ virtual void SetUp() {
 }
 };
 
-/* Tests for the write-through cache mode */
-class WriteThrough: public Write {
-public:
-virtual void SetUp() {
-	const char *cache_mode_node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
-	FuseTest::SetUp();
-	if (IsSkipped())
-		return;
-
-	ASSERT_EQ(0, sysctlbyname(cache_mode_node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val != 1)
-		GTEST_SKIP() << "vfs.fusefs.data_cache_mode must be set to 1 "
-			"(writethrough) for this test";
-}
-
-void expect_write(uint64_t ino, uint64_t offset, uint64_t isize,
-	uint64_t osize, const void *contents)
-{
-	FuseTest::expect_write(ino, offset, isize, osize, 0, FUSE_WRITE_CACHE,
-		contents);
-}
-};
-
 /* Tests for the writeback cache mode */
 class WriteBack: public Write {
 public:
 virtual void SetUp() {
-	const char *node = "vfs.fusefs.data_cache_mode";
-	int val = 0;
-	size_t size = sizeof(val);
-
+	m_init_flags |= FUSE_WRITEBACK_CACHE;
 	FuseTest::SetUp();
 	if (IsSkipped())
 		return;
-
-	ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val != 2)
-		GTEST_SKIP() << "vfs.fusefs.data_cache_mode must be set to 2 "
-			"(writeback) for this test";
 }
 
 void expect_write(uint64_t ino, uint64_t offset, uint64_t isize,
@@ -241,12 +188,12 @@ virtual void SetUp() {
 class WriteCluster: public WriteBack {
 public:
 virtual void SetUp() {
-	if (m_maxphys < 2 * DFLTPHYS)
-		GTEST_SKIP() << "MAXPHYS must be at least twice DFLTPHYS"
-			<< " for this test";
 	m_async = true;
 	m_maxwrite = m_maxphys;
 	WriteBack::SetUp();
+	if (m_maxphys < 2 * DFLTPHYS)
+		GTEST_SKIP() << "MAXPHYS must be at least twice DFLTPHYS"
+			<< " for this test";
 	if (m_maxphys < 2 * m_maxbcachebuf)
 		GTEST_SKIP() << "MAXPHYS must be at least twice maxbcachebuf"
 			<< " for this test";
@@ -543,7 +490,7 @@ TEST_F(Write, rlimit_fsize)
  * A short read indicates EOF.  Test that nothing bad happens if we get EOF
  * during the R of a RMW operation.
  */
-TEST_F(WriteCacheable, eof_during_rmw)
+TEST_F(Write, eof_during_rmw)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -577,7 +524,7 @@ TEST_F(WriteCacheable, eof_during_rmw)
  * write, then it must set the FUSE_WRITE_CACHE bit
  */
 /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236378 */
-TEST_F(WriteCacheable, mmap)
+TEST_F(Write, mmap)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -624,7 +571,7 @@ TEST_F(WriteCacheable, mmap)
 	free(zeros);
 }
 
-TEST_F(WriteThrough, pwrite)
+TEST_F(Write, pwrite)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";
@@ -1183,7 +1130,7 @@ INSTANTIATE_TEST_CASE_P(RA, TimeGran, Range(0u, 10u));
 /*
  * Without direct_io, writes should be committed to cache
  */
-TEST_F(WriteThrough, writethrough)
+TEST_F(Write, writethrough)
 {
 	const char FULLPATH[] = "mountpoint/some_file.txt";
 	const char RELPATH[] = "some_file.txt";