From nobody Mon Feb 9 11:32:32 2026 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684430152; cv=none; d=zohomail.com; s=zohoarc; b=e6s9ttZqqKmLdG0gFyy2szTnmOLphjiBJ03kWWeYKSvJjYN8PH0rLn9vshTFuTVRa4I8c6d/VOzZO4XvDuZVeuA/K6MHhQsbPdqIgHznUKNcqZbC1ycld4KntnG0xozABej5o4WNTeTIj3YptzwbeGkWbF6B1SiO9G/OYHwOcgY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684430152; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=odo2TCus3774e8X/ediiIVqjXa1IcGzjmTcApKzWtMY=; b=X1Po/SiWofo0TkpyyuZxGE8xsEJKg4l44M43qYztR4l0zp8IBVTLaxmfLwPczXuU6/zH8lGVj6lOCVnoD/7T6qd5JA/iaNmVqtNHo5xSBgtJK31qhmVdjkgqJqfiBy1kt0mwS9gJ1MGyDat8ll/ksum2U32a9VltOGZVi5RLikM= 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 1684430152041185.0676368793279; Thu, 18 May 2023 10:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzhD3-0000XF-Px; Thu, 18 May 2023 13:14:37 -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 1pzhD2-0000Ok-4T for qemu-devel@nongnu.org; Thu, 18 May 2023 13:14:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhCx-0000v1-7A for qemu-devel@nongnu.org; Thu, 18 May 2023 13:14:35 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-381-8TzD7GNxP62jWAS1FmyXXQ-1; Thu, 18 May 2023 13:14:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EFE26831701; Thu, 18 May 2023 17:14:05 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D59B40C6EC4; Thu, 18 May 2023 17:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684430069; 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=odo2TCus3774e8X/ediiIVqjXa1IcGzjmTcApKzWtMY=; b=hd9hWM8EsfleJhStQbm6skSSw5ZpjoNCHPXPev9t/oE+SjGbQ3O1EbK03U61/CNz2sNlPU cNB06CeCdfa2/07Z4XvvnQhZolD30X+C46cLXCpAGe07OudBKrdS+CSZJCHBzgZNXEy5qq EaByaDq84v3qh/amlHlXw3AHFT9SHHI= X-MC-Unique: 8TzD7GNxP62jWAS1FmyXXQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Leonardo Bras , David Hildenbrand , Christian Borntraeger , qemu-s390x@nongnu.org, Stefan Hajnoczi , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eric Farman , David Gibson , Ilya Leoshkevich , Fam Zheng , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kurz , Juan Quintela , Halil Pasic , Paolo Bonzini , qemu-ppc@nongnu.org, Peter Xu , Harsh Prateek Bora , Hailiang Zhang , John Snow , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-block@nongnu.org, Eric Blake , Jason Wang , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 08/12] migration: Add a trace for migration_transferred_bytes Date: Thu, 18 May 2023 19:13:00 +0200 Message-Id: <20230518171304.95006-9-quintela@redhat.com> In-Reply-To: <20230518171304.95006-1-quintela@redhat.com> References: <20230518171304.95006-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable 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 @redhat.com) X-ZM-MESSAGEID: 1684430153530100001 Signed-off-by: Juan Quintela Reviewed-by: C=C3=A9dric Le Goater Message-Id: <20230515195709.63843-8-quintela@redhat.com> --- migration/migration-stats.c | 7 ++++++- migration/trace-events | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/migration/migration-stats.c b/migration/migration-stats.c index 39e98d6fa9..feec7d7369 100644 --- a/migration/migration-stats.c +++ b/migration/migration-stats.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/stats64.h" #include "qemu-file.h" +#include "trace.h" #include "migration-stats.h" =20 MigrationAtomicStats mig_stats; @@ -62,5 +63,9 @@ void migration_rate_account(uint64_t len) =20 uint64_t migration_transferred_bytes(QEMUFile *f) { - return qemu_file_transferred(f) + stat64_get(&mig_stats.multifd_bytes); + uint64_t multifd =3D stat64_get(&mig_stats.multifd_bytes); + uint64_t qemu_file =3D qemu_file_transferred(f); + + trace_migration_transferred_bytes(qemu_file, multifd); + return qemu_file + multifd; } diff --git a/migration/trace-events b/migration/trace-events index f39818c329..cdaef7a1ea 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -186,6 +186,9 @@ process_incoming_migration_co_end(int ret, int ps) "ret= =3D%d postcopy-state=3D%d" process_incoming_migration_co_postcopy_end_main(void) "" postcopy_preempt_enabled(bool value) "%d" =20 +# migration-stats +migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd) "qemu_fi= le %" PRIu64 " multifd %" PRIu64 + # channel.c migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=3D%p i= octype=3D%s" migration_set_outgoing_channel(void *ioc, const char *ioctype, const char = *hostname, void *err) "ioc=3D%p ioctype=3D%s hostname=3D%s err=3D%p" --=20 2.40.1