From nobody Mon Feb 9 06:49:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1557156181; cv=none; d=zoho.com; s=zohoarc; b=VJTJ3xAVdU81R9V9WoZJRIEzkVdXwYA090QwGCdbAc7mXS417jNltdhIK1bO/Ilxr9+TewnPMOYNkDPFtyL7+w8PQ/S7RgrRW8Px92sBsrRILOEtCnQAlMjLUUhni2iJQVCaV9rffDZkuA6m4f8ZMTrgY0Q5qofaEG3jrxls7bg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557156181; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=f8OvdNhJQF3kmYWz248I2bzfrKUrfp0ofgOEVjyXQ6o=; b=Dq9358EuDsZpPXBhE/oxyDc5HOSodct2MUV98vbwsgnyo41htXOJ1Dej8Q5qqP/1eTBPmmeDwWLWIbMZSmE9C2iF6lEghmfSVBKZKCRBMcWaNj9oYnS8hgafSqK6hHxs/NQ4CeL9LH1R3JxtwF4zLMt4yy9hfwXeMiSRwCu0yFo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557156179989967.5623231228736; Mon, 6 May 2019 08:22:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:58140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNfSB-0007wD-PM for importer@patchew.org; Mon, 06 May 2019 11:22:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <7a29e2f807a9800f515b91e60c3a732b3abbd097@lizzy.crudebyte.com>) id 1hNfQp-0007Ji-5b for qemu-devel@nongnu.org; Mon, 06 May 2019 11:21:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <7a29e2f807a9800f515b91e60c3a732b3abbd097@lizzy.crudebyte.com>) id 1hNfQn-0003sB-Fv for qemu-devel@nongnu.org; Mon, 06 May 2019 11:21:31 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:58089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <7a29e2f807a9800f515b91e60c3a732b3abbd097@lizzy.crudebyte.com>) id 1hNfQn-0002tm-7Q for qemu-devel@nongnu.org; Mon, 06 May 2019 11:21:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Subject:Date:Cc:To:From:References:In-Reply-To: Message-Id:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=f8OvdNhJQF3kmYWz248I2bzfrKUrfp0ofgOEVjyXQ6o=; b=G1KafpeXZwVQdiYVQFBQ/ouxx 6X6qqJRTVqXPvse8MC8E1yjB48gAC8Jj4zwXMY+Hfa0YPyCVyKBy8ldXgyPY9iozmxyUvHbBBm1vg Z8/Vtfq2gq0XwYO6xqNgYQ0SNljFgiRFCNERrJg0npvz4q75R2QvDLwjViH6yIXI0DO16m/lBLdQs fz3Vq/CoAt8y0uErHtWPAZGESWdqkFJlFM9l8vJBv5Hx4BKGUDp/3nBBZsZLxw4sCT3N+/Su3q6Ta ffgefxGu7gW3MjIANc0M/aMneEN/f3HMJ3ARYruD0sFr6J4eNj0AMH17xmkEL1uzJxnVN5sCOKmp6 m6K/TxvKg==; Message-Id: <7a29e2f807a9800f515b91e60c3a732b3abbd097.1557093245.git.qemu_oss@crudebyte.com> In-Reply-To: References: To: qemu-devel@nongnu.org Date: Tue, 23 Apr 2019 13:35:23 +0200 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 91.194.90.13 Subject: [Qemu-devel] [PATCH v3 2/5] 9P: trivial cleanup of QID path collision mitigation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Christian Schoenebeck via Qemu-devel Reply-To: Christian Schoenebeck Cc: Greg Kurz , Antonios Motakis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Addresses trivial changes regarding the previous patch as requested on the mailing list a while ago. * Removed unneccessary parantheses: https://lists.gnu.org/archive/html/qemu-devel/2018-02/msg02661.html * Removed unneccessary g_malloc() result checks: https://lists.gnu.org/archive/html/qemu-devel/2018-02/msg02814.html * Unsigned type changes: https://lists.gnu.org/archive/html/qemu-devel/2018-02/msg02581.html Signed-off-by: Christian Schoenebeck --- fsdev/9p-marshal.h | 2 +- hw/9pfs/9p.c | 16 +++++----------- hw/9pfs/trace-events | 14 +++++++------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h index d1ad3645c4..8f3babb60a 100644 --- a/fsdev/9p-marshal.h +++ b/fsdev/9p-marshal.h @@ -9,7 +9,7 @@ typedef struct V9fsString =20 typedef struct V9fsQID { - int8_t type; + uint8_t type; uint32_t version; uint64_t path; } V9fsQID; diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index b9bbdcbaee..2b893e25a1 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -587,13 +587,13 @@ static uint32_t qpf_hash(QpfEntry e) static bool qpp_cmp_func(const void *obj, const void *userp) { const QppEntry *e1 =3D obj, *e2 =3D userp; - return (e1->dev =3D=3D e2->dev) && (e1->ino_prefix =3D=3D e2->ino_pref= ix); + return e1->dev =3D=3D e2->dev && e1->ino_prefix =3D=3D e2->ino_prefix; } =20 static bool qpf_cmp_func(const void *obj, const void *userp) { const QpfEntry *e1 =3D obj, *e2 =3D userp; - return (e1->dev =3D=3D e2->dev) && (e1->ino =3D=3D e2->ino); + return e1->dev =3D=3D e2->dev && e1->ino =3D=3D e2->ino; } =20 static void qp_table_remove(void *p, uint32_t h, void *up) @@ -630,9 +630,6 @@ static int qid_path_fullmap(V9fsPDU *pdu, const struct = stat *stbuf, } =20 val =3D g_malloc0(sizeof(QppEntry)); - if (!val) { - return -ENOMEM; - } *val =3D lookup; =20 /* new unique inode and device combo */ @@ -673,9 +670,6 @@ static int qid_path_prefixmap(V9fsPDU *pdu, const struc= t stat *stbuf, } =20 val =3D g_malloc0(sizeof(QppEntry)); - if (!val) { - return -ENOMEM; - } *val =3D lookup; =20 /* new unique inode prefix and device combo */ @@ -870,9 +864,9 @@ static int donttouch_stat(V9fsStat *stat) { if (stat->type =3D=3D -1 && stat->dev =3D=3D -1 && - stat->qid.type =3D=3D -1 && - stat->qid.version =3D=3D -1 && - stat->qid.path =3D=3D -1 && + stat->qid.type =3D=3D 0xff && + stat->qid.version =3D=3D (uint32_t) -1 && + stat->qid.path =3D=3D (uint64_t) -1 && stat->mode =3D=3D -1 && stat->atime =3D=3D -1 && stat->mtime =3D=3D -1 && diff --git a/hw/9pfs/trace-events b/hw/9pfs/trace-events index c0a0a4ab5d..6964756922 100644 --- a/hw/9pfs/trace-events +++ b/hw/9pfs/trace-events @@ -6,7 +6,7 @@ v9fs_rerror(uint16_t tag, uint8_t id, int err) "tag %d id %= d err %d" v9fs_version(uint16_t tag, uint8_t id, int32_t msize, char* version) "tag = %d id %d msize %d version %s" v9fs_version_return(uint16_t tag, uint8_t id, int32_t msize, char* version= ) "tag %d id %d msize %d version %s" v9fs_attach(uint16_t tag, uint8_t id, int32_t fid, int32_t afid, char* una= me, char* aname) "tag %u id %u fid %d afid %d uname %s aname %s" -v9fs_attach_return(uint16_t tag, uint8_t id, int8_t type, int32_t version,= int64_t path) "tag %d id %d type %d version %d path %"PRId64 +v9fs_attach_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t versio= n, uint64_t path) "tag %d id %d type %d version %d path %"PRId64 v9fs_stat(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" v9fs_stat_return(uint16_t tag, uint8_t id, int32_t mode, int32_t atime, in= t32_t mtime, int64_t length) "tag %d id %d stat=3D{mode %d atime %d mtime %= d length %"PRId64"}" v9fs_getattr(uint16_t tag, uint8_t id, int32_t fid, uint64_t request_mask)= "tag %d id %d fid %d request_mask %"PRIu64 @@ -14,9 +14,9 @@ v9fs_getattr_return(uint16_t tag, uint8_t id, uint64_t re= sult_mask, uint32_t mod v9fs_walk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, uint16_t = nwnames) "tag %d id %d fid %d newfid %d nwnames %d" v9fs_walk_return(uint16_t tag, uint8_t id, uint16_t nwnames, void* qids) "= tag %d id %d nwnames %d qids %p" v9fs_open(uint16_t tag, uint8_t id, int32_t fid, int32_t mode) "tag %d id = %d fid %d mode %d" -v9fs_open_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, i= nt64_t path, int iounit) "tag %d id %d qid=3D{type %d version %d path %"PRI= d64"} iounit %d" +v9fs_open_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t version,= uint64_t path, int iounit) "tag %d id %d qid=3D{type %d version %d path %"= PRId64"} iounit %d" v9fs_lcreate(uint16_t tag, uint8_t id, int32_t dfid, int32_t flags, int32_= t mode, uint32_t gid) "tag %d id %d dfid %d flags %d mode %d gid %u" -v9fs_lcreate_return(uint16_t tag, uint8_t id, int8_t type, int32_t version= , int64_t path, int32_t iounit) "tag %d id %d qid=3D{type %d version %d pat= h %"PRId64"} iounit %d" +v9fs_lcreate_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t versi= on, uint64_t path, int32_t iounit) "tag %d id %d qid=3D{type %d version %d = path %"PRId64"} iounit %d" v9fs_fsync(uint16_t tag, uint8_t id, int32_t fid, int datasync) "tag %d id= %d fid %d datasync %d" v9fs_clunk(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" v9fs_read(uint16_t tag, uint8_t id, int32_t fid, uint64_t off, uint32_t ma= x_count) "tag %d id %d fid %d off %"PRIu64" max_count %u" @@ -26,21 +26,21 @@ v9fs_readdir_return(uint16_t tag, uint8_t id, uint32_t = count, ssize_t retval) "t v9fs_write(uint16_t tag, uint8_t id, int32_t fid, uint64_t off, uint32_t c= ount, int cnt) "tag %d id %d fid %d off %"PRIu64" count %u cnt %d" v9fs_write_return(uint16_t tag, uint8_t id, int32_t total, ssize_t err) "t= ag %d id %d total %d err %zd" v9fs_create(uint16_t tag, uint8_t id, int32_t fid, char* name, int32_t per= m, int8_t mode) "tag %d id %d fid %d name %s perm %d mode %d" -v9fs_create_return(uint16_t tag, uint8_t id, int8_t type, int32_t version,= int64_t path, int iounit) "tag %d id %d qid=3D{type %d version %d path %"P= RId64"} iounit %d" +v9fs_create_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t versio= n, uint64_t path, int iounit) "tag %d id %d qid=3D{type %d version %d path = %"PRId64"} iounit %d" v9fs_symlink(uint16_t tag, uint8_t id, int32_t fid, char* name, char* sym= name, uint32_t gid) "tag %d id %d fid %d name %s symname %s gid %u" -v9fs_symlink_return(uint16_t tag, uint8_t id, int8_t type, int32_t version= , int64_t path) "tag %d id %d qid=3D{type %d version %d path %"PRId64"}" +v9fs_symlink_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t versi= on, uint64_t path) "tag %d id %d qid=3D{type %d version %d path %"PRId64"}" v9fs_flush(uint16_t tag, uint8_t id, int16_t flush_tag) "tag %d id %d flus= h_tag %d" v9fs_link(uint16_t tag, uint8_t id, int32_t dfid, int32_t oldfid, char* na= me) "tag %d id %d dfid %d oldfid %d name %s" v9fs_remove(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" v9fs_wstat(uint16_t tag, uint8_t id, int32_t fid, int32_t mode, int32_t at= ime, int32_t mtime) "tag %u id %u fid %d stat=3D{mode %d atime %d mtime %d}" v9fs_mknod(uint16_t tag, uint8_t id, int32_t fid, int mode, int major, int= minor) "tag %d id %d fid %d mode %d major %d minor %d" -v9fs_mknod_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, = int64_t path) "tag %d id %d qid=3D{type %d version %d path %"PRId64"}" +v9fs_mknod_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t version= , uint64_t path) "tag %d id %d qid=3D{type %d version %d path %"PRId64"}" v9fs_lock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t st= art, uint64_t length) "tag %d id %d fid %d type %d start %"PRIu64" length %= "PRIu64 v9fs_lock_return(uint16_t tag, uint8_t id, int8_t status) "tag %d id %d st= atus %d" v9fs_getlock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t= start, uint64_t length)"tag %d id %d fid %d type %d start %"PRIu64" length= %"PRIu64 v9fs_getlock_return(uint16_t tag, uint8_t id, uint8_t type, uint64_t start= , uint64_t length, uint32_t proc_id) "tag %d id %d type %d start %"PRIu64" = length %"PRIu64" proc_id %u" v9fs_mkdir(uint16_t tag, uint8_t id, int32_t fid, char* name, int mode, ui= nt32_t gid) "tag %u id %u fid %d name %s mode %d gid %u" -v9fs_mkdir_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, = int64_t path, int err) "tag %u id %u qid=3D{type %d version %d path %"PRId6= 4"} err %d" +v9fs_mkdir_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t version= , uint64_t path, int err) "tag %u id %u qid=3D{type %d version %d path %"PR= Id64"} err %d" v9fs_xattrwalk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, char= * name) "tag %d id %d fid %d newfid %d name %s" v9fs_xattrwalk_return(uint16_t tag, uint8_t id, int64_t size) "tag %d id %= d size %"PRId64 v9fs_xattrcreate(uint16_t tag, uint8_t id, int32_t fid, char* name, uint64= _t size, int flags) "tag %d id %d fid %d name %s size %"PRIu64" flags %d" --=20 2.11.0