From patchwork Wed Aug 17 20:06:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 597868 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp3539615maz; Wed, 17 Aug 2022 13:11:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR5URcmjaFIHNon/h2NcjG+IiRzFozuniXp3d1vuk+zdGoK9h5+zDXlH7WfmUBaxcHPRBwFg X-Received: by 2002:a05:620a:b4a:b0:6bb:93ba:275c with SMTP id x10-20020a05620a0b4a00b006bb93ba275cmr2923472qkg.270.1660767104166; Wed, 17 Aug 2022 13:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660767104; cv=none; d=google.com; s=arc-20160816; b=AoslV1cKWkIOgtNzGuf5HD1UhURteYaulPhsJqjondgUWyqLdjnvIvuNU5MP+iI3aB j3B/FlZdbGiJ2dCOt8+TNLrVOJA55Bc2SM+Bhc8pir4wqrFsV3CBSDjKxZT4RRYpiL2E QYB/H7AA/FU0UkZEBAA/SbiKRlndjZCmbvEDzeW/xpwzXbrjmMkpWVBy0fngiyifpoBJ hrgOIT3MphSK8kuOLchYB5agz1E8oewf1nrdl4oUG3xLjAVaGg2IDXDirNZqqSq+W35a Quu44DYH1QGYCRNby2ZngOruClsDZYpgbsAu0oXWbWt8o/0cNQUkKblpWYVgnH+2Ptpb p0Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=rlFScFbd6bA9xQKNfgYlcaL7eylrZChQGwf+YKV00bU=; b=hAfSfcoxwk0BpuE3z6ypRquI0wEH9g0jV4xlaXSf/EBIUVdKK6evqSLubmWT2TrbCz Xt1YLvIRwerd8ddSlVMKjDw0a8fBoxtX7mgYOLEYzTIndnkHkmzs+HkcxQI951gkN0Bv mgSmHpcWqcTl+a32A07PoSIuupuRMg4c6rOo3m2I6EmuXTTMq5QBd4gQrFPKFDETlO9+ mNnxNU/At8e1kXVc6k0oqSUhPHyBuIaFIOrYvtZfHZh4RYW0lylVxr+YAPS09FkmLJGR zN1l3pPYkiYsrT6X08boxOg0hWc3BI0l/PG/XzAfIjH+G6x7rBdXW3d7Pk4ywZ2r+C59 CVpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NliMa2iM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f4-20020a05622a114400b00342f75dde13si9092816qty.754.2022.08.17.13.11.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Aug 2022 13:11:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NliMa2iM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:34976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOPOB-0001To-M5 for patch@linaro.org; Wed, 17 Aug 2022 16:11:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIo-0002z0-UG for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIn-0000FT-KK for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660766767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rlFScFbd6bA9xQKNfgYlcaL7eylrZChQGwf+YKV00bU=; b=NliMa2iMB23DfIEWKngjfUO7wM4IDkp/ZvQMXt5/K32OmXID4NAv4JtwgWoDDZVQQydfxM gRmOkBEKUGW9Fdq9qqChyEL/CWHiKUjhFhRFc33D2BNgZL6FZk3yT2tZPB4pFU6/nuTBNv Tg8i4dMfzNXNroplVhnOA2I9LSobGbo= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-389-8IEXyy0rM5WOAnmWuCWBsw-1; Wed, 17 Aug 2022 16:06:06 -0400 X-MC-Unique: 8IEXyy0rM5WOAnmWuCWBsw-1 Received: by mail-wm1-f69.google.com with SMTP id f5-20020a1cc905000000b003a60ef7ec71so601560wmb.4 for ; Wed, 17 Aug 2022 13:06:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc; bh=rlFScFbd6bA9xQKNfgYlcaL7eylrZChQGwf+YKV00bU=; b=XvP5IxLInow/SIsyMVhCXW97rKA1lkgPxmicTXKAplmB/S1N20CsSvW8soM3mc8Qyg czalNQnme2w4I2t3oaLIN9oVDnx+IYT7aolPJhAYPUtshsjG4O66lE6JdRHB83gQnGP2 FPPskVKWeRCJtGY2rvU711UnmPV9HgB1VaNRDN3eQV+wv7/0BX3gjMnxRDcoN9R7TlxR t3B8pxRMpMWiGV+DcTsEtENwZffX83F7yc566Z/h408XnETzZCm+n4mTnb7mqyTpg0Rb LfbusGAlok8qug8phTRvE5DmBcJs/g5CdFLa+XoC46Ad7iGW4f70UZ2xM4cUabN4Cd2H N8Nw== X-Gm-Message-State: ACgBeo2xM88C2da5o8sJuDNGoR2ZaOtEjAdf7UUydK/l9+ELXzwlfPIb vyEgSRwHJxT84vEAOoMVqIZoSToL4MKhqbt0RsL7LaS1p2mrMMmmdPxC1jLVJhLo6iZMuOYZaj3 q8utGH2BIt5vBUJJGVT1Rt1jH9hPDz9uKTZQ0QjREdxzkmhiX0mLdCP0+Rbsj X-Received: by 2002:a05:600c:206:b0:3a5:abe9:8a91 with SMTP id 6-20020a05600c020600b003a5abe98a91mr3066595wmi.155.1660766765156; Wed, 17 Aug 2022 13:06:05 -0700 (PDT) X-Received: by 2002:a05:600c:206:b0:3a5:abe9:8a91 with SMTP id 6-20020a05600c020600b003a5abe98a91mr3066583wmi.155.1660766764835; Wed, 17 Aug 2022 13:06:04 -0700 (PDT) Received: from redhat.com ([2.55.4.37]) by smtp.gmail.com with ESMTPSA id r15-20020a5d52cf000000b0021f73c66198sm13813537wrv.1.2022.08.17.13.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 13:06:04 -0700 (PDT) Date: Wed, 17 Aug 2022 16:06:01 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Alex =?utf-8?q?Benn=C3=A9e?= , Jason Wang Subject: [PULL 04/12] hw/virtio: fix vhost_user_read tracepoint Message-ID: <20220817200536.350795-5-mst@redhat.com> References: <20220817200536.350795-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220817200536.350795-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée As reads happen in the callback we were never seeing them. We only really care about the header so move the tracepoint to when the header is complete. Fixes: 6ca6d8ee9d (hw/virtio: add vhost_user_[read|write] trace points) Signed-off-by: Alex Bennée Acked-by: Jason Wang Message-Id: <20220728135503.1060062-5-alex.bennee@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 75b8df21a4..bd24741be8 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -295,6 +295,8 @@ static int vhost_user_read_header(struct vhost_dev *dev, VhostUserMsg *msg) return -EPROTO; } + trace_vhost_user_read(msg->hdr.request, msg->hdr.flags); + return 0; } @@ -544,8 +546,6 @@ static int vhost_user_set_log_base(struct vhost_dev *dev, uint64_t base, } } - trace_vhost_user_read(msg.hdr.request, msg.hdr.flags); - return 0; }