From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06423C4363A for ; Thu, 22 Oct 2020 08:52:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6205520770 for ; Thu, 22 Oct 2020 08:52:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6205520770 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVWKk-0006r2-CS for qemu-devel@archiver.kernel.org; Thu, 22 Oct 2020 04:52:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVWK9-0006PW-8d for qemu-devel@nongnu.org; Thu, 22 Oct 2020 04:51:53 -0400 Received: from smtpout1.mo804.mail-out.ovh.net ([79.137.123.220]:50437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVWK7-0007KB-5c for qemu-devel@nongnu.org; Thu, 22 Oct 2020 04:51:52 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.108.1.93]) by mo804.mail-out.ovh.net (Postfix) with ESMTPS id D9CA36E404CF; Thu, 22 Oct 2020 10:51:47 +0200 (CEST) Received: from kaod.org (37.59.142.97) by DAG8EX1.mxp5.local (172.16.2.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Thu, 22 Oct 2020 10:51:47 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-97G00230d6238d-8e5b-4259-926b-ee3e29e94123, 519BB44447FDA57395BBEBCDF0C34CC9BD4694BF) smtp.auth=groug@kaod.org Date: Thu, 22 Oct 2020 10:51:46 +0200 From: Greg Kurz To: Christian Schoenebeck Subject: Re: [PATCH v2 3/8] tests/9pfs: add local Tlcreate test Message-ID: <20201022105146.70f8efb3@bahia.lan> In-Reply-To: <269cae0c00af941a3a4ae78f1e319f93462a7eb4.1603285620.git.qemu_oss@crudebyte.com> References: <269cae0c00af941a3a4ae78f1e319f93462a7eb4.1603285620.git.qemu_oss@crudebyte.com> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG4EX2.mxp5.local (172.16.2.32) To DAG8EX1.mxp5.local (172.16.2.71) X-Ovh-Tracer-GUID: 2ee56e8e-a510-43d4-9adc-aaf09be698a1 X-Ovh-Tracer-Id: 5197998397390559642 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedujedrjeejgddtlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhepfffhvffukfgjfhfogggtgfhisehtjeertdertddvnecuhfhrohhmpefirhgvghcumfhurhiiuceoghhrohhugheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeefuddtieejjeevheekieeltefgleetkeetheettdeifeffvefhffelffdtfeeljeenucfkpheptddrtddrtddrtddpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhg Received-SPF: pass client-ip=79.137.123.220; envelope-from=groug@kaod.org; helo=smtpout1.mo804.mail-out.ovh.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:51:48 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 21 Oct 2020 14:25:33 +0200 Christian Schoenebeck wrote: > This test case uses a Tlcreate 9p request to create a regular file inside > host's test directory. > > Signed-off-by: Christian Schoenebeck > --- Just one remark, see below. Reviewed-by: Greg Kurz > 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 abd7e44648..c030bc2a6c 100644 > --- a/tests/qtest/virtio-9p-test.c > +++ b/tests/qtest/virtio-9p-test.c > @@ -258,6 +258,7 @@ static const char *rmessage_name(uint8_t id) > id == P9_RLOPEN ? "RLOPEN" : > id == P9_RWRITE ? "RWRITE" : > id == P9_RMKDIR ? "RMKDIR" : > + id == P9_RLCREATE ? "RLCREATE" : > id == P9_RUNLINKAT ? "RUNLINKAT" : > id == P9_RFLUSH ? "RFLUSH" : > id == P9_RREADDIR ? "READDIR" : > @@ -694,6 +695,44 @@ static void v9fs_rmkdir(P9Req *req, v9fs_qid *qid) > v9fs_req_free(req); > } > > +/* size[4] Tlcreate tag[2] fid[4] name[s] flags[4] mode[4] gid[4] */ > +static P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, const char *name, > + uint32_t flags, uint32_t mode, uint32_t gid, > + uint16_t tag) > +{ > + P9Req *req; > + > + uint32_t body_size = 4 + 4 + 4 + 4; > + uint16_t string_size = v9fs_string_size(name); > + > + g_assert_cmpint(body_size, <=, UINT32_MAX - string_size); > + body_size += string_size; > + > + req = v9fs_req_init(v9p, body_size, P9_TLCREATE, tag); > + v9fs_uint32_write(req, fid); > + v9fs_string_write(req, name); > + v9fs_uint32_write(req, flags); > + v9fs_uint32_write(req, mode); > + v9fs_uint32_write(req, gid); > + v9fs_req_send(req); > + return req; > +} > + > +/* size[4] Rlcreate tag[2] qid[13] iounit[4] */ > +static void v9fs_rlcreate(P9Req *req, v9fs_qid *qid, uint32_t *iounit) > +{ > + v9fs_req_recv(req, P9_RLCREATE); > + if (qid) { > + v9fs_memread(req, qid, 13); > + } else { > + v9fs_memskip(req, 13); > + } > + if (iounit) { > + v9fs_uint32_read(req, iounit); > + } > + 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) > @@ -1032,6 +1071,24 @@ static void do_mkdir(QVirtio9P *v9p, const char *path, const char *cname) > g_free(name); > } > > +/* create a regular file with Tlcreate and return file's fid */ > +static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, > + const char *cname) > +{ > + char *const name = g_strdup(cname); > + uint32_t fid; > + P9Req *req; > + > + fid = do_walk(v9p, path); > + > + req = v9fs_tlcreate(v9p, fid, name, 0, 0750, 0, 0); Maybe it could make sense to make the mode a parameter of do_lcreate() in case someone wants to write a test case around that ? Same remark applies to do_mkdir() actually. No need to change this now anyway. > + v9fs_req_wait_for_reply(req, NULL); > + v9fs_rlcreate(req, NULL, NULL); > + > + g_free(name); > + return fid; > +} > + > static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rpath, > uint32_t flags) > { > @@ -1120,6 +1177,25 @@ static void fs_unlinkat_dir(void *obj, void *data, QGuestAllocator *t_alloc) > g_free(root_path); > } > > +static void fs_create_file(void *obj, void *data, QGuestAllocator *t_alloc) > +{ > + QVirtio9P *v9p = obj; > + alloc = t_alloc; > + struct stat st; > + char *new_file = virtio_9p_test_path("03/1st_file"); > + > + do_attach(v9p); > + do_mkdir(v9p, "/", "03"); > + do_lcreate(v9p, "03", "1st_file"); > + > + /* check if created file exists now ... */ > + g_assert(stat(new_file, &st) == 0); > + /* ... and is a regular file */ > + g_assert((st.st_mode & S_IFMT) == S_IFREG); > + > + g_free(new_file); > +} > + > static void *assign_9p_local_driver(GString *cmd_line, void *arg) > { > virtio_9p_assign_local_driver(cmd_line, "security_model=mapped-xattr"); > @@ -1161,6 +1237,7 @@ static void register_virtio_9p_test(void) > qos_add_test("local/config", "virtio-9p", pci_config, &opts); > qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts); > qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts); > + qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts); > } > > libqos_init(register_virtio_9p_test);