From nobody Tue Feb 10 07:40:54 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=1684430094; cv=none; d=zohomail.com; s=zohoarc; b=ZPJb2gzH2dLXyiAs+atBzN0zWgqatAoIPbsXl961DXTmEe+JRQHsgbjqgmfhHT4TB+oJ08soixyes4p4qx8q+lgmcD0sRMD0Y8czsNZJ7hSKM2/E9GfZTsgpcoBxAeBy2oi94UcbNFf9ztV558Sx2yRvMAQdhgOSseFFdtPtmQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684430094; 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=GsF9qWT21STVri0HTe7Z95CXLprSzpMdbCnFQsxQ4sg=; b=nFBt8qOOdGWw0b8UG2qgqPoXjCmcnpRZteZHSExCx8zxwNCNyXSwV4zz7S0OK6DPjoonbqKXQPY2Ep5SDvk5bdIWra/iO74/2t7K+rniGSpOfqsOdEfd8hZvLiKlQ5WZ/dMHjZgGBQzDy9xvrwnZQqIcTON91Oq7aE2oyiEldWA= 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 1684430094371614.4853931717212; Thu, 18 May 2023 10:14:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzhCf-0007lg-4n; Thu, 18 May 2023 13:14:13 -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 1pzhCY-0007Vh-DS for qemu-devel@nongnu.org; Thu, 18 May 2023 13:14:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhCW-0000ph-4k for qemu-devel@nongnu.org; Thu, 18 May 2023 13:14:06 -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-664-m-dDPPDqOPq0HbmXRg1gfQ-1; Thu, 18 May 2023 13:13:52 -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 22C0888B76F; Thu, 18 May 2023 17:13:50 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A81740C6EC4; Thu, 18 May 2023 17:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684430043; 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=GsF9qWT21STVri0HTe7Z95CXLprSzpMdbCnFQsxQ4sg=; b=IHz//Zx5fz02MejGGnB0Pr6vBUsB13xjXUZ/DP+Hg6r1tHnjn36UJlf+KJe7b+p5OxK4dv lFPxamIITLrbNKilCBT7p5igDRstVz8DMTgK+CX8BDD8YrY/MOg0lylT9G9Vj/CCFCvdLb pypRj62uLniSqliqwEuFWtrnAXDNnyM= X-MC-Unique: m-dDPPDqOPq0HbmXRg1gfQ-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 05/12] qemu-file: Account for rate_limit usage on qemu_fflush() Date: Thu, 18 May 2023 19:12:57 +0200 Message-Id: <20230518171304.95006-6-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.133.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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: 1684430095639100003 That is the moment we know we have transferred something. Signed-off-by: Juan Quintela Reviewed-by: C=C3=A9dric Le Goater Message-Id: <20230515195709.63843-5-quintela@redhat.com> --- migration/qemu-file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 9728002de5..3d66c5c512 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -302,7 +302,9 @@ void qemu_fflush(QEMUFile *f) &local_error) < 0) { qemu_file_set_error_obj(f, -EIO, local_error); } else { - f->total_transferred +=3D iov_size(f->iov, f->iovcnt); + uint64_t size =3D iov_size(f->iov, f->iovcnt); + qemu_file_acct_rate_limit(f, size); + f->total_transferred +=3D size; } =20 qemu_iovec_release_ram(f); @@ -519,7 +521,6 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *= buf, size_t size, return; } =20 - f->rate_limit_used +=3D size; add_to_iovec(f, buf, size, may_free); } =20 @@ -537,7 +538,6 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, s= ize_t size) l =3D size; } memcpy(f->buf + f->buf_index, buf, l); - f->rate_limit_used +=3D l; add_buf_to_iovec(f, l); if (qemu_file_get_error(f)) { break; @@ -554,7 +554,6 @@ void qemu_put_byte(QEMUFile *f, int v) } =20 f->buf[f->buf_index] =3D v; - f->rate_limit_used++; add_buf_to_iovec(f, 1); } =20 --=20 2.40.1