From nobody Sat Nov 15 07:46:05 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1755104289; cv=none; d=zohomail.com; s=zohoarc; b=C1AnV4zDM7NED+NX30I1pw0rQLs3obiFilqM3rGWRQ/R/NITOduhM/AIuQ0Mbbt/F7DZsrLCI6x33IraSiyZGwhnuUyy7zBXl8jz4hPRXKElg4xYAhYNRl7qosNB7IHsEmV3pwN/1gtIMZOia8hwxUGZsburNiSmRruNWGcWOgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755104289; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=beNcQYTX6DnX17DPcwxxbCJUIdHSyei20zNuVbTjZac=; b=h3Tq5fRNpMBdhoddoU4JnkIxu1cSddUdq8FpYkfTCBbZDemsnOYGkZnBiaI2yPG1/IA5dVu2tRiOXI6OlyVTXNUt9dMNw3ct/eB9dTAcygVnDUEBavEZwXenXLxvAVjOAdikfV6WTZgNxIEIc4RMGqm+mVN0wCab42exskN3yGo= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755104289098747.5839269946256; Wed, 13 Aug 2025 09:58:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1umEfs-0002u1-FP; Wed, 13 Aug 2025 12:50:04 -0400 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 ) id 1umEfZ-0002im-2k; Wed, 13 Aug 2025 12:49:45 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1umEfK-0007sF-6X; Wed, 13 Aug 2025 12:49:44 -0400 Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:cf2d:0:640:140f:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 46343812B6; Wed, 13 Aug 2025 19:49:19 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:167::1:21]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id wmOQI00FoSw0-z0Bhqwlx; Wed, 13 Aug 2025 19:49:18 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755103758; bh=beNcQYTX6DnX17DPcwxxbCJUIdHSyei20zNuVbTjZac=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=nDCtV4xGsjY2U/lbyq1xaV62UJwSbftdJgfL1vbVCBPuHYYugUOq2lRMu1DrCyXMT 9X3H291Pu/oPqFgGkPBsgY60TvfXbUA0CEE+QpQ7ow2TQp6CMG/6XAfhrAW9v1mQJg lq7Uo3Dx3S1yu/7b/RNRq8toK0SOaOOsar3i7hzI= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: mst@redhat.com, peterx@redhat.com, farosas@suse.de, raphael@enfabrica.net Cc: sgarzare@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, kwolf@redhat.com, hreitz@redhat.com, berrange@redhat.com, eblake@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, steven.sistare@oracle.com, den-plotnikov@yandex-team.ru, vsementsov@yandex-team.ru Subject: [PATCH 21/33] vhost-user: make trace events more readable Date: Wed, 13 Aug 2025 19:48:42 +0300 Message-ID: <20250813164856.950363-22-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250813164856.950363-1-vsementsov@yandex-team.ru> References: <20250813164856.950363-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net 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_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.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 @yandex-team.ru) X-ZM-MESSAGEID: 1755104290368124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Raphael Norwitz --- hw/virtio/trace-events | 4 +- hw/virtio/vhost-user.c | 94 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 4 deletions(-) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 76f0d458b2..e5142c27f9 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -25,8 +25,8 @@ vhost_user_set_mem_table_withfd(int index, const char *na= me, uint64_t memory_siz vhost_user_postcopy_waker(const char *rb, uint64_t rb_offset) "%s + 0x%"PR= Ix64 vhost_user_postcopy_waker_found(uint64_t client_addr) "0x%"PRIx64 vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s = + 0x%"PRIx64 -vhost_user_read(uint32_t req, uint32_t flags) "req:%d flags:0x%"PRIx32"" -vhost_user_write(uint32_t req, uint32_t flags) "req:%d flags:0x%"PRIx32"" +vhost_user_read(uint32_t req, const char *req_name, uint32_t flags) "req:%= d (%s) flags:0x%"PRIx32"" +vhost_user_write(uint32_t req, const char *req_name, uint32_t flags) "req:= %d (%s) flags:0x%"PRIx32"" vhost_user_create_notifier(int idx, void *n) "idx:%d n:%p" =20 # vhost-vdpa.c diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index fe9d91348d..3979582975 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -119,6 +119,94 @@ typedef enum VhostUserBackendRequest { VHOST_USER_BACKEND_MAX } VhostUserBackendRequest; =20 +static const char *vhost_req_name(VhostUserRequest req) +{ + switch (req) { + case VHOST_USER_NONE: + return "NONE"; + case VHOST_USER_GET_FEATURES: + return "GET_FEATURES"; + case VHOST_USER_SET_FEATURES: + return "SET_FEATURES"; + case VHOST_USER_SET_OWNER: + return "SET_OWNER"; + case VHOST_USER_RESET_OWNER: + return "RESET_OWNER"; + case VHOST_USER_SET_MEM_TABLE: + return "SET_MEM_TABLE"; + case VHOST_USER_SET_LOG_BASE: + return "SET_LOG_BASE"; + case VHOST_USER_SET_LOG_FD: + return "SET_LOG_FD"; + case VHOST_USER_SET_VRING_NUM: + return "SET_VRING_NUM"; + case VHOST_USER_SET_VRING_ADDR: + return "SET_VRING_ADDR"; + case VHOST_USER_SET_VRING_BASE: + return "SET_VRING_BASE"; + case VHOST_USER_GET_VRING_BASE: + return "GET_VRING_BASE"; + case VHOST_USER_SET_VRING_KICK: + return "SET_VRING_KICK"; + case VHOST_USER_SET_VRING_CALL: + return "SET_VRING_CALL"; + case VHOST_USER_SET_VRING_ERR: + return "SET_VRING_ERR"; + case VHOST_USER_GET_PROTOCOL_FEATURES: + return "GET_PROTOCOL_FEATURES"; + case VHOST_USER_SET_PROTOCOL_FEATURES: + return "SET_PROTOCOL_FEATURES"; + case VHOST_USER_GET_QUEUE_NUM: + return "GET_QUEUE_NUM"; + case VHOST_USER_SET_VRING_ENABLE: + return "SET_VRING_ENABLE"; + case VHOST_USER_SEND_RARP: + return "SEND_RARP"; + case VHOST_USER_NET_SET_MTU: + return "NET_SET_MTU"; + case VHOST_USER_SET_BACKEND_REQ_FD: + return "SET_BACKEND_REQ_FD"; + case VHOST_USER_IOTLB_MSG: + return "IOTLB_MSG"; + case VHOST_USER_SET_VRING_ENDIAN: + return "SET_VRING_ENDIAN"; + case VHOST_USER_GET_CONFIG: + return "GET_CONFIG"; + case VHOST_USER_SET_CONFIG: + return "SET_CONFIG"; + case VHOST_USER_CREATE_CRYPTO_SESSION: + return "CREATE_CRYPTO_SESSION"; + case VHOST_USER_CLOSE_CRYPTO_SESSION: + return "CLOSE_CRYPTO_SESSION"; + case VHOST_USER_POSTCOPY_ADVISE: + return "POSTCOPY_ADVISE"; + case VHOST_USER_POSTCOPY_LISTEN: + return "POSTCOPY_LISTEN"; + case VHOST_USER_POSTCOPY_END: + return "POSTCOPY_END"; + case VHOST_USER_GET_INFLIGHT_FD: + return "GET_INFLIGHT_FD"; + case VHOST_USER_SET_INFLIGHT_FD: + return "SET_INFLIGHT_FD"; + case VHOST_USER_GPU_SET_SOCKET: + return "GPU_SET_SOCKET"; + case VHOST_USER_RESET_DEVICE: + return "RESET_DEVICE"; + case VHOST_USER_GET_MAX_MEM_SLOTS: + return "GET_MAX_MEM_SLOTS"; + case VHOST_USER_ADD_MEM_REG: + return "ADD_MEM_REG"; + case VHOST_USER_REM_MEM_REG: + return "REM_MEM_REG"; + case VHOST_USER_SET_STATUS: + return "SET_STATUS"; + case VHOST_USER_GET_STATUS: + return "GET_STATUS"; + default: + return ""; + } +} + typedef struct VhostUserMemoryRegion { uint64_t guest_phys_addr; uint64_t memory_size; @@ -310,7 +398,8 @@ static int vhost_user_read_header(struct vhost_dev *dev= , VhostUserMsg *msg) return -EPROTO; } =20 - trace_vhost_user_read(msg->hdr.request, msg->hdr.flags); + trace_vhost_user_read(msg->hdr.request, + vhost_req_name(msg->hdr.request), msg->hdr.flags= ); =20 return 0; } @@ -430,7 +519,8 @@ static int vhost_user_write(struct vhost_dev *dev, Vhos= tUserMsg *msg, return ret < 0 ? -saved_errno : -EIO; } =20 - trace_vhost_user_write(msg->hdr.request, msg->hdr.flags); + trace_vhost_user_write(msg->hdr.request, + vhost_req_name(msg->hdr.request), msg->hdr.flags= ); =20 return 0; } --=20 2.48.1