From nobody Wed Apr 9 01:19:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=crudebyte.com ARC-Seal: i=1; a=rsa-sha256; t=1734347702; cv=none; d=zohomail.com; s=zohoarc; b=TJldp2U6kOBEQkqTnVd34L+erwurKkjN6Q/rJjQYQubGmGO+TyI/yaf+aQR11bQHmeq0BBadcPVygKebGQCsRAK3ucWYzYnz3yhdUVD1wuNR98kZFZo89ZOAr3/dWa7VkF/BFCqT9P0cFak0mGN1ENZt8hvNoRpZTO0rIZ5Ayjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734347702; h=Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=z5hbiMLikz/NIL28pn2H3+evM6T6IAlAeDSXnOqHLqs=; b=dn701jZSM9ZBmL9pmtacW3/frm2JSbHKWSDNny0GLD1IGlWuHRqA0msi+SQ/taRMQOK0E/socSXtlXXmH7zTyP/kBh6UytwucfyRAW5L8K/ziLnQ7/2zoWDDe1VdakUDC+EjsrhW9ID4reuHidMIgOD3nSheXG5IhCWM/ZI0iKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1734347702375446.39450071864053; Mon, 16 Dec 2024 03:15:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tN93I-0005ur-P6; Mon, 16 Dec 2024 06:14:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <2b0def07e1f3d0e1de5190e94dc587b94391ead9@kylie.crudebyte.com>) id 1tN93G-0005uR-P0 for qemu-devel@nongnu.org; Mon, 16 Dec 2024 06:14:15 -0500 Received: from kylie.crudebyte.com ([5.189.157.229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <2b0def07e1f3d0e1de5190e94dc587b94391ead9@kylie.crudebyte.com>) id 1tN93E-00008X-Rg for qemu-devel@nongnu.org; Mon, 16 Dec 2024 06:14:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=kylie; h=Message-Id:Cc:To:Subject:Date:From:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Content-ID: Content-Description; bh=z5hbiMLikz/NIL28pn2H3+evM6T6IAlAeDSXnOqHLqs=; b=sMxye E/ijj1e8Rq+lxtHs9zRRWzOuAQUVKAEJMrhy11KCBoD8cyYOq7setcRJgxSvkC3Upk0QSPXq62Ygf 4lH4XvA1vJ18I0/DtT7OCy1t+QcoTYYP06kIflvU7agddWvJbFwFs09fya8F6Zbsxz3Zfh+lVronL 7X0HE/zJyk3o+nNLbfNsjxnZHyHXiRhULNzMJOEb2Gr1jbf6o9veE6fe/OCITHu+g2gllN8CfFdhZ Dq1RWkIQo0XwNuOWBY6Mgn1qmGXCouqrmZ0GQ0Tcf8B65Flo7wexja1lnN2JCxct+mjEBbE9B7wvy bitiaE2fSSfVHuvFa40mijpu9L7fbOnFXUjDuJjZOkyyZQx3Yt5kDtx0yR3VLfxF/IGsUDG6HFCsI vCcQjte9GAle5eLEvqEmyco39EdzIRPGhfgVPkc3gDhHM9rHRrEjGFyk03cKJZDWC+07O4O2KJx66 m9AuU8keW2Kc2ry3KxO56AR4KRcWDbpgcwtVPS5LBlzQyyUFNJFtUQQTcUgVALrSUM/Kwa16tLzij us2u7EeeRMBy5HxClBlCbkhqj2qMRNYVjS+tjC8Tlxz2LMQOPK1WgqVEMkuL8rXMwTIanSyV/M7yz vwPJTOrqhA99VUnZxvRJ13Fm+aiqNKi8FQU8K+OnPnVcSAdtfO2voNDipAFh9g=; From: Christian Schoenebeck Date: Mon, 16 Dec 2024 11:30:09 +0100 Subject: [PATCH] 9pfs: improve v9fs_open() tracing To: qemu-devel@nongnu.org Cc: Greg Kurz Message-Id: Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=5.189.157.229; envelope-from=2b0def07e1f3d0e1de5190e94dc587b94391ead9@kylie.crudebyte.com; helo=kylie.crudebyte.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @crudebyte.com) X-ZM-MESSAGEID: 1734347704812116600 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Improve tracing of 9p 'Topen' request type by showing open() flags as human-readable text. E.g. trace output: v9fs_open tag 0 id 12 fid 2 mode 100352 would become: v9fs_open tag=3D0 id=3D12 fid=3D2 mode=3D100352(RDONLY|NONBLOCK|DIRECTORY| TMPFILE|NDELAY) Therefor add a new utility function qemu_open_flags_tostr() that converts numeric open() flags from host's native O_* flag constants to a string presentation. 9p2000.L and 9p2000.u protocol variants use different numeric 'mode' constants for 'Topen' requests. Instead of writing string conversion code for both protocol variants, use the already existing conversion functions that convert the mode flags from respective protocol constants to host's native open() numeric flag constants and pass that result to the new string conversion function qemu_open_flags_tostr(). Signed-off-by: Christian Schoenebeck --- hw/9pfs/9p-util-generic.c | 44 +++++++++++++++++++++++++++++++++++++++ hw/9pfs/9p-util.h | 6 ++++++ hw/9pfs/9p.c | 9 +++++++- hw/9pfs/meson.build | 1 + hw/9pfs/trace-events | 2 +- 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 hw/9pfs/9p-util-generic.c diff --git a/hw/9pfs/9p-util-generic.c b/hw/9pfs/9p-util-generic.c new file mode 100644 index 0000000000..dff9a42d97 --- /dev/null +++ b/hw/9pfs/9p-util-generic.c @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "9p-util.h" +#include + +char *qemu_open_flags_tostr(int flags) +{ + int acc =3D flags & O_ACCMODE; + return g_strconcat( + (acc =3D=3D O_WRONLY) ? "WRONLY" : (acc =3D=3D O_RDONLY) ? "RDONLY= " : "RDWR", + (flags & O_CREAT) ? "|CREAT" : "", + (flags & O_EXCL) ? "|EXCL" : "", + (flags & O_NOCTTY) ? "|NOCTTY" : "", + (flags & O_TRUNC) ? "|TRUNC" : "", + (flags & O_APPEND) ? "|APPEND" : "", + (flags & O_NONBLOCK) ? "|NONBLOCK" : "", + (flags & O_DSYNC) ? "|DSYNC" : "", + #ifdef O_DIRECT + (flags & O_DIRECT) ? "|DIRECT" : "", + #endif + (flags & O_LARGEFILE) ? "|LARGEFILE" : "", + (flags & O_DIRECTORY) ? "|DIRECTORY" : "", + (flags & O_NOFOLLOW) ? "|NOFOLLOW" : "", + #ifdef O_NOATIME + (flags & O_NOATIME) ? "|NOATIME" : "", + #endif + #ifdef O_CLOEXEC + (flags & O_CLOEXEC) ? "|CLOEXEC" : "", + #endif + (flags & O_SYNC) ? "|SYNC" : "", + #ifdef O_PATH + (flags & O_PATH) ? "|PATH" : "", + #endif + #ifdef O_TMPFILE + (flags & O_TMPFILE) ? "|TMPFILE" : "", + #endif + /* O_NDELAY is usually just an alias of O_NONBLOCK */ + #ifdef O_NDELAY + (flags & O_NDELAY) ? "|NDELAY" : "", + #endif + NULL /* always last (required NULL termination) */ + ); +} diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h index 51c94b0116..a24d572407 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h @@ -260,4 +260,10 @@ int pthread_fchdir_np(int fd) __attribute__((weak_impo= rt)); #endif int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev); =20 +/* + * Returns a newly allocated string presentation of open() flags, intended + * for debugging (tracing) purposes only. + */ +char *qemu_open_flags_tostr(int flags); + #endif diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 6f24c1abb3..7cad2bce62 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -2008,6 +2008,7 @@ static void coroutine_fn v9fs_open(void *opaque) V9fsFidState *fidp; V9fsPDU *pdu =3D opaque; V9fsState *s =3D pdu->s; + g_autofree char *trace_oflags =3D NULL; =20 if (s->proto_version =3D=3D V9FS_PROTO_2000L) { err =3D pdu_unmarshal(pdu, offset, "dd", &fid, &mode); @@ -2019,7 +2020,13 @@ static void coroutine_fn v9fs_open(void *opaque) if (err < 0) { goto out_nofid; } - trace_v9fs_open(pdu->tag, pdu->id, fid, mode); + if (trace_event_get_state_backends(TRACE_V9FS_OPEN)) { + trace_oflags =3D qemu_open_flags_tostr( + (s->proto_version =3D=3D V9FS_PROTO_2000L) ? + dotl_to_open_flags(mode) : omode_to_uflags(mode) + ); + trace_v9fs_open(pdu->tag, pdu->id, fid, mode, trace_oflags); + } =20 fidp =3D get_fid(pdu, fid); if (fidp =3D=3D NULL) { diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index eceffdb81e..d35d4f44ff 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -3,6 +3,7 @@ fs_ss.add(files( '9p-local.c', '9p-posix-acl.c', '9p-synth.c', + '9p-util-generic.c', '9p-xattr-user.c', '9p-xattr.c', '9p.c', diff --git a/hw/9pfs/trace-events b/hw/9pfs/trace-events index ed9f4e7209..0e0fc37261 100644 --- a/hw/9pfs/trace-events +++ b/hw/9pfs/trace-events @@ -13,7 +13,7 @@ v9fs_getattr(uint16_t tag, uint8_t id, int32_t fid, uint6= 4_t request_mask) "tag v9fs_getattr_return(uint16_t tag, uint8_t id, uint64_t result_mask, uint32= _t mode, uint32_t uid, uint32_t gid) "tag %d id %d getattr=3D{result_mask %= "PRId64" mode %u uid %u gid %u}" v9fs_walk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, uint16_t = nwnames, const char* wnames) "tag=3D%d id=3D%d fid=3D%d newfid=3D%d nwnames= =3D%d wnames=3D{%s}" 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(uint16_t tag, uint8_t id, int32_t fid, int32_t mode, const char*= oflags) "tag=3D%d id=3D%d fid=3D%d mode=3D%d(%s)" v9fs_open_return(uint16_t tag, uint8_t id, uint8_t type, uint32_t version,= uint64_t path, int iounit) "tag %u id %u qid=3D{type %u version %u path %"= PRIu64"} 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, uint8_t type, uint32_t versi= on, uint64_t path, int32_t iounit) "tag %u id %u qid=3D{type %u version %u = path %"PRIu64"} iounit %d" --=20 2.39.5