9pfs: fix 'Twalk' protocol violation
cover 9pfs: fix 'Twalk' protocol violation
Currently the implementation of 'Twalk' does not behave exactly as specified by the 9p2000 protocol specification. Actual fix is patch 5; see the description of that patch for details of what this overall fix and series is about.
Patch 4 is a preparatory (pure) refactoring change to make patch 5 better readable.
All the other patches are just additional test cases for guarding 'Twalk' behaviour.
Christian Schoenebeck (6):
tests/9pfs: walk to non-existent dir
tests/9pfs: Twalk with nwname=0
tests/9pfs: compare QIDs in fs_walk_none() test 9pfs: refactor 'name_idx' -> 'nvalid' in v9fs_walk() 9pfs: fix 'Twalk' to only send error if no component walked tests/9pfs: guard recent 'Twalk' behaviour fix
hw/9pfs/9p.c | 43 ++++++---- tests/qtest/virtio-9p-test.c | 162 ++++++++++++++++++++++++++++++++++- 2 files changed, 188 insertions(+), 17 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/6 tests/9pfs: walk to non-existent dir
Expect ENOENT Rlerror response when trying to walk to a non-existent directory.
--- tests/qtest/virtio-9p-test.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
tests/qtest/virtio-9p-test.c +30 -0
@@ -606,6 +606,25 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path)return fid; } +/* utility function: walk to requested dir and expect passed error response */ +static void do_walk_expect_error (QVirtio9P *v9p,const char *path,uint32_t err) +{ +char **wnames; +P9Req *req; +uint32_t _err; +const uint32_t fid =genfid (); + +int nwnames =split (path,"/" , &wnames); + + req =v9fs_twalk (v9p,0 , fid, nwnames, wnames,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rlerror (req, &_err); + + g_assert_cmpint(_err, ==, err); + +split_free (&wnames); +} +static void fs_version (void *obj,void *data,QGuestAllocator *t_alloc) { alloc = t_alloc;
@@ -974,6 +993,15 @@ static void fs_walk_no_slash(void *obj, void *data, QGuestAllocator *t_alloc)g_free (wnames[0 ]); } +static void fs_walk_nonexistent (void *obj,void *data,QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; + +do_attach (v9p); +do_walk_expect_error (v9p,"non-existent" ,ENOENT ); +} +static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;
@@ -1409,6 +1437,8 @@ static void register_virtio_9p_test(void) &opts);qos_add_test ("synth/walk/dotdot_from_root" ,"virtio-9p" , fs_walk_dotdot, &opts); +qos_add_test ("synth/walk/non_existent" ,"virtio-9p" , fs_walk_nonexistent, + &opts);qos_add_test ("synth/lopen/basic" ,"virtio-9p" , fs_lopen, &opts);qos_add_test ("synth/write/basic" ,"virtio-9p" , fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
Signature · 1 line
2.30.2
Re: [PATCH 1/6] tests/9pfs: walk to non-existent dir
Quoted 5 lines · On Wed, 9 Mar 2022 13:18:50 +0100 Christian Schoenebeck…
Expect ENOENT Rlerror response when trying to walk to a non-existent directory.
Signed-off-by Christian Schoenebeck <[email protected]>---
Quoted 58 lines
tests/qtest/virtio-9p-test.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)tests/qtest/virtio-9p-test.c +30
-0@@ -606,6 +606,25 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path)return fid; } +/* utility function: walk to requested dir and expect passed error response */ +static void do_walk_expect_error (QVirtio9P *v9p,const char *path,uint32_t err) +{ +char **wnames; +P9Req *req; +uint32_t _err; +const uint32_t fid =genfid (); + +int nwnames =split (path,"/" , &wnames); + + req =v9fs_twalk (v9p,0 , fid, nwnames, wnames,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rlerror (req, &_err); + + g_assert_cmpint(_err, ==, err); + +split_free (&wnames); +} +static void fs_version (void *obj,void *data,QGuestAllocator *t_alloc) { alloc = t_alloc;@@ -974,6 +993,15 @@ static void fs_walk_no_slash(void *obj, void *data, QGuestAllocator *t_alloc)g_free (wnames[0 ]); } +static void fs_walk_nonexistent (void *obj,void *data,QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; + +do_attach (v9p); +do_walk_expect_error (v9p,"non-existent" ,ENOENT ); +} +static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;@@ -1409,6 +1437,8 @@ static void register_virtio_9p_test(void) &opts);qos_add_test ("synth/walk/dotdot_from_root" ,"virtio-9p" , fs_walk_dotdot, &opts); +qos_add_test ("synth/walk/non_existent" ,"virtio-9p" , fs_walk_nonexistent, + &opts);qos_add_test ("synth/lopen/basic" ,"virtio-9p" , fs_lopen, &opts);qos_add_test ("synth/write/basic" ,"virtio-9p" , fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
PATCH 2/6 tests/9pfs: Twalk with nwname=0
In reply to Christian SchoenebeckSend Twalk request with nwname=0. In this case no QIDs should be returned by 9p server; this is equivalent to walking to dot.
--- tests/qtest/virtio-9p-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tests/qtest/virtio-9p-test.c +22 -0
@@ -1002,6 +1002,27 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc)do_walk_expect_error (v9p,"non-existent" ,ENOENT ); } +static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; +v9fs_qid root_qid; + g_autofree v9fs_qid *wqid = NULL; +P9Req *req; + +do_version (v9p); + req =v9fs_tattach (v9p,0 ,getuid (),0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rattach (req, &root_qid); + + req =v9fs_twalk (v9p,0 ,1 ,0 ,NULL ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rwalk (req,NULL , &wqid); + +/* special case: no QID is returned if nwname=0 was sent */ +g_assert (wqid ==NULL ); +} +static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;
@@ -1435,6 +1456,7 @@ static void register_virtio_9p_test(void)qos_add_test ("synth/walk/basic" ,"virtio-9p" , fs_walk, &opts);qos_add_test ("synth/walk/no_slash" ,"virtio-9p" , fs_walk_no_slash, &opts); +qos_add_test ("synth/walk/none" ,"virtio-9p" , fs_walk_none, &opts);qos_add_test ("synth/walk/dotdot_from_root" ,"virtio-9p" , fs_walk_dotdot, &opts); qos_add_test("synth/walk/non_existent", "virtio-9p", fs_walk_nonexistent,
Signature · 1 line
2.30.2
Re: [PATCH 2/6] tests/9pfs: Twalk with nwname=0
Quoted 13 lines · On Mittwoch, 9. März 2022 14:24:24 CET Christian Schoenebeck wrote:
Send Twalk request with nwname=0. In this case no QIDs should be returned by 9p server; this is equivalent to walking to dot.
Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)tests/qtest/virtio-9p-test.c +0
-0
tests/qtest/virtio-9p-test.c static void fs_walk_nonexistent(void *obj, void · line 1007
Quoted 6 lines
tests/qtest/virtio-9p-test.c +2
-0@@ -1002,6 +1002,27 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) do_walk_expect_error(v9p, "non-existent",ENOENT ); } +static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) +{
Or maybe calling this function fs_walk_clone_fid and the test case name "synth/walk/clone_fid" respectively instead?
Quoted 30 lines
tests/qtest/virtio-9p-test.c +19
-0+QVirtio9P *v9p = obj; + alloc = t_alloc; +v9fs_qid root_qid; + g_autofree v9fs_qid *wqid = NULL; +P9Req *req; + +do_version (v9p); + req =v9fs_tattach (v9p,0 ,getuid (),0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rattach (req, &root_qid); + + req =v9fs_twalk (v9p,0 ,1 ,0 ,NULL ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rwalk (req,NULL , &wqid); + +/* special case: no QID is returned if nwname=0 was sent */ +g_assert (wqid ==NULL ); +} +static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;tests/qtest/virtio-9p-test.c +1
-0@@ -1435,6 +1456,7 @@ static void register_virtio_9p_test(void)qos_add_test ("synth/walk/basic" ,"virtio-9p" , fs_walk, &opts);qos_add_test ("synth/walk/no_slash" ,"virtio-9p" , fs_walk_no_slash, &opts); +qos_add_test ("synth/walk/none" ,"virtio-9p" , fs_walk_none, &opts);qos_add_test ("synth/walk/dotdot_from_root" ,"virtio-9p" , fs_walk_dotdot, &opts); qos_add_test("synth/walk/non_existent", "virtio-9p", fs_walk_nonexistent,
Greg Kurz
Reviewed-byRe: [PATCH 2/6] tests/9pfs: Twalk with nwname=0
Quoted 18 lines · On Thu, 10 Mar 2022 09:57:25 +0100 Christian Schoenebeck…
Quoted 17 lines · On Mittwoch, 9. März 2022 14:24:24 CET Christian Schoenebeck wrote:
Send Twalk request with nwname=0. In this case no QIDs should be returned by 9p server; this is equivalent to walking to dot.
Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)tests/qtest/virtio-9p-test.c +0
-0@@ -1002,6 +1002,27 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) do_walk_expect_error(v9p, "non-existent",ENOENT ); }
Quoted 6 lines
tests/qtest/virtio-9p-test.c static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) · line 1006
Quoted 2 lines
tests/qtest/virtio-9p-test.c +2
-0+static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) +{Or maybe calling this function
fs_walk_clone_fidand the test case name "synth/walk/clone_fid" respectively instead?
I agree that Twalk with nwname=0 does clone the fid in practice but the test doesn't explicitly check that. In its present form, I'd suggest a "no_names" wording but it is already fine as is, so:
Quoted 32 lines
Quoted 30 lines
tests/qtest/virtio-9p-test.c +19
-0+QVirtio9P *v9p = obj; + alloc = t_alloc; +v9fs_qid root_qid; + g_autofree v9fs_qid *wqid = NULL; +P9Req *req; + +do_version (v9p); + req =v9fs_tattach (v9p,0 ,getuid (),0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rattach (req, &root_qid); + + req =v9fs_twalk (v9p,0 ,1 ,0 ,NULL ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rwalk (req,NULL , &wqid); + +/* special case: no QID is returned if nwname=0 was sent */ +g_assert (wqid ==NULL ); +} +static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;tests/qtest/virtio-9p-test.c +1
-0@@ -1435,6 +1456,7 @@ static void register_virtio_9p_test(void)qos_add_test ("synth/walk/basic" ,"virtio-9p" , fs_walk, &opts);qos_add_test ("synth/walk/no_slash" ,"virtio-9p" , fs_walk_no_slash, &opts); +qos_add_test ("synth/walk/none" ,"virtio-9p" , fs_walk_none, &opts);qos_add_test ("synth/walk/dotdot_from_root" ,"virtio-9p" , fs_walk_dotdot, &opts); qos_add_test("synth/walk/non_existent", "virtio-9p", fs_walk_nonexistent,
Re: [PATCH 2/6] tests/9pfs: Twalk with nwname=0
Quoted 31 lines · On Freitag, 11. März 2022 12:41:32 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 09:57:25 +0100
Quoted 19 lines · Christian Schoenebeck
Quoted 18 lines · On Mittwoch, 9. März 2022 14:24:24 CET Christian Schoenebeck wrote:
Send Twalk request with nwname=0. In this case no QIDs should be returned by 9p server; this is equivalent to walking to dot.
Signed-off-by Christian Schoenebeck <[email protected]>---
tests/qtest/virtio-9p-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)tests/qtest/virtio-9p-test.c +0
-0@@ -1002,6 +1002,27 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) do_walk_expect_error(v9p,"non-existent" ,ENOENT );Quoted 8 lines
Quoted 5 lines
tests/qtest/virtio-9p-test.c +1
-0} +static void fs_walk_none(void *obj, void *data, QGuestAllocator
*t_alloc)
+{Or maybe calling this function
fs_walk_clone_fidand the test case name "synth/walk/clone_fid" respectively instead?
Quoted 3 lines
I agree that Twalk with nwname=0 does clone the fid in practice but the test doesn't explicitly check that. In its present form, I'd suggest a "
no_names" wording but it is already fine as is, so:
It actually does; not with this patch 2 yet, but with patch 3 (which compares QIDs).
Quoted 1 line
Reviewed-by Greg Kurz <[email protected]>
Thanks!
Best regards,
Christian Schoenebeck
PATCH 3/6 tests/9pfs: compare QIDs in fs_walk_none() test
In reply to Christian SchoenebeckExtend previously added fs_walk_none() test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.
--- tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
tests/qtest/virtio-9p-test.c +70 -0
@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req, uint16_t *val)le16_to_cpus (val); } +static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val) {uint32_t le_val =cpu_to_le32 (val);
@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req, uint32_t *val)le32_to_cpus (val); } +static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {
@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid)v9fs_req_free (req); } +/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag) +{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req); +return req; +} + +/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); + +v9fs_int16_read (req, &st->size); +v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir (QVirtio9P *v9p,uint32_t fid,uint64_t offset,uint32_t count,uint16_t tag)
@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version (v9p); req =v9fs_tattach (v9p,0 ,getuid (),0 );
@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)/* special case: no QID is returned if nwname=0 was sent */ g_assert (wqid ==NULL ); + + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]); + + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */ +g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path); + +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + } }static void fs_walk_dotdot (void *obj,void *data,QGuestAllocator *t_alloc)
Signature · 1 line
2.30.2
Re: [PATCH 3/6] tests/9pfs: compare QIDs in fs_walk_none() test
Quoted 99 lines · On Mittwoch, 9. März 2022 15:49:04 CET Christian Schoenebeck wrote:
Extend previously added
fs_walk_none()test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)tests/qtest/virtio-9p-test.c +51
-0@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req, uint16_t *val)le16_to_cpus (val); } +static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val) {uint32_t le_val =cpu_to_le32 (val);@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req, uint32_t *val) le32_to_cpus(val); } +static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) v9fs_req_free(req); } +/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag) +{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req); +return req; +} + +/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); + +v9fs_int16_read (req, &st->size); +v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir (QVirtio9P *v9p,uint32_t fid,uint64_t offset,uint32_t count,uint16_t tag)@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version (v9p); req =v9fs_tattach (v9p,0 ,getuid (),0 );
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, · line 1079
Quoted 8 lines
tests/qtest/virtio-9p-test.c +4
-0@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)/* special case: no QID is returned if nwname=0 was sent */ g_assert(wqid == NULL); + + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]);
Probably stat-ing the root fid (0) should happen before sending Twalk, to better counter the 1st fid (0) having become potentially mutated?
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 8 lines
tests/qtest/virtio-9p-test.c +8
-0+ + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */ +g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path);
I could add a helper function is_same_qid() for this if desired.
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1093
Quoted 7 lines
tests/qtest/virtio-9p-test.c +7
-0+ +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + }
I didn't find a more elegant way to do this cleanup.
Quoted 3 lines
tests/qtest/virtio-9p-test.c +0
-0}static void
fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
Re: [PATCH 3/6] tests/9pfs: compare QIDs in fs_walk_none() test
Quoted 5 lines · On Thu, 10 Mar 2022 10:04:50 +0100 Christian Schoenebeck…
Quoted 4 lines · On Mittwoch, 9. März 2022 15:49:04 CET Christian Schoenebeck wrote:
Extend previously added
fs_walk_none()test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.
Ha, I understand your suggestion of changing the name now :-) but I'll personally leave it named according to the test scenario of "sending a Twalk with no names" and checking everything that is expected in this case.
Quoted 48 lines
Quoted 48 lines
Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)tests/qtest/virtio-9p-test.c +15
-0@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req, uint16_t *val)le16_to_cpus (val); } +static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val) {uint32_t le_val =cpu_to_le32 (val);@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req, uint32_t *val) le32_to_cpus(val); } +static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) v9fs_req_free(req); }
Quoted 2 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 444
Quoted 2 lines
tests/qtest/virtio-9p-test.c +2
-0+/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag)
Tstat/Rstat aren't part of 9p2000.L, you should use Tgetattr/Rgetattr instead (see https://github.com/chaos/diod/blob/master/protocol.md).
Quoted 6 lines
Quoted 6 lines
tests/qtest/virtio-9p-test.c +6
-0+{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req);
Quoted 8 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 458
Quoted 8 lines
tests/qtest/virtio-9p-test.c +8
-0+return req; +} + +/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); +
For the records, this is a stat[n], i.e. "n[2] followed by n bytes of data forming the parameter", so you should read an uint16_t first.
Quoted 33 lines
Quoted 33 lines
tests/qtest/virtio-9p-test.c +20
-0+v9fs_int16_read (req, &st->size); +v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir (QVirtio9P *v9p,uint32_t fid,uint64_t offset,uint32_t count,uint16_t tag)@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version (v9p); req =v9fs_tattach (v9p,0 ,getuid (),0 );@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)
Quoted 10 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1078
Quoted 6 lines
tests/qtest/virtio-9p-test.c +4
-0/* special case: no QID is returned if nwname=0 was sent */ g_assert (wqid ==NULL ); + + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]);Probably stat-ing the root fid (0) should happen before sending Twalk, to better counter the 1st fid (0) having become potentially mutated?
You already have the root qid from Rattach, no need to stat.
Quoted 11 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 8 lines
tests/qtest/virtio-9p-test.c +8
-0+ + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */ +g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path);I could add a helper function
is_same_qid()for this if desired.
Rgetattr provides a qid[13] like Rattach. Since we control everything, the version bits won't change and I think is_same_qid() could be something as simple as:
static inline bool is_same_qid(v9fs_qid qid1, v9fs_qid qid2)
{
return memcmp(qid1, qid2, 13) == 0;
}Quoted 10 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1093
Quoted 7 lines
tests/qtest/virtio-9p-test.c +7
-0+ +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + }I didn't find a more elegant way to do this cleanup.
You won't need that with Tgetattr.
Quoted 5 lines
Quoted 3 lines
tests/qtest/virtio-9p-test.c +0
-0}static void
fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
Re: [PATCH 3/6] tests/9pfs: compare QIDs in fs_walk_none() test
Quoted 4 lines · On Freitag, 11. März 2022 17:11:24 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:04:50 +0100
Quoted 1 line · Christian Schoenebeck
On Mittwoch, 9. März 2022 15:49:04 CET Christian Schoenebeck wrote:
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Extend previously added
fs_walk_none()test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.Ha, I understand your suggestion of changing the name now :-) but I'll personally leave it named according to the test scenario of "sending a Twalk with no names" and checking everything that is expected in this case.
NP
Quoted 58 lines
Quoted 58 lines
Quoted 58 lines
Signed-off-by Christian Schoenebeck <[email protected]>---
tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)tests/qtest/virtio-9p-test.c +5
-0@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req, uint16_t *val) le16_to_cpus(val); } +static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val){
uint32_t le_val = cpu_to_le32(val);tests/qtest/virtio-9p-test.c +10
-0@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req, uint32_t *val) le32_to_cpus(val); } +static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) v9fs_req_free(req);
Quoted 7 lines
Quoted 4 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 444
Quoted 4 lines
tests/qtest/virtio-9p-test.c +2
-0} +/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag)Tstat/Rstat aren't part of 9p2000.L, you should use Tgetattr/Rgetattr instead (see https://github.com/chaos/diod/blob/master/protocol.md).
Ah right, I forgot.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
tests/qtest/virtio-9p-test.c +9
-0+{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req); +return req; +} +
Quoted 10 lines
Quoted 5 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 458
Quoted 5 lines
tests/qtest/virtio-9p-test.c +5
-0+/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); +For the records, this is a stat[n], i.e. "n[2] followed by n bytes of data forming the parameter", so you should read an
uint16_tfirst.Quoted 1 line
Quoted 1 line
tests/qtest/virtio-9p-test.c +1
-0+v9fs_int16_read (req, &st->size);
Which I did here? --^
Quoted 50 lines
Quoted 42 lines
Quoted 42 lines
tests/qtest/virtio-9p-test.c +17
-0+v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir(QVirtio9P *v9p,
uint32_tfid,uint64_toffset,uint32_t count, uint16_t tag)tests/qtest/virtio-9p-test.c +2
-0@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version(v9p); req = v9fs_tattach(v9p, 0, getuid(), 0);tests/qtest/virtio-9p-test.c +0
-0@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)/* special case: no QID is returned if nwname=0 was sent */ g_assert(wqid == NULL);Quoted 7 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1078
Quoted 4 lines
tests/qtest/virtio-9p-test.c +4
-0+ + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]);Probably stat-ing the root fid (0) should happen before sending Twalk, to better counter the 1st fid (0) having become potentially mutated?
Quoted 1 line
You already have the root qid from Rattach, no need to stat.
Yes, this was about easy comparison with qid.version in mind, i.e. ...
Quoted 12 lines
Quoted 11 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 9 lines
tests/qtest/virtio-9p-test.c +8
-0+ + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */ +g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path);I could add a helper function
is_same_qid()for this if desired.
Quoted 8 lines
Rgetattr provides a qid[13] like Rattach. Since we control everything, the version bits won't change and I think
is_same_qid()could be something as simple as:static inline bool
is_same_qid(v9fs_qid qid1, v9fs_qid qid2){ return memcmp(qid1, qid2, 13) == 0; }
Yes I know, the version definitely won't change with the synth driver. But I thought to add code so it could be used for 'local' driver tests as well in future.
Quoted 16 lines
Quoted 9 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1093
Quoted 7 lines
tests/qtest/virtio-9p-test.c +7
-0+ +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + }I didn't find a more elegant way to do this cleanup.
You won't need that with Tgetattr.
Quoted 4 lines
Quoted 4 lines
tests/qtest/virtio-9p-test.c +0
-0}static void
fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
Re: [PATCH 3/6] tests/9pfs: compare QIDs in fs_walk_none() test
Quoted 102 lines · On Fri, 11 Mar 2022 17:39:56 +0100 Christian Schoenebeck…
Quoted 4 lines · On Freitag, 11. März 2022 17:11:24 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:04:50 +0100
Quoted 1 line · Christian Schoenebeck
On Mittwoch, 9. März 2022 15:49:04 CET Christian Schoenebeck wrote:
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Extend previously added
fs_walk_none()test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.Ha, I understand your suggestion of changing the name now :-) but I'll personally leave it named according to the test scenario of "sending a Twalk with no names" and checking everything that is expected in this case.
NP
Quoted 58 lines
Quoted 58 lines
Quoted 58 lines
Signed-off-by Christian Schoenebeck <[email protected]>---
tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)tests/qtest/virtio-9p-test.c +5
-0@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req, uint16_t *val) le16_to_cpus(val); } +static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val){
uint32_t le_val = cpu_to_le32(val);tests/qtest/virtio-9p-test.c +10
-0@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req, uint32_t *val) le32_to_cpus(val); } +static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) v9fs_req_free(req);Quoted 7 lines
Quoted 4 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 444
Quoted 4 lines
tests/qtest/virtio-9p-test.c +2
-0} +/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag)Tstat/Rstat aren't part of 9p2000.L, you should use Tgetattr/Rgetattr instead (see https://github.com/chaos/diod/blob/master/protocol.md).
Ah right, I forgot.
Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
tests/qtest/virtio-9p-test.c +6
-0+{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req);Quoted 8 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 458
Quoted 8 lines
tests/qtest/virtio-9p-test.c +8
-0+return req; +} + +/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); +For the records, this is a stat[n], i.e. "n[2] followed by n bytes of data forming the parameter", so you should read an
uint16_tfirst.
Quoted 4 lines
Quoted 1 line
Quoted 1 line
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 459
Quoted 1 line
tests/qtest/virtio-9p-test.c +1
-0+v9fs_int16_read (req, &st->size);Which I did here? --^
From the BUGS section of https://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor32 :
BUGS
To make the contents of a directory, such as returned by read(5), easy to parse, each directory entry begins with a size field. For consistency, the entries in Twstat and Rstat messages also contain their size, which means the size
^^^^
appears twice. For example, the Rstat message is formatted ^^^^^^^^^^^^^
as ``(4+1+2+2+n)[4] Rstat tag[2] n[2] (n-2)[2] type[2] dev[4]...,'' where n is the value returned by Styx->packdir.
I realized that when giving a try to convert a v9fs_qid to a V9fsQID on top of this patch.
Quoted 70 lines
Quoted 50 lines
Quoted 42 lines
Quoted 42 lines
tests/qtest/virtio-9p-test.c +17
-0+v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir(QVirtio9P *v9p,
uint32_tfid,uint64_toffset,uint32_t count, uint16_t tag)tests/qtest/virtio-9p-test.c +2
-0@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version(v9p); req = v9fs_tattach(v9p, 0, getuid(), 0);tests/qtest/virtio-9p-test.c +0
-0@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)/* special case: no QID is returned if nwname=0 was sent */ g_assert(wqid == NULL);Quoted 7 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1078
Quoted 4 lines
tests/qtest/virtio-9p-test.c +4
-0+ + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]);Probably stat-ing the root fid (0) should happen before sending Twalk, to better counter the 1st fid (0) having become potentially mutated?
Quoted 1 line
You already have the root qid from Rattach, no need to stat.
Yes, this was about easy comparison with qid.version in mind, i.e. ...
Quoted 16 lines
Quoted 11 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 9 lines
tests/qtest/virtio-9p-test.c +8
-0+ + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */ +g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path);I could add a helper function
is_same_qid()for this if desired.Rgetattr provides a qid[13] like Rattach. Since we control everything, the version bits won't change and I think
is_same_qid()could be something as simple as:
Quoted 9 lines
Quoted 4 lines
static inline bool
is_same_qid(v9fs_qid qid1, v9fs_qid qid2){ return memcmp(qid1, qid2, 13) == 0; }Yes I know, the version definitely won't change with the synth driver. But I thought to add code so it could be used for 'local' driver tests as well in future.
FWIW, even when using local, only an external cause could do that, which would mean that the test environment is compromised, no ?
You can also ignore version and just compare the first byte and the 8 last ones.
Quoted 18 lines
Quoted 16 lines
Quoted 9 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1093
Quoted 7 lines
tests/qtest/virtio-9p-test.c +7
-0+ +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + }I didn't find a more elegant way to do this cleanup.
You won't need that with Tgetattr.
Quoted 4 lines
Quoted 4 lines
tests/qtest/virtio-9p-test.c +0
-0}static void
fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
Re: [PATCH 3/6] tests/9pfs: compare QIDs in fs_walk_none() test
Quoted 129 lines · On Freitag, 11. März 2022 18:02:36 CET Greg Kurz wrote:
On Fri, 11 Mar 2022 17:39:56 +0100
Quoted 108 lines · Christian Schoenebeck
Quoted 4 lines · On Freitag, 11. März 2022 17:11:24 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:04:50 +0100
Quoted 1 line · Christian Schoenebeck
On Mittwoch, 9. März 2022 15:49:04 CET Christian Schoenebeck wrote:
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Extend previously added
fs_walk_none()test by comparing the QID of the root fid with the QID of the cloned fid. They should be equal.Ha, I understand your suggestion of changing the name now :-) but I'll personally leave it named according to the test scenario of "sending a Twalk with no names" and checking everything that is expected in this case.
NP
Quoted 63 lines
Quoted 63 lines
Quoted 63 lines
Signed-off-by Christian Schoenebeck <[email protected]>---
tests/qtest/virtio-9p-test.c | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)tests/qtest/virtio-9p-test.c +0
-0@@ -146,6 +146,11 @@ static void v9fs_uint16_read(P9Req *req,
uint16_t
*val)le16_to_cpus(val);}
tests/qtest/virtio-9p-test.c +5
-0+static void v9fs_int16_read (P9Req *req,int16_t *val) +{ +v9fs_uint16_read (req, (uint16_t *)val); +} +static void v9fs_uint32_write (P9Req *req,uint32_t val) {uint32_t le_val =cpu_to_le32 (val);@@ -166,12 +171,22 @@ static void v9fs_uint32_read(P9Req *req,
uint32_t
*val)le32_to_cpus(val);}
tests/qtest/virtio-9p-test.c +10
-0+static void v9fs_int32_read (P9Req *req,int32_t *val) +{ +v9fs_uint32_read (req, (uint32_t *)val); +} +static void v9fs_uint64_read (P9Req *req,uint64_t *val) {v9fs_memread (req, val,8 );le64_to_cpus (val); } +static void v9fs_int64_read (P9Req *req,int64_t *val) +{ +v9fs_uint64_read (req, (uint64_t *)val); +} +/* len[2] string[len] */ static uint16_t v9fs_string_size (const char *string) {@@ -425,6 +440,40 @@ static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) v9fs_req_free(req);Quoted 8 lines
Quoted 5 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid)
Quoted 5 lines
tests/qtest/virtio-9p-test.c +2
-0} +/* size[4] Tstat tag[2] fid[4] */ +static P9Req *v9fs_tstat (QVirtio9P *v9p,uint32_t fid,uint16_t tag)Tstat/Rstat aren't part of 9p2000.L, you should use Tgetattr/Rgetattr instead (see https://github.com/chaos/diod/blob/master/protocol.md).
Ah right, I forgot.
Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
tests/qtest/virtio-9p-test.c +6
-0+{ +P9Req *req; + + req =v9fs_req_init (v9p,4 ,P9_TSTAT , tag); +v9fs_uint32_write (req, fid); +v9fs_req_send (req);Quoted 8 lines
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 458
Quoted 8 lines
tests/qtest/virtio-9p-test.c +8
-0+return req; +} + +/* size[4] Rstat tag[2] stat[n] */ +static void v9fs_rstat (P9Req *req,struct V9fsStat *st) +{ +v9fs_req_recv (req,P9_RSTAT ); +For the records, this is a stat[n], i.e. "n[2] followed by n bytes of data forming the parameter", so you should read an
uint16_tfirst.Quoted 3 lines
Quoted 1 line
Quoted 1 line
tests/qtest/virtio-9p-test.c static void v9fs_rwalk(P9Req *req, uint16_t *nwqid, v9fs_qid **wqid) · line 459
Quoted 1 line
tests/qtest/virtio-9p-test.c +1
-0+v9fs_int16_read (req, &st->size);Which I did here? --^
From the BUGS section of
https://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor32 :BUGS
To make the contents of a directory, such as returned by read(5), easy to parse, each directory entry begins with a size field. For consistency, the entries in Twstat and Rstat messages also contain their size, which means the size
^^^^
appears twice. For example, the Rstat message is formatted ^^^^^^^^^^^^^
as ``(4+1+2+2+n)[4] Rstat tag[2] n[2] (n-2)[2] type[2] dev[4]...,'' where n is the value returned byStyx->packdir.
Quoted 2 lines
I realized that when giving a try to convert a
v9fs_qidto a V9fsQID on top of this patch.
Ouch, what a trap. Yeah, I didn't realize that.
Quoted 84 lines
Quoted 76 lines
Quoted 53 lines
Quoted 44 lines
Quoted 44 lines
tests/qtest/virtio-9p-test.c +17
-0+v9fs_int16_read (req, &st->type); +v9fs_int32_read (req, &st->dev); +v9fs_uint8_read (req, &st->qid.type); +v9fs_uint32_read (req, &st->qid.version); +v9fs_uint64_read (req, &st->qid.path); +v9fs_int32_read (req, &st->mode); +v9fs_int32_read (req, &st->mtime); +v9fs_int32_read (req, &st->atime); +v9fs_int64_read (req, &st->length); +v9fs_string_read (req, &st->name.size, &st->name.data); +v9fs_string_read (req, &st->uid.size, &st->uid.data); +v9fs_string_read (req, &st->gid.size, &st->gid.data); +v9fs_string_read (req, &st->muid.size, &st->muid.data); + +v9fs_req_free (req); +} +/* size[4] Treaddir tag[2] fid[4] offset[8] count[4] */ static P9Req *v9fs_treaddir(QVirtio9P *v9p,
uint32_tfid,uint64_toffset,uint32_t count, uint16_t tag)tests/qtest/virtio-9p-test.c +2
-0@@ -1009,6 +1058,8 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) v9fs_qid root_qid; g_autofree v9fs_qid *wqid = NULL;P9Req *req; +struct V9fsStat st[2 ]; +int i;do_version(v9p); req = v9fs_tattach(v9p, 0, getuid(), 0);tests/qtest/virtio-9p-test.c +0
-0@@ -1021,6 +1072,25 @@ static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc)/* special case: no QID is returned if nwname=0 was sent */ g_assert (wqid ==NULL );Quoted 8 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1078
Quoted 4 lines
tests/qtest/virtio-9p-test.c +4
-0+ + req =v9fs_tstat (v9p,0 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[0 ]);Probably stat-ing the root fid (0) should happen before sending Twalk, to
better counter the 1st fid (0) having become potentially mutated?Quoted 1 line
You already have the root qid from Rattach, no need to stat.
Yes, this was about easy comparison with qid.version in mind, i.e. ...
Quoted 19 lines
Quoted 11 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 9 lines
tests/qtest/virtio-9p-test.c +6
-0+ + req =v9fs_tstat (v9p,1 ,0 ); +v9fs_req_wait_for_reply (req,NULL ); +v9fs_rstat (req, &st[1 ]); + +/* don't compare QID version for checking for file ID equalness */
tests/qtest/virtio-9p-test.c +2
-0+g_assert (st[0 ].qid.type == st[1 ].qid.type); +g_assert (st[0 ].qid.path == st[1 ].qid.path);I could add a helper function
is_same_qid()for this if desired.Rgetattr provides a qid[13] like Rattach. Since we control everything, the version bits won't change and I think
is_same_qid()could be something as simple as:static inline bool
is_same_qid(v9fs_qid qid1, v9fs_qid qid2){Quoted 7 lines
Quoted 3 lines
return memcmp(qid1, qid2, 13) == 0;}
Yes I know, the version definitely won't change with the synth driver. But I thought to add code so it could be used for 'local' driver tests as well in future.
Quoted 5 lines
FWIW, even when using local, only an external cause could do that, which would mean that the test environment is compromised, no ?
You can also ignore version and just compare the first byte and the 8 last ones.
OK, I'll come up with some more simple code (raw byte comparison) in the way suggested by you. No big deal.
Thanks!
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 9 lines
tests/qtest/virtio-9p-test.c static void fs_walk_none(void *obj, void *data, QGuestAllocator *t_alloc) · line 1093
Quoted 7 lines
tests/qtest/virtio-9p-test.c +7
-0+ +for (i =0 ; i <2 ; ++i) { +g_free (st[i].name.data); +g_free (st[i].uid.data); +g_free (st[i].gid.data); +g_free (st[i].muid.data); + }I didn't find a more elegant way to do this cleanup.
You won't need that with Tgetattr.
Quoted 4 lines
Quoted 4 lines
}
static void
fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
PATCH 4/6 9pfs: refactor 'name_idx' -> 'nvalid' in v9fs_walk()
In reply to Christian SchoenebeckThe local variable 'name_idx' is used in two loops in function v9fs_walk(). Let the first loop use its own variable 'nvalid' instead, which we will use in subsequent patches as the number of (requested) path components successfully retrieved/walked by background I/O thread.
--- hw/9pfs/9p.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
hw/9pfs/9p.c +8 -8
@@ -1764,7 +1764,7 @@ static bool same_stat_id(const struct stat *a, const struct stat *b) static void coroutine_fn v9fs_walk(void *opaque) { -int name_idx; +int name_idx, nvalid; g_autofree V9fsQID *qids = NULL;int i, err =0 ;V9fsPath dpath, path;
@@ -1842,17 +1842,17 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (nvalid =0 ; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ; }if (!same_stat_id (&pdu->s->root_st, &stbuf) || -strcmp (".." , wnames[name_idx].data)) +strcmp (".." , wnames[nvalid].data)) { err = s->ops->name_to_path (&s->ctx, &dpath, - wnames[name_idx].data, - &pathes[name_idx]); + wnames[nvalid].data, + &pathes[nvalid]);if (err <0 ) { err = -errno;break ;
@@ -1861,13 +1861,13 @@ static void coroutine_fn v9fs_walk(void *opaque) err = -EINTR ;break ; } - err = s->ops->lstat (&s->ctx, &pathes[name_idx], &stbuf); + err = s->ops->lstat (&s->ctx, &pathes[nvalid], &stbuf);if (err <0 ) { err = -errno;break ; } - stbufs[name_idx] = stbuf; -v9fs_path_copy (&dpath, &pathes[name_idx]); + stbufs[nvalid] = stbuf; +v9fs_path_copy (&dpath, &pathes[nvalid]); } } });
Signature · 1 line
2.30.2
Re: [PATCH 4/6] 9pfs: refactor 'name_idx' -> 'nvalid' in v9fs_walk()
Quoted 15 lines · On Mittwoch, 9. März 2022 18:12:17 CET Christian Schoenebeck wrote:
The local variable '
name_idx' is used in two loops in functionv9fs_walk(). Let the first loop use its own variable 'nvalid' instead, which we will use in subsequent patches as the number of (requested) path components successfully retrieved/walked by background I/O thread.Signed-off-by Christian Schoenebeck <[email protected]>--- hw/9pfs/9p.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)hw/9pfs/9p.c +0
-0
hw/9pfs/9p.c static bool same_stat_id(const struct stat *a, const · line 1768
Quoted 6 lines
hw/9pfs/9p.c +1
-1@@ -1764,7 +1764,7 @@ static bool same_stat_id(const struct stat *a, const struct stat *b) static void coroutine_fn v9fs_walk(void *opaque) { -int name_idx; +int name_idx, nvalid;
Or rather renaming this nvalid -> nfetched?
Quoted 42 lines
hw/9pfs/9p.c +0
-0g_autofree V9fsQID *qids = NULL;int i, err =0 ;V9fsPath dpath, path;hw/9pfs/9p.c +7
-7@@ -1842,17 +1842,17 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (nvalid =0 ; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ; }if (!same_stat_id (&pdu->s->root_st, &stbuf) || -strcmp (".." , wnames[name_idx].data)) +strcmp (".." , wnames[nvalid].data)) { err = s->ops->name_to_path (&s->ctx, &dpath, - wnames[name_idx].data, - &pathes[name_idx]); + wnames[nvalid].data, + &pathes[nvalid]);if (err <0 ) { err = -errno;break ;@@ -1861,13 +1861,13 @@ static void coroutine_fn v9fs_walk(void *opaque) err = -EINTR ;break ; } - err = s->ops->lstat (&s->ctx, &pathes[name_idx], &stbuf); + err = s->ops->lstat (&s->ctx, &pathes[nvalid], &stbuf);if (err <0 ) { err = -errno;break ; } - stbufs[name_idx] = stbuf; -v9fs_path_copy (&dpath, &pathes[name_idx]); + stbufs[nvalid] = stbuf; +v9fs_path_copy (&dpath, &pathes[nvalid]); } } });
Greg Kurz
Reviewed-byRe: [PATCH 4/6] 9pfs: refactor 'name_idx' -> 'nvalid' in v9fs_walk()
Quoted 5 lines · On Thu, 10 Mar 2022 10:07:04 +0100 Christian Schoenebeck…
Quoted 4 lines · On Mittwoch, 9. März 2022 18:12:17 CET Christian Schoenebeck wrote:
The local variable '
name_idx' is used in two loops in functionv9fs_walk(). Let the first loop use its own variable 'nvalid' instead, which we will use in subsequent patches as the number of (requested) path components successfully retrieved/walked by background I/O thread.
I think walked is clear enough.
Quoted 13 lines
Quoted 13 lines
Signed-off-by Christian Schoenebeck <[email protected]>--- hw/9pfs/9p.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)hw/9pfs/9p.c +0
-0@@ -1764,7 +1764,7 @@ static bool same_stat_id(const struct stat *a, const struct stat *b)
Quoted 7 lines
hw/9pfs/9p.c static bool same_stat_id(const struct stat *a, const struct stat *b) · line 1767
Quoted 4 lines
hw/9pfs/9p.c +1
-1static void coroutine_fn v9fs_walk(void *opaque) { -int name_idx; +int name_idx, nvalid;Or rather renaming this nvalid -> nfetched?
or simply nwalked ?
Anyway,
Quoted 44 lines
Quoted 42 lines
hw/9pfs/9p.c +0
-0g_autofree V9fsQID *qids = NULL;int i, err =0 ;V9fsPath dpath, path;hw/9pfs/9p.c +7
-7@@ -1842,17 +1842,17 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (nvalid =0 ; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ; }if (!same_stat_id (&pdu->s->root_st, &stbuf) || -strcmp (".." , wnames[name_idx].data)) +strcmp (".." , wnames[nvalid].data)) { err = s->ops->name_to_path (&s->ctx, &dpath, - wnames[name_idx].data, - &pathes[name_idx]); + wnames[nvalid].data, + &pathes[nvalid]);if (err <0 ) { err = -errno;break ;@@ -1861,13 +1861,13 @@ static void coroutine_fn v9fs_walk(void *opaque) err = -EINTR ;break ; } - err = s->ops->lstat (&s->ctx, &pathes[name_idx], &stbuf); + err = s->ops->lstat (&s->ctx, &pathes[nvalid], &stbuf);if (err <0 ) { err = -errno;break ; } - stbufs[name_idx] = stbuf; -v9fs_path_copy (&dpath, &pathes[name_idx]); + stbufs[nvalid] = stbuf; +v9fs_path_copy (&dpath, &pathes[nvalid]); } } });
PATCH 5/6 9pfs: fix 'Twalk' to only send error if no component walked
In reply to Christian SchoenebeckCurrent implementation of 'Twalk' request handling always sends an 'Rerror' response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned. Otherwise, the walk will return an Rwalk message containing nwqid qids corresponding, in order, to the files that are visited by the nwqid successful elementwise walks; nwqid is therefore either nwname or the index of the first elementwise walk that failed.
"
http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.
Local variable 'nvalid' counts and reflects the number of path components successfully processed by background I/O thread, whereas local variable 'name_idx' subsequently counts and reflects the number of path components eventually accepted successfully by 9p server controller portion.
New local variable 'any_err' is an aggregate variable reflecting whether any error occurred at all, while already existing variable 'err' only reflects the last error.
Despite QIDs being delivered to client in a more relaxed way now, it is important to note though that fid still must remain uneffacted if any error occurred.
--- hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
hw/9pfs/9p.c +21 -8
@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path;P9ARRAY_REF (V9fsPath) pathes =NULL ;uint16_t nwnames;
@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void *opaque)* driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0; if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;
@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ;
@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err; err =stat_to_qid (pdu, &fidst, &qid); -if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;
@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) { - goto out; +break ; }v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid)); } + any_err |= err; +if (any_err) { +if (!name_idx) { +/* don't send any QIDs, send Rlerror instead */ + goto out; + }else { +/* send QIDs (not Rlerror), but fid MUST remain unaffected */ + goto send_qids; + } + }if (fid == newfid) {if (fidp->fid_type !=P9_FID_NONE ) { err = -EINVAL ;
@@ -1919,8 +1931,9 @@ static void coroutine_fn v9fs_walk(void *opaque) newfidp->uid = fidp->uid;v9fs_path_copy (&newfidp->path, &path); } - err =v9fs_walk_marshal (pdu, nwnames, qids); -trace_v9fs_walk_return (pdu->tag, pdu->id, nwnames, qids); +send_qids: + err =v9fs_walk_marshal (pdu, name_idx, qids); +trace_v9fs_walk_return (pdu->tag, pdu->id, name_idx, qids); out:put_fid (pdu, fidp);if (newfidp) {
Signature · 1 line
2.30.2
Re: [PATCH 5/6] 9pfs: fix 'Twalk' to only send error if no component walked
Quoted 22 lines · On Mittwoch, 9. März 2022 18:57:39 CET Christian Schoenebeck wrote:
Current implementation of 'Twalk' request handling always sends an 'Rerror' response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned. Otherwise, the walk will return an Rwalk message containing nwqid qids corresponding, in order, to the files that are visited by the nwqid successful elementwise walks; nwqid is therefore either nwname or the
index of the first elementwise walk that failed.
"http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function
v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.Local variable 'nvalid' counts and reflects the number of path components successfully processed by background I/O thread, whereas local variable '
name_idx' subsequently counts and reflects the number of path components eventually accepted successfully by 9p server controller portion.
Quoted 6 lines
New local variable '
any_err' is an aggregate variable reflecting whether any error occurred at all, while already existing variable 'err' only reflects the last error.Despite QIDs being delivered to client in a more relaxed way now, it is important to note though that fid still must remain uneffacted if any error
Typo: should be "unaffected".
Quoted 65 lines
occurred.
Signed-off-by Christian Schoenebeck <[email protected]>--- hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)hw/9pfs/9p.c +7
-5@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path;P9ARRAY_REF (V9fsPath) pathes =NULL ;uint16_t nwnames;@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void *opaque)* driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0; if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ;@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err; err =stat_to_qid (pdu, &fidst, &qid); -if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) {
hw/9pfs/9p.c static void coroutine_fn v9fs_walk(void *opaque) · line 1908
Quoted 10 lines
hw/9pfs/9p.c +3
-1- goto out; +break ; }v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid)); } + any_err |= err; +if (any_err) {
Not sure if there is ever the case err > 0, but as we are already comparing for "if (err < 0)" everywhere, we should probably also do the same comparison for the aggregate error variable here, right?
if (any_err < 0) {
...Quoted 23 lines
hw/9pfs/9p.c +11
-2+if (!name_idx) { +/* don't send any QIDs, send Rlerror instead */ + goto out; + }else { +/* send QIDs (not Rlerror), but fid MUST remain unaffected */ + goto send_qids; + } + }if (fid == newfid) {if (fidp->fid_type !=P9_FID_NONE ) { err = -EINVAL ;@@ -1919,8 +1931,9 @@ static void coroutine_fn v9fs_walk(void *opaque) newfidp->uid = fidp->uid;v9fs_path_copy (&newfidp->path, &path); } - err =v9fs_walk_marshal (pdu, nwnames, qids); -trace_v9fs_walk_return (pdu->tag, pdu->id, nwnames, qids); +send_qids: + err =v9fs_walk_marshal (pdu, name_idx, qids); +trace_v9fs_walk_return (pdu->tag, pdu->id, name_idx, qids); out:put_fid (pdu, fidp);if (newfidp) {
Re: [PATCH 5/6] 9pfs: fix 'Twalk' to only send error if no component walked
Quoted 104 lines · On Thu, 10 Mar 2022 10:13:33 +0100 Christian Schoenebeck…
Quoted 22 lines · On Mittwoch, 9. März 2022 18:57:39 CET Christian Schoenebeck wrote:
Current implementation of 'Twalk' request handling always sends an 'Rerror' response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned. Otherwise, the walk will return an Rwalk message containing nwqid qids corresponding, in order, to the files that are visited by the nwqid successful elementwise walks; nwqid is therefore either nwname or the
index of the first elementwise walk that failed.
"http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function
v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.Local variable 'nvalid' counts and reflects the number of path components successfully processed by background I/O thread, whereas local variable '
name_idx' subsequently counts and reflects the number of path components eventually accepted successfully by 9p server controller portion.Quoted 6 lines
New local variable '
any_err' is an aggregate variable reflecting whether any error occurred at all, while already existing variable 'err' only reflects the last error.Despite QIDs being delivered to client in a more relaxed way now, it is important to note though that fid still must remain uneffacted if any error
Typo: should be "unaffected".
Quoted 72 lines
occurred.
Signed-off-by Christian Schoenebeck <[email protected]>--- hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)hw/9pfs/9p.c +8
-6@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path;P9ARRAY_REF (V9fsPath) pathes =NULL ;uint16_t nwnames;@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void *opaque)* driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0; if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ;@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err; err =stat_to_qid (pdu, &fidst, &qid); -if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) { - goto out; +break ; }v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid));
Quoted 9 lines
hw/9pfs/9p.c static void coroutine_fn v9fs_walk(void *opaque) · line 1908
Quoted 3 lines
hw/9pfs/9p.c +2
-0} + any_err |= err; +if (any_err) {Not sure if there is ever the case err > 0, but as we are already comparing for "if (err < 0)" everywhere, we should probably also do the same comparison for the aggregate error variable here, right?
It seems that you could drop any_err and just check name_idx != nwnames ?
Quoted 28 lines
if (any_err < 0) { ...Quoted 23 lines
hw/9pfs/9p.c +11
-2+if (!name_idx) { +/* don't send any QIDs, send Rlerror instead */ + goto out; + }else { +/* send QIDs (not Rlerror), but fid MUST remain unaffected */ + goto send_qids; + } + }if (fid == newfid) {if (fidp->fid_type !=P9_FID_NONE ) { err = -EINVAL ;@@ -1919,8 +1931,9 @@ static void coroutine_fn v9fs_walk(void *opaque) newfidp->uid = fidp->uid;v9fs_path_copy (&newfidp->path, &path); } - err =v9fs_walk_marshal (pdu, nwnames, qids); -trace_v9fs_walk_return (pdu->tag, pdu->id, nwnames, qids); +send_qids: + err =v9fs_walk_marshal (pdu, name_idx, qids); +trace_v9fs_walk_return (pdu->tag, pdu->id, name_idx, qids); out:put_fid (pdu, fidp);if (newfidp) {
Re: [PATCH 5/6] 9pfs: fix 'Twalk' to only send error if no component walked
Quoted 161 lines · On Freitag, 11. März 2022 17:35:41 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:13:33 +0100
Quoted 150 lines · Christian Schoenebeck
Quoted 28 lines · On Mittwoch, 9. März 2022 18:57:39 CET Christian Schoenebeck wrote:
Current implementation of 'Twalk' request handling always sends an 'Rerror'
response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned.
Otherwise, the walk will return an Rwalk message containing nwqid qids corresponding, in order, to the files that are visited by the nwqid successful elementwise walks; nwqid is therefore either nwname or theindex of the first elementwise walk that failed.
"
http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function
v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.Local variable 'nvalid' counts and reflects the number of path components
successfully processed by background I/O thread, whereas local variable 'name_idx' subsequently counts and reflects the number of path components
eventually accepted successfully by 9p server controller portion.Quoted 7 lines
New local variable '
any_err' is an aggregate variable reflecting whether any error occurred at all, while already existing variable 'err' only reflects the last error.Despite QIDs being delivered to client in a more relaxed way now, it is important to note though that fid still must remain uneffacted if any error
Typo: should be "unaffected".
Quoted 111 lines
occurred.
Signed-off-by Christian Schoenebeck <[email protected]>---
hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)hw/9pfs/9p.c +1
-1@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path; P9ARRAY_REF(V9fsPath) pathes = NULL; uint16_t nwnames;hw/9pfs/9p.c +1
-0@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void *opaque)* driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0;if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;hw/9pfs/9p.c +1
-1@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;hw/9pfs/9p.c +2
-1@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err;err = stat_to_qid(pdu, &fidst, &qid);hw/9pfs/9p.c +3
-3-if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) { - goto out; +break ; }v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid)); }Quoted 7 lines
hw/9pfs/9p.c static void coroutine_fn v9fs_walk(void *opaque) · line 1908
Quoted 2 lines
hw/9pfs/9p.c +2
-0+ any_err |= err; +if (any_err) {Not sure if there is ever the case err > 0, but as we are already comparing
for "if (err < 0)" everywhere, we should probably also do the same comparison for the aggregate error variable here, right?
Quoted 1 line
It seems that you could drop
any_errand just checkname_idx!= nwnames ?
Mmm, what about the special case 'Twalk nwnames=0' (i.e. fid cloning), that implementation would then skip errors, no?
Quoted 36 lines
Quoted 36 lines
if (any_err < 0) { ...Quoted 33 lines
hw/9pfs/9p.c +5
-0+if (!name_idx) { +/* don't send any QIDs, send Rlerror instead */ + goto out; + }else { +/* send QIDs (not Rlerror), but fid MUST remain unaffected */
hw/9pfs/9p.c +6
-2+ goto send_qids; + } + }if (fid == newfid) {if (fidp->fid_type !=P9_FID_NONE ) { err = -EINVAL ;@@ -1919,8 +1931,9 @@ static void coroutine_fn v9fs_walk(void *opaque) newfidp->uid = fidp->uid;v9fs_path_copy (&newfidp->path, &path); } - err =v9fs_walk_marshal (pdu, nwnames, qids); -trace_v9fs_walk_return (pdu->tag, pdu->id, nwnames, qids); +send_qids: + err =v9fs_walk_marshal (pdu, name_idx, qids); +trace_v9fs_walk_return (pdu->tag, pdu->id, name_idx, qids);out:
put_fid(pdu, fidp); if (newfidp) {
Re: [PATCH 5/6] 9pfs: fix 'Twalk' to only send error if no component walked
Quoted 162 lines · On Fri, 11 Mar 2022 17:44:54 +0100 Christian Schoenebeck…
Quoted 161 lines · On Freitag, 11. März 2022 17:35:41 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:13:33 +0100
Quoted 157 lines · Christian Schoenebeck
Quoted 28 lines · On Mittwoch, 9. März 2022 18:57:39 CET Christian Schoenebeck wrote:
Current implementation of 'Twalk' request handling always sends an 'Rerror'
response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned.
Otherwise, the walk will return an Rwalk message containing nwqid qids corresponding, in order, to the files that are visited by the nwqid successful elementwise walks; nwqid is therefore either nwname or theindex of the first elementwise walk that failed.
"
http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function
v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.Local variable 'nvalid' counts and reflects the number of path components
successfully processed by background I/O thread, whereas local variable 'name_idx' subsequently counts and reflects the number of path components
eventually accepted successfully by 9p server controller portion.Quoted 7 lines
New local variable '
any_err' is an aggregate variable reflecting whether any error occurred at all, while already existing variable 'err' only reflects the last error.Despite QIDs being delivered to client in a more relaxed way now, it is important to note though that fid still must remain uneffacted if any error
Typo: should be "unaffected".
Quoted 103 lines
occurred.
Signed-off-by Christian Schoenebeck <[email protected]>---
hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)hw/9pfs/9p.c +1
-1@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path; P9ARRAY_REF(V9fsPath) pathes = NULL; uint16_t nwnames;hw/9pfs/9p.c +1
-0@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void *opaque)* driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0;if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;hw/9pfs/9p.c +1
-1@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;hw/9pfs/9p.c +2
-1@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err;err = stat_to_qid(pdu, &fidst, &qid);hw/9pfs/9p.c +3
-3-if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) { - goto out; +break ; }hw/9pfs/9p.c static void coroutine_fn v9fs_walk(void *opaque) · line 1908
Quoted 10 lines
hw/9pfs/9p.c +2
-0v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid)); } + any_err |= err; +if (any_err) {Not sure if there is ever the case err > 0, but as we are already comparing
for "if (err < 0)" everywhere, we should probably also do the same comparison for the aggregate error variable here, right?
Quoted 5 lines
Quoted 1 line
It seems that you could drop
any_errand just checkname_idx!= nwnames ?Mmm, what about the special case 'Twalk nwnames=0' (i.e. fid cloning), that implementation would then skip errors, no?
Ouch you're right... honestly, v9fs_walk() is really a mess and it is getting harder to fix. What about having a totally separate path for the cloning case (as a preparatory patch) ?
Quoted 38 lines
Quoted 36 lines
Quoted 36 lines
if (any_err < 0) { ...Quoted 33 lines
hw/9pfs/9p.c +5
-0+if (!name_idx) { +/* don't send any QIDs, send Rlerror instead */ + goto out; + }else { +/* send QIDs (not Rlerror), but fid MUST remain unaffected */
hw/9pfs/9p.c +6
-2+ goto send_qids; + } + }if (fid == newfid) {if (fidp->fid_type !=P9_FID_NONE ) { err = -EINVAL ;@@ -1919,8 +1931,9 @@ static void coroutine_fn v9fs_walk(void *opaque) newfidp->uid = fidp->uid;v9fs_path_copy (&newfidp->path, &path); } - err =v9fs_walk_marshal (pdu, nwnames, qids); -trace_v9fs_walk_return (pdu->tag, pdu->id, nwnames, qids); +send_qids: + err =v9fs_walk_marshal (pdu, name_idx, qids); +trace_v9fs_walk_return (pdu->tag, pdu->id, name_idx, qids);out:
put_fid(pdu, fidp); if (newfidp) {
Re: [PATCH 5/6] 9pfs: fix 'Twalk' to only send error if no component walked
Quoted 182 lines · On Freitag, 11. März 2022 18:08:38 CET Greg Kurz wrote:
On Fri, 11 Mar 2022 17:44:54 +0100
Quoted 179 lines · Christian Schoenebeck
Quoted 177 lines · On Freitag, 11. März 2022 17:35:41 CET Greg Kurz wrote:
On Thu, 10 Mar 2022 10:13:33 +0100
Quoted 164 lines · Christian Schoenebeck
Quoted 39 lines · On Mittwoch, 9. März 2022 18:57:39 CET Christian Schoenebeck wrote:
Current implementation of 'Twalk' request handling always sends an 'Rerror'
response if any error occured. The 9p2000 protocol spec sais though:
"
If the first element cannot be walked for any reason, Rerror is returned.
Otherwise, the walk will return an Rwalk message containing nwqid qids
corresponding, in order, to the files that are visited by the nwqid
successful elementwise walks; nwqid is therefore either nwname or theindex of the first elementwise walk that failed.
"
http://ericvh.github.io/9p-rfc/rfc9p2000.html#anchor33
For that reason we are no longer leaving from an error path in function
v9fs_walk(), unless really no path component could be walked successfully or if the request has been interrupted.Local variable 'nvalid' counts and reflects the number of path components
successfully processed by background I/O thread, whereas local variable
'name_idx' subsequently counts and reflects the number of path components
eventually accepted successfully by 9p server controller portion.New local variable '
any_err' is an aggregate variable reflecting whether
any error occurred at all, while already existing variable 'err' only
reflects the last error.Quoted 5 lines
Despite QIDs being delivered to client in a more relaxed way now, it is
important to note though that fid still must remain uneffacted if any
errorTypo: should be "unaffected".
Quoted 116 lines
occurred.
Signed-off-by Christian Schoenebeck <[email protected]>---
hw/9pfs/9p.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)hw/9pfs/9p.c +8
-6@@ -1766,7 +1766,7 @@ static void coroutine_fn v9fs_walk(void *opaque) {int name_idx, nvalid; g_autofree V9fsQID *qids = NULL; -int i, err =0 ; +int i, err =0 , any_err =0 ;V9fsPath dpath, path;P9ARRAY_REF (V9fsPath) pathes =NULL ;uint16_t nwnames;@@ -1832,6 +1832,7 @@ static void coroutine_fn v9fs_walk(void*opaque) * driver code altogether inside the following block. */ v9fs_co_run_in_worker({ + nvalid = 0; if (v9fs_request_cancelled(pdu)) { err = -EINTR; break;@@ -1842,7 +1843,7 @@ static void coroutine_fn v9fs_walk(void *opaque)break ; } stbuf = fidst; -for (nvalid =0 ; nvalid < nwnames; nvalid++) { +for (; nvalid < nwnames; nvalid++) {if (v9fs_request_cancelled (pdu)) { err = -EINTR ;break ;@@ -1874,12 +1875,13 @@ static void coroutine_fn v9fs_walk(void *opaque)/* * Handle all the rest of this Twalk request on main thread ... */ -if (err <0 ) { +if ((err <0 && !nvalid) || err == -EINTR ) { goto out; } + any_err |= err; err =stat_to_qid (pdu, &fidst, &qid); -if (err <0 ) { +if (err <0 && !nvalid) { goto out; } stbuf = fidst;@@ -1888,20 +1890,30 @@ static void coroutine_fn v9fs_walk(void *opaque)v9fs_path_copy (&dpath, &fidp->path);v9fs_path_copy (&path, &fidp->path); -for (name_idx =0 ; name_idx < nwnames; name_idx++) { +for (name_idx =0 ; name_idx < nvalid; name_idx++) {if (!same_stat_id (&pdu->s->root_st, &stbuf) ||strcmp (".." , wnames[name_idx].data)) { stbuf = stbufs[name_idx]; err =stat_to_qid (pdu, &stbuf, &qid);if (err <0 ) { - goto out; +break ; }v9fs_path_copy (&path, &pathes[name_idx]);v9fs_path_copy (&dpath, &path); }memcpy (&qids[name_idx], &qid,sizeof (qid)); }Quoted 7 lines
hw/9pfs/9p.c static void coroutine_fn v9fs_walk(void *opaque) · line 1908
Quoted 2 lines
hw/9pfs/9p.c +2
-0+ any_err |= err; +if (any_err) {Not sure if there is ever the case err > 0, but as we are already comparing
for "if (err < 0)" everywhere, we should probably also do the same comparison for the aggregate error variable here, right?It seems that you could drop
any_errand just checkname_idx!= nwnames ?
Quoted 7 lines
Quoted 3 lines
Mmm, what about the special case 'Twalk nwnames=0' (i.e. fid cloning), that
implementation would then skip errors, no?Ouch you're right... honestly,
v9fs_walk()is really a mess and it is getting harder to fix. What about having a totally separate path for the cloning case (as a preparatory patch) ?
You suggested that before, somehow I did not get to simpler code when trying that, rather the opposite. But you definitely have a better eye on identifying redundant pathes than me.
There are some things that can still be wiped away, like the path vs. dpath variables, but I thought to do that a bit later.
Best regards,
Christian Schoenebeck
PATCH 6/6 tests/9pfs: guard recent 'Twalk' behaviour fix
In reply to Christian SchoenebeckPrevious 9p patch fixed 'Twalk' request handling, which was previously not behaving as specified by the 9p2000 protocol spec. This patch adds a new test case which guards the new 'Twalk' behaviour in question.
More specifically: it sends a 'Twalk' request where the 1st path component is valid, whereas the 2nd path component transmitted to server does not exist. The expected behaviour is that 9p server would respond by sending a 'Rwalk' response with exactly 1 QID (instead of 'Rlerror' response).
--- tests/qtest/virtio-9p-test.c | 42 +++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-)
tests/qtest/virtio-9p-test.c +39 -3
@@ -638,8 +638,12 @@ static void do_version(QVirtio9P *v9p)g_assert_cmpmem (server_version, server_len, version,strlen (version)); } -/* utility function: walk to requested dir and return fid for that dir */ -static uint32_t do_walk (QVirtio9P *v9p,const char *path) +/* +* utility function: walk to requested dir and return fid for that dir and +* the QIDs of server response +*/ +static uint32_t do_walk_rqids (QVirtio9P *v9p,const char *path,uint16_t *nwqid, +v9fs_qid **wqid) {char **wnames;P9Req *req;
@@ -649,12 +653,18 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path) req =v9fs_twalk (v9p,0 , fid, nwnames, wnames,0 );v9fs_req_wait_for_reply (req,NULL ); -v9fs_rwalk (req,NULL ,NULL ); +v9fs_rwalk (req, nwqid, wqid);split_free (&wnames);return fid; } +/* utility function: walk to requested dir and return fid for that dir */ +static uint32_t do_walk (QVirtio9P *v9p,const char *path) +{ +return do_walk_rqids (v9p, path,NULL ,NULL ); +} +/* utility function: walk to requested dir and expect passed error response */ static void do_walk_expect_error (QVirtio9P *v9p,const char *path,uint32_t err) {
@@ -1048,9 +1058,33 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) alloc = t_alloc;do_attach (v9p); +/* +* The 9p2000 protocol spec sais: "If the first element cannot be walked +* for any reason, Rerror is returned." +*/ do_walk_expect_error (v9p,"non-existent" ,ENOENT ); } +static void fs_walk_2nd_nonexistent (void *obj,void *data, +QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; +uint16_t nwqid; + g_autofree v9fs_qid *wqid = NULL; + g_autofree char *path = g_strdup_printf( +QTEST_V9FS_SYNTH_WALK_FILE "/non-existent" ,0 + ); + +do_attach (v9p); +do_walk_rqids (v9p, path, &nwqid, &wqid); +/* +* The 9p2000 protocol spec sais: "nwqid is therefore either nwname or the +* index of the first elementwise walk that failed." +*/ +assert (nwqid ==1 ); +} +static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;
@@ -1531,6 +1565,8 @@ static void register_virtio_9p_test(void) fs_walk_dotdot, &opts);qos_add_test ("synth/walk/non_existent" ,"virtio-9p" , fs_walk_nonexistent, &opts); +qos_add_test ("synth/walk/2nd_non_existent" ,"virtio-9p" , + fs_walk_2nd_nonexistent, &opts);qos_add_test ("synth/lopen/basic" ,"virtio-9p" , fs_lopen, &opts);qos_add_test ("synth/write/basic" ,"virtio-9p" , fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
Signature · 1 line
2.30.2
Re: [PATCH 6/6] tests/9pfs: guard recent 'Twalk' behaviour fix
Quoted 81 lines · On Mittwoch, 9. März 2022 19:21:18 CET Christian Schoenebeck wrote:
Previous 9p patch fixed 'Twalk' request handling, which was previously not behaving as specified by the 9p2000 protocol spec. This patch adds a new test case which guards the new 'Twalk' behaviour in question.
More specifically: it sends a 'Twalk' request where the 1st path component is valid, whereas the 2nd path component transmitted to server does not exist. The expected behaviour is that 9p server would respond by sending a 'Rwalk' response with exactly 1 QID (instead of 'Rlerror' response).
Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 42 +++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-)tests/qtest/virtio-9p-test.c +12
-3@@ -638,8 +638,12 @@ static void do_version(QVirtio9P *v9p)g_assert_cmpmem (server_version, server_len, version,strlen (version)); } -/* utility function: walk to requested dir and return fid for that dir */ -static uint32_t do_walk(QVirtio9P *v9p, const char *path) +/* +* utility function: walk to requested dir and return fid for that dir and +* the QIDs of server response +*/ +static uint32_t do_walk_rqids (QVirtio9P *v9p,const char *path,uint16_t *nwqid, + v9fs_qid **wqid) {char **wnames;P9Req *req;@@ -649,12 +653,18 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path) req =v9fs_twalk (v9p,0 , fid, nwnames, wnames,0 );v9fs_req_wait_for_reply (req,NULL ); -v9fs_rwalk (req,NULL ,NULL ); +v9fs_rwalk (req, nwqid, wqid);split_free (&wnames);return fid; } +/* utility function: walk to requested dir and return fid for that dir */ +static uint32_t do_walk (QVirtio9P *v9p,const char *path) +{ +return do_walk_rqids (v9p, path,NULL ,NULL ); +} +/* utility function: walk to requested dir and expect passed error response */ static void do_walk_expect_error(QVirtio9P *v9p, const char *path,
uint32_terr) {tests/qtest/virtio-9p-test.c +2
-0@@ -1048,9 +1058,33 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) alloc = t_alloc;do_attach (v9p); +/* +* The 9p2000 protocol spec sais: "If the first element cannot be walked + * for any reason, Rerror is returned."
tests/qtest/virtio-9p-test.c +16
-0+*/ do_walk_expect_error (v9p,"non-existent" ,ENOENT ); } +static void fs_walk_2nd_nonexistent (void *obj,void *data, +QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; +uint16_t nwqid; + g_autofree v9fs_qid *wqid = NULL; + g_autofree char *path = g_strdup_printf( +QTEST_V9FS_SYNTH_WALK_FILE "/non-existent" ,0 + ); + +do_attach (v9p); +do_walk_rqids (v9p, path, &nwqid, &wqid); +/* +* The 9p2000 protocol spec sais: "nwqid is therefore either nwname or the + * index of the first elementwise walk that failed."
tests/qtest/virtio-9p-test.c static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) · line 1086
Quoted 3 lines
tests/qtest/virtio-9p-test.c +3
-0+*/ +assert (nwqid ==1 ); +}
I should probably extend this test case with a separate 7th patch to check that fid was really unaffected by Twalk, by comparing the QID before vs. after the walk (similar to what patch 3 does).
Quoted 13 lines
tests/qtest/virtio-9p-test.c +3
-0+static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;@@ -1531,6 +1565,8 @@ static void register_virtio_9p_test(void) fs_walk_dotdot, &opts);qos_add_test ("synth/walk/non_existent" ,"virtio-9p" , fs_walk_nonexistent, &opts); +qos_add_test ("synth/walk/2nd_non_existent" ,"virtio-9p" , + fs_walk_2nd_nonexistent, &opts);qos_add_test ("synth/lopen/basic" ,"virtio-9p" , fs_lopen, &opts);qos_add_test ("synth/write/basic" ,"virtio-9p" , fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
Re: [PATCH 6/6] tests/9pfs: guard recent 'Twalk' behaviour fix
In reply to Christian SchoenebeckQuoted 54 lines · On Wed, 9 Mar 2022 19:21:18 +0100 Christian Schoenebeck…
Previous 9p patch fixed 'Twalk' request handling, which was previously not behaving as specified by the 9p2000 protocol spec. This patch adds a new test case which guards the new 'Twalk' behaviour in question.
More specifically: it sends a 'Twalk' request where the 1st path component is valid, whereas the 2nd path component transmitted to server does not exist. The expected behaviour is that 9p server would respond by sending a 'Rwalk' response with exactly 1 QID (instead of 'Rlerror' response).
Signed-off-by Christian Schoenebeck <[email protected]>--- tests/qtest/virtio-9p-test.c | 42 +++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-)tests/qtest/virtio-9p-test.c +13
-3@@ -638,8 +638,12 @@ static void do_version(QVirtio9P *v9p)g_assert_cmpmem (server_version, server_len, version,strlen (version)); } -/* utility function: walk to requested dir and return fid for that dir */ -static uint32_t do_walk (QVirtio9P *v9p,const char *path) +/* +* utility function: walk to requested dir and return fid for that dir and +* the QIDs of server response +*/ +static uint32_t do_walk_rqids (QVirtio9P *v9p,const char *path,uint16_t *nwqid, +v9fs_qid **wqid) {char **wnames;P9Req *req;@@ -649,12 +653,18 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path) req =v9fs_twalk (v9p,0 , fid, nwnames, wnames,0 );v9fs_req_wait_for_reply (req,NULL ); -v9fs_rwalk (req,NULL ,NULL ); +v9fs_rwalk (req, nwqid, wqid);split_free (&wnames);return fid; } +/* utility function: walk to requested dir and return fid for that dir */ +static uint32_t do_walk (QVirtio9P *v9p,const char *path) +{ +return do_walk_rqids (v9p, path,NULL ,NULL ); +} +/* utility function: walk to requested dir and expect passed error response */ static void do_walk_expect_error (QVirtio9P *v9p,const char *path,uint32_t err) {
tests/qtest/virtio-9p-test.c static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) · line 1062
Quoted 5 lines
tests/qtest/virtio-9p-test.c +2
-0@@ -1048,9 +1058,33 @@ static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) alloc = t_alloc;do_attach (v9p); +/* +* The 9p2000 protocol spec sais: "If the first element cannot be walked
s/sais/says/ and elsewhere
LGTM.
Quoted 37 lines
tests/qtest/virtio-9p-test.c +24
-0+* for any reason, Rerror is returned." +*/ do_walk_expect_error (v9p,"non-existent" ,ENOENT ); } +static void fs_walk_2nd_nonexistent (void *obj,void *data, +QGuestAllocator *t_alloc) +{ +QVirtio9P *v9p = obj; + alloc = t_alloc; +uint16_t nwqid; + g_autofree v9fs_qid *wqid = NULL; + g_autofree char *path = g_strdup_printf( +QTEST_V9FS_SYNTH_WALK_FILE "/non-existent" ,0 + ); + +do_attach (v9p); +do_walk_rqids (v9p, path, &nwqid, &wqid); +/* +* The 9p2000 protocol spec sais: "nwqid is therefore either nwname or the +* index of the first elementwise walk that failed." +*/ +assert (nwqid ==1 ); +} +static void fs_walk_none (void *obj,void *data,QGuestAllocator *t_alloc) {QVirtio9P *v9p = obj;@@ -1531,6 +1565,8 @@ static void register_virtio_9p_test(void) fs_walk_dotdot, &opts);qos_add_test ("synth/walk/non_existent" ,"virtio-9p" , fs_walk_nonexistent, &opts); +qos_add_test ("synth/walk/2nd_non_existent" ,"virtio-9p" , + fs_walk_2nd_nonexistent, &opts);qos_add_test ("synth/lopen/basic" ,"virtio-9p" , fs_lopen, &opts);qos_add_test ("synth/write/basic" ,"virtio-9p" , fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,