Message ID | 84ac76937855bf441242372cc3e62df42f0a3dc4.1603285620.git.qemu_oss@crudebyte.com |
---|---|
State | Accepted |
Commit | 59ff563db1cfb9f3a20075b452d1564585bbc66a |
Headers | show |
Series | 9pfs: more local tests | expand |
On Wed, 21 Oct 2020 14:33:34 +0200 Christian Schoenebeck <qemu_oss@crudebyte.com> wrote: > This test case uses a Tsymlink 9p request to create a symbolic link using > the 9pfs 'local' fs driver. > > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > tests/qtest/virtio-9p-test.c | 77 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 77 insertions(+) > > diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c > index 6b74a1fd7e..0c11417236 100644 > --- a/tests/qtest/virtio-9p-test.c > +++ b/tests/qtest/virtio-9p-test.c > @@ -259,6 +259,7 @@ static const char *rmessage_name(uint8_t id) > id == P9_RWRITE ? "RWRITE" : > id == P9_RMKDIR ? "RMKDIR" : > id == P9_RLCREATE ? "RLCREATE" : > + id == P9_RSYMLINK ? "RSYMLINK" : > id == P9_RUNLINKAT ? "RUNLINKAT" : > id == P9_RFLUSH ? "RFLUSH" : > id == P9_RREADDIR ? "READDIR" : > @@ -733,6 +734,39 @@ static void v9fs_rlcreate(P9Req *req, v9fs_qid *qid, uint32_t *iounit) > v9fs_req_free(req); > } > > +/* size[4] Tsymlink tag[2] fid[4] name[s] symtgt[s] gid[4] */ > +static P9Req *v9fs_tsymlink(QVirtio9P *v9p, uint32_t fid, const char *name, > + const char *symtgt, uint32_t gid, uint16_t tag) > +{ > + P9Req *req; > + > + uint32_t body_size = 4 + 4; > + uint16_t string_size = v9fs_string_size(name) + v9fs_string_size(symtgt); > + > + g_assert_cmpint(body_size, <=, UINT32_MAX - string_size); > + body_size += string_size; > + > + req = v9fs_req_init(v9p, body_size, P9_TSYMLINK, tag); > + v9fs_uint32_write(req, fid); > + v9fs_string_write(req, name); > + v9fs_string_write(req, symtgt); > + v9fs_uint32_write(req, gid); > + v9fs_req_send(req); > + return req; > +} > + > +/* size[4] Rsymlink tag[2] qid[13] */ > +static void v9fs_rsymlink(P9Req *req, v9fs_qid *qid) > +{ > + v9fs_req_recv(req, P9_RSYMLINK); > + if (qid) { > + v9fs_memread(req, qid, 13); > + } else { > + v9fs_memskip(req, 13); > + } > + 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) > @@ -1089,6 +1123,25 @@ static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, > return fid; > } > > +/* create symlink named @a clink in directory @a path pointing to @a to */ > +static void do_symlink(QVirtio9P *v9p, const char *path, const char *clink, > + const char *to) > +{ > + char *const name = g_strdup(clink); > + char *const dst = g_strdup(to); > + uint32_t fid; > + P9Req *req; > + > + fid = do_walk(v9p, path); > + > + req = v9fs_tsymlink(v9p, fid, name, dst, 0, 0); > + v9fs_req_wait_for_reply(req, NULL); > + v9fs_rsymlink(req, NULL); > + > + g_free(dst); > + g_free(name); > +} > + > static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rpath, > uint32_t flags) > { > @@ -1219,6 +1272,29 @@ static void fs_unlinkat_file(void *obj, void *data, QGuestAllocator *t_alloc) > g_free(new_file); > } > > +static void fs_symlink_file(void *obj, void *data, QGuestAllocator *t_alloc) > +{ > + QVirtio9P *v9p = obj; > + alloc = t_alloc; > + struct stat st; > + char *real_file = virtio_9p_test_path("05/real_file"); > + char *symlink_file = virtio_9p_test_path("05/symlink_file"); > + > + do_attach(v9p); > + do_mkdir(v9p, "/", "05"); > + do_lcreate(v9p, "05", "real_file"); > + g_assert(stat(real_file, &st) == 0); > + g_assert((st.st_mode & S_IFMT) == S_IFREG); > + > + do_symlink(v9p, "05", "symlink_file", "real_file"); > + > + /* check if created link exists now */ > + g_assert(stat(symlink_file, &st) == 0); > + > + g_free(symlink_file); > + g_free(real_file); > +} > + > static void *assign_9p_local_driver(GString *cmd_line, void *arg) > { > virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr"); > @@ -1262,6 +1338,7 @@ static void register_virtio_9p_test(void) > qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts); > qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts); > qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts); > + qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts); > } > > libqos_init(register_virtio_9p_test);
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 6b74a1fd7e..0c11417236 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -259,6 +259,7 @@ static const char *rmessage_name(uint8_t id) id == P9_RWRITE ? "RWRITE" : id == P9_RMKDIR ? "RMKDIR" : id == P9_RLCREATE ? "RLCREATE" : + id == P9_RSYMLINK ? "RSYMLINK" : id == P9_RUNLINKAT ? "RUNLINKAT" : id == P9_RFLUSH ? "RFLUSH" : id == P9_RREADDIR ? "READDIR" : @@ -733,6 +734,39 @@ static void v9fs_rlcreate(P9Req *req, v9fs_qid *qid, uint32_t *iounit) v9fs_req_free(req); } +/* size[4] Tsymlink tag[2] fid[4] name[s] symtgt[s] gid[4] */ +static P9Req *v9fs_tsymlink(QVirtio9P *v9p, uint32_t fid, const char *name, + const char *symtgt, uint32_t gid, uint16_t tag) +{ + P9Req *req; + + uint32_t body_size = 4 + 4; + uint16_t string_size = v9fs_string_size(name) + v9fs_string_size(symtgt); + + g_assert_cmpint(body_size, <=, UINT32_MAX - string_size); + body_size += string_size; + + req = v9fs_req_init(v9p, body_size, P9_TSYMLINK, tag); + v9fs_uint32_write(req, fid); + v9fs_string_write(req, name); + v9fs_string_write(req, symtgt); + v9fs_uint32_write(req, gid); + v9fs_req_send(req); + return req; +} + +/* size[4] Rsymlink tag[2] qid[13] */ +static void v9fs_rsymlink(P9Req *req, v9fs_qid *qid) +{ + v9fs_req_recv(req, P9_RSYMLINK); + if (qid) { + v9fs_memread(req, qid, 13); + } else { + v9fs_memskip(req, 13); + } + 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) @@ -1089,6 +1123,25 @@ static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, return fid; } +/* create symlink named @a clink in directory @a path pointing to @a to */ +static void do_symlink(QVirtio9P *v9p, const char *path, const char *clink, + const char *to) +{ + char *const name = g_strdup(clink); + char *const dst = g_strdup(to); + uint32_t fid; + P9Req *req; + + fid = do_walk(v9p, path); + + req = v9fs_tsymlink(v9p, fid, name, dst, 0, 0); + v9fs_req_wait_for_reply(req, NULL); + v9fs_rsymlink(req, NULL); + + g_free(dst); + g_free(name); +} + static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rpath, uint32_t flags) { @@ -1219,6 +1272,29 @@ static void fs_unlinkat_file(void *obj, void *data, QGuestAllocator *t_alloc) g_free(new_file); } +static void fs_symlink_file(void *obj, void *data, QGuestAllocator *t_alloc) +{ + QVirtio9P *v9p = obj; + alloc = t_alloc; + struct stat st; + char *real_file = virtio_9p_test_path("05/real_file"); + char *symlink_file = virtio_9p_test_path("05/symlink_file"); + + do_attach(v9p); + do_mkdir(v9p, "/", "05"); + do_lcreate(v9p, "05", "real_file"); + g_assert(stat(real_file, &st) == 0); + g_assert((st.st_mode & S_IFMT) == S_IFREG); + + do_symlink(v9p, "05", "symlink_file", "real_file"); + + /* check if created link exists now */ + g_assert(stat(symlink_file, &st) == 0); + + g_free(symlink_file); + g_free(real_file); +} + static void *assign_9p_local_driver(GString *cmd_line, void *arg) { virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr"); @@ -1262,6 +1338,7 @@ static void register_virtio_9p_test(void) qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts); qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts); qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts); + qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts); } libqos_init(register_virtio_9p_test);
This test case uses a Tsymlink 9p request to create a symbolic link using the 9pfs 'local' fs driver. Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> --- tests/qtest/virtio-9p-test.c | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)