From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Greg Kurz <groug@kaod.org>
Subject: [PULL v3 11/17] tests/9pfs: add local Tunlinkat directory test
Date: Wed, 21 Oct 2020 14:17:01 +0200 [thread overview]
Message-ID: <b37d62d6de08bea1f57e51a4b99938f7994a84d6.1604309512.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1604309512.git.qemu_oss@crudebyte.com>
This test case uses a Tunlinkat 9p request with flag AT_REMOVEDIR
(see 'man 2 unlink') to remove a directory from host's test directory.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <3c7c65b476ba44bea6afd0b378b5287e1c671a32.1603285620.git.qemu_oss@crudebyte.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
tests/qtest/virtio-9p-test.c | 71 ++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index db37e31b32..6c8842351f 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -258,6 +258,7 @@ static const char *rmessage_name(uint8_t id)
id == P9_RLOPEN ? "RLOPEN" :
id == P9_RWRITE ? "RWRITE" :
id == P9_RMKDIR ? "RMKDIR" :
+ id == P9_RUNLINKAT ? "RUNLINKAT" :
id == P9_RFLUSH ? "RFLUSH" :
id == P9_RREADDIR ? "READDIR" :
"<unknown>";
@@ -693,6 +694,33 @@ static void v9fs_rmkdir(P9Req *req, v9fs_qid *qid)
v9fs_req_free(req);
}
+/* size[4] Tunlinkat tag[2] dirfd[4] name[s] flags[4] */
+static P9Req *v9fs_tunlinkat(QVirtio9P *v9p, uint32_t dirfd, const char *name,
+ uint32_t flags, uint16_t tag)
+{
+ P9Req *req;
+
+ uint32_t body_size = 4 + 4;
+ uint16_t string_size = v9fs_string_size(name);
+
+ g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
+ body_size += string_size;
+
+ req = v9fs_req_init(v9p, body_size, P9_TUNLINKAT, tag);
+ v9fs_uint32_write(req, dirfd);
+ v9fs_string_write(req, name);
+ v9fs_uint32_write(req, flags);
+ v9fs_req_send(req);
+ return req;
+}
+
+/* size[4] Runlinkat tag[2] */
+static void v9fs_runlinkat(P9Req *req)
+{
+ v9fs_req_recv(req, P9_RUNLINKAT);
+ v9fs_req_free(req);
+}
+
/* basic readdir test where reply fits into a single response message */
static void fs_readdir(void *obj, void *data, QGuestAllocator *t_alloc)
{
@@ -1004,6 +1032,22 @@ static void do_mkdir(QVirtio9P *v9p, const char *path, const char *cname)
g_free(name);
}
+static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rpath,
+ uint32_t flags)
+{
+ char *const name = g_strdup(rpath);
+ uint32_t fid;
+ P9Req *req;
+
+ fid = do_walk(v9p, atpath);
+
+ req = v9fs_tunlinkat(v9p, fid, name, flags, 0);
+ v9fs_req_wait_for_reply(req, NULL);
+ v9fs_runlinkat(req);
+
+ g_free(name);
+}
+
static void fs_readdir_split_128(void *obj, void *data,
QGuestAllocator *t_alloc)
{
@@ -1050,6 +1094,32 @@ static void fs_create_dir(void *obj, void *data, QGuestAllocator *t_alloc)
g_free(root_path);
}
+static void fs_unlinkat_dir(void *obj, void *data, QGuestAllocator *t_alloc)
+{
+ QVirtio9P *v9p = obj;
+ alloc = t_alloc;
+ struct stat st;
+ char *root_path = virtio_9p_test_path("");
+ char *new_dir = virtio_9p_test_path("02");
+
+ g_assert(root_path != NULL);
+
+ do_attach(v9p);
+ do_mkdir(v9p, "/", "02");
+
+ /* check if created directory really exists now ... */
+ g_assert(stat(new_dir, &st) == 0);
+ /* ... and is actually a directory */
+ g_assert((st.st_mode & S_IFMT) == S_IFDIR);
+
+ do_unlinkat(v9p, "/", "02", AT_REMOVEDIR);
+ /* directory should be gone now */
+ g_assert(stat(new_dir, &st) != 0);
+
+ g_free(new_dir);
+ g_free(root_path);
+}
+
static void *assign_9p_local_driver(GString *cmd_line, void *arg)
{
virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr");
@@ -1090,6 +1160,7 @@ static void register_virtio_9p_test(void)
opts.before = assign_9p_local_driver;
qos_add_test("local/config", "virtio-9p", pci_config, &opts);
qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);
+ qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts);
}
libqos_init(register_virtio_9p_test);
--
2.20.1
next prev parent reply other threads:[~2020-11-02 10:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 9:31 [PULL v3 00/17] 9p queue (previous 2020-10-30) Christian Schoenebeck
2020-10-20 16:09 ` [PULL v3 05/17] tests/9pfs: Factor out do_version() helper Christian Schoenebeck
2020-10-20 16:09 ` [PULL v3 08/17] tests/9pfs: Turn fs_readdir_split() into a helper Christian Schoenebeck
2020-10-20 16:09 ` [PULL v3 06/17] tests/9pfs: Set alloc in fs_create_dir() Christian Schoenebeck
2020-10-20 16:09 ` [PULL v3 07/17] tests/9pfs: Factor out do_attach() helper Christian Schoenebeck
2020-10-20 16:09 ` [PULL v3 09/17] tests/9pfs: Turn fs_mkdir() into a helper Christian Schoenebeck
2020-10-21 12:06 ` [PULL v3 10/17] tests/9pfs: simplify do_mkdir() Christian Schoenebeck
2020-10-21 12:17 ` Christian Schoenebeck [this message]
2020-10-21 12:25 ` [PULL v3 12/17] tests/9pfs: add local Tlcreate test Christian Schoenebeck
2020-10-21 12:28 ` [PULL v3 13/17] tests/9pfs: add local Tunlinkat file test Christian Schoenebeck
2020-10-21 12:33 ` [PULL v3 14/17] tests/9pfs: add local Tsymlink test Christian Schoenebeck
2020-10-21 12:36 ` [PULL v3 15/17] tests/9pfs: add local Tunlinkat symlink test Christian Schoenebeck
2020-10-21 12:51 ` [PULL v3 16/17] tests/9pfs: add local Tlink test Christian Schoenebeck
2020-10-21 12:55 ` [PULL v3 17/17] tests/9pfs: add local Tunlinkat hard link test Christian Schoenebeck
2020-10-30 12:07 ` [PULL v3 03/17] tests/9pfs: fix coverity error in create_local_test_dir() Christian Schoenebeck
2020-10-30 12:46 ` [PULL v3 04/17] tests/9pfs: Force removing of local 9pfs test directory Christian Schoenebeck
2020-11-01 14:25 ` [PULL v3 01/17] tests/9pfs: make create/remove test dir public Christian Schoenebeck
2020-11-01 14:37 ` [PULL v3 02/17] tests/9pfs: fix test dir for parallel tests Christian Schoenebeck
2020-11-02 16:05 ` [PULL v3 00/17] 9p queue (previous 2020-10-30) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b37d62d6de08bea1f57e51a4b99938f7994a84d6.1604309512.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).