From nobody Thu May 12 20:33:37 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 E65731AC74D5; Thu, 12 May 2022 20:33:37 +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 4Kzk4x5tQtz4g4l; Thu, 12 May 2022 20:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652387617; 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=FxyN50KLKtaD2MVtX3wbn9yfZcRX3zqvvuidCiAqNGQ=; b=xauO2ZFdbB4bf/k0/GACGHduehKY07uEcrcssKqlEiQU9BlEuMpFDqfR7Jq7THXmWPqqzM ti+5V/3q4mEfmxTVlAN+c498XJou3CvNwtSFNe324IP7PGLlhlO1pKjLiwmImTjZA2el8C hJ8v8thw3dPGJHw8sM0y41rCpAXPOKOFiIK2PDOv7ClqZDyV01hL0JJ03UsAWi9WqKAvPI JbMwFUQnzcu8rEsaxW2SwBrE7mXeH06Wnfl7queuzVMWw6MpTByS0+SKoHvkW+a4IbqJdy ZguTTSIRYjgR5lDcUDK2+uEdW2EhPbpChtseHe5JezMmg7njgTomJTiG5EPMig== 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 A9C7415479; Thu, 12 May 2022 20:33:37 +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 24CKXbTi030021; Thu, 12 May 2022 20:33:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CKXbZm030020; Thu, 12 May 2022 20:33:37 GMT (envelope-from git) Date: Thu, 12 May 2022 20:33:37 GMT Message-Id: <202205122033.24CKXbZm030020@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: 8b582b164021 - main - fusefs: make the mknod.cc tests a bit more general. 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: 8b582b16402102df10a715c626e212bbbc8e9d7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652387617; 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=FxyN50KLKtaD2MVtX3wbn9yfZcRX3zqvvuidCiAqNGQ=; b=U3bLkI3Dg9U01MYE7x4kdIOFmF4ZHFm6WHUu2ZPPPg7MGDpx00f0+6P1ytvVZHZ74hX/Nw amd5jQO/QlDivG/oWAHJ0vMKBd5OsVWsBMgr9nHLj8YDTfqCns+W7b18PY/2Y1CLAc5tsQ ueTQ85cHG66vaqe4P+BtCCVcr/M+xk8xB9QRMY3zEx3aLOeOJesSB31PUC0AHnNVnc+GRd 1JuKWknkZtJDk09GTmCpwV8ewasHQ7oi7vlpX4JRKUUAcGVxa1uQAi15HcOj52QPDgP5yt 5O4aB33Up0ATDMM1+9LC4KTr9C3M4Dd7aRn1qL+JU80vkmi3NUhxx8ywbwjNgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652387617; a=rsa-sha256; cv=none; b=y3mMe0pT03XqBgDistY202pQcaL3oeI8jQPL15SokZBkqnV5hO/JIJjDtmh1CMi0G/U+2E x3Xkbx3ofp2s1NYlYL1AbKRFhRgh/5nIt1yOooWVvzwYyP49nPt+jCDf3STvCRrn8TxN3C sVlJT7dxpWKhtmELeqOehAApx3o9vqk3D9HB6DZFl/UFv/PBa2sQDBK1GHRXn24vwGmr2r BZVgG4mtBmOJVRfJXcJlRcd/s4AkAfP9DWTA6x3tMpsSpgyS5WUlKCqMFQQXE6aayAshR3 yKX7duf+c+EgURLkUYm0zmwCjB/vASwSE0AClfalyxtxjsm4v2DZp5cWKDk1ZA== 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=8b582b16402102df10a715c626e212bbbc8e9d7c commit 8b582b16402102df10a715c626e212bbbc8e9d7c Author: Alan Somers AuthorDate: 2022-05-03 22:53:20 +0000 Commit: Alan Somers CommitDate: 2022-05-12 20:31:57 +0000 fusefs: make the mknod.cc tests a bit more general. MFC after: 2 weeks Reviewed by: pfg --- tests/sys/fs/fusefs/mknod.cc | 85 +++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index 5e16472cbe90..7bb8e116c3f8 100644 --- a/tests/sys/fs/fusefs/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc @@ -45,9 +45,6 @@ using namespace testing; #define VNOVAL (-1) /* Defined in sys/vnode.h */ #endif -const char FULLPATH[] = "mountpoint/some_file.txt"; -const char RELPATH[] = "some_file.txt"; - class Mknod: public FuseTest { mode_t m_oldmask; @@ -72,21 +69,19 @@ virtual void TearDown() { } /* Test an OK creation of a file with the given mode and device number */ -void expect_mknod(mode_t mode, dev_t dev) { - uint64_t ino = 42; - - EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) - .WillOnce(Invoke(ReturnErrno(ENOENT))); - +void expect_mknod(uint64_t parent_ino, const char* relpath, uint64_t ino, + mode_t mode, dev_t dev) +{ EXPECT_CALL(*m_mock, process( ResultOf([=](auto in) { const char *name = (const char*)in.body.bytes + sizeof(fuse_mknod_in); - return (in.header.opcode == FUSE_MKNOD && + return (in.header.nodeid == parent_ino && + in.header.opcode == FUSE_MKNOD && in.body.mknod.mode == mode && in.body.mknod.rdev == (uint32_t)dev && in.body.mknod.umask == c_umask && - (0 == strcmp(RELPATH, name))); + (0 == strcmp(relpath, name))); }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { @@ -117,20 +112,18 @@ void expect_lookup(const char *relpath, uint64_t ino, uint64_t size) } /* Test an OK creation of a file with the given mode and device number */ -void expect_mknod(mode_t mode, dev_t dev) { - uint64_t ino = 42; - - EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) - .WillOnce(Invoke(ReturnErrno(ENOENT))); - +void expect_mknod(uint64_t parent_ino, const char* relpath, uint64_t ino, + mode_t mode, dev_t dev) +{ EXPECT_CALL(*m_mock, process( ResultOf([=](auto in) { const char *name = (const char*)in.body.bytes + FUSE_COMPAT_MKNOD_IN_SIZE; - return (in.header.opcode == FUSE_MKNOD && + return (in.header.nodeid == parent_ino && + in.header.opcode == FUSE_MKNOD && in.body.mknod.mode == mode && in.body.mknod.rdev == (uint32_t)dev && - (0 == strcmp(RELPATH, name))); + (0 == strcmp(relpath, name))); }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { @@ -152,17 +145,31 @@ void expect_mknod(mode_t mode, dev_t dev) { */ TEST_F(Mknod, blk) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFBLK | 0755; dev_t rdev = 0xfe00; /* /dev/vda's device number on Linux */ - expect_mknod(mode, rdev); + uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); + EXPECT_EQ(0, mknod(FULLPATH, mode, rdev)) << strerror(errno); } TEST_F(Mknod, chr) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFCHR | 0755; dev_t rdev = 54; /* /dev/fuse's device number */ - expect_mknod(mode, rdev); + uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); + EXPECT_EQ(0, mknod(FULLPATH, mode, rdev)) << strerror(errno); } @@ -172,6 +179,8 @@ TEST_F(Mknod, chr) */ TEST_F(Mknod, eperm) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFIFO | 0755; EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) @@ -193,9 +202,16 @@ TEST_F(Mknod, eperm) TEST_F(Mknod, fifo) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFIFO | 0755; dev_t rdev = VNOVAL; /* Fifos don't have device numbers */ - expect_mknod(mode, rdev); + uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); + EXPECT_EQ(0, mkfifo(FULLPATH, mode)) << strerror(errno); } @@ -206,12 +222,17 @@ TEST_F(Mknod, fifo) */ TEST_F(Mknod, socket) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFSOCK | 0755; struct sockaddr_un sa; int fd; dev_t rdev = -1; /* Really it's a don't care */ + uint64_t ino = 42; - expect_mknod(mode, rdev); + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); fd = socket(AF_UNIX, SOCK_STREAM, 0); ASSERT_LE(0, fd) << strerror(errno); @@ -230,17 +251,31 @@ TEST_F(Mknod, socket) */ TEST_F(Mknod, DISABLED_whiteout) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFWHT | 0755; dev_t rdev = VNOVAL; /* whiteouts don't have device numbers */ - expect_mknod(mode, rdev); + uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); + EXPECT_EQ(0, mknod(FULLPATH, mode, 0)) << strerror(errno); } /* A server built at protocol version 7.11 or earlier can still use mknod */ TEST_F(Mknod_7_11, fifo) { + const char FULLPATH[] = "mountpoint/some_node"; + const char RELPATH[] = "some_node"; mode_t mode = S_IFIFO | 0755; dev_t rdev = VNOVAL; - expect_mknod(mode, rdev); + uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnErrno(ENOENT))); + expect_mknod(FUSE_ROOT_ID, RELPATH, ino, mode, rdev); + EXPECT_EQ(0, mkfifo(FULLPATH, mode)) << strerror(errno); }