From nobody Sun Feb 8 15:37:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564367640; cv=none; d=zoho.com; s=zohoarc; b=he7peRofGQojS05/RJBSWHvi8baVwfoFLe0pwPpF0fkO6BC9NOvLx3pAgsXf/dgMfHzb1UdnpS5NxZxBqrMBsQ/TC4zeiO0VMz+vouKqHNIBZcUeZRvvOlif0jZd6lCTV5fWqq9VxSgZxDZKy53iz7GEn20I11P+R91RQbrbPNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564367640; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=TbzlDEvDxIuyOQWIbuLi6m5rfzHvVICvY/nMg/pguQk=; b=ddCCWnsjCnTU6YXDrkQAisCKuSlT25M/iHCNK8ulm9cXyDwc9u4f1AmvaoMb0H+uKUAqpdw9DLzp7m+Gz6u+hQzxCGdb9wSSVVywu+vE7fbJF42ad+5h7sRrfH1AShvwRdpuAnzeGoZwRXQqGBzMsMqtsZm5ahac3mJ95MeossM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564367640267824.7887646648429; Sun, 28 Jul 2019 19:34:00 -0700 (PDT) Received: from localhost ([::1]:48580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hrvTx-0003OF-ME for importer@patchew.org; Sun, 28 Jul 2019 22:33:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38789) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hrvTD-0002ZP-KQ for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hrvTC-00054b-HB for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:03 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:34896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hrvTC-00052Q-BD for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:02 -0400 Received: by mail-pf1-x443.google.com with SMTP id u14so27205748pfn.2 for ; Sun, 28 Jul 2019 19:33:02 -0700 (PDT) Received: from VM_85_204_centos.localdomain ([129.226.55.250]) by smtp.gmail.com with ESMTPSA id m9sm103281519pgr.24.2019.07.28.19.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jul 2019 19:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TbzlDEvDxIuyOQWIbuLi6m5rfzHvVICvY/nMg/pguQk=; b=OjN5iV92yPvj/pnjYOpuNeD10dzyZ1e0579VYzq6fdS+LySiNOkvBZYiP2egs52YP9 WKepw4aMXJsjzOzf2PxwRjCspp+Zx1aLuH0Hvvue00OR/RkOpRyUeswsNJzRYMbo9art XdZ7tyFezLtP/zQxZFkInKClacM9owpFirD8SdN/+o6CUjWZjxaI+bd+kmik2UmFQYgF xoQ5drF442BCrhlLcfaLus1KLuBDrB/CaLl0H0UncDfIVm/kkHvyui78/H3T0MQgiQkF oKVeEqPdj26HMLjKprAUn9IcJ6AG9oxuphK+ppJJbyXz/SL6BWnHXWR9vKNLXKb4RIOl dxmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TbzlDEvDxIuyOQWIbuLi6m5rfzHvVICvY/nMg/pguQk=; b=TNvzyrm72eUdVTL0Tj9CfYDZTTYue8DFeczYd8eczHaS87FrvKJqzAOaKXUAYwCXSX dLyr6ZJyPHdROTeLKVY7NcNjEpWcU8NsRDEdLT5R1B/zQ8JqSPZgp7rx19sLbSGnz8iG 8hGDUmu2+uDxndJRMTl8Iz/bCdb4jKhGIXSHOWkpkqo5j8cT0CgYttrpXSEIeHZkmTwY 8lkh3M+5yO1oQsPwz4KtE/53SmuIoJ8cbtlhtKVfucs4cJmsrylLgf2ozq3CY7PDybNF j6VSx2PWqvpTiNQI5WeTqvjZ6e9qTtCDznFNt0FdsQGpbft62ECWGMuHjWS3wo7m+ZUP 4bRQ== X-Gm-Message-State: APjAAAWDJumfRoXXEy6OiUDPxlkT8gcBnJksDCRimS0pNZR36M8Op+Gh 6xSHzVT2UnO3tvIU1dCyp8Q= X-Google-Smtp-Source: APXvYqz/BGDYUayEAjqccl3xU5GK4hpqluX/0pWV+F+FPC9cKP++SaQephjwAuoPZmvRjYoh9jxSrw== X-Received: by 2002:aa7:9407:: with SMTP id x7mr35390339pfo.163.1564367581410; Sun, 28 Jul 2019 19:33:01 -0700 (PDT) From: Ivan Ren X-Google-Original-From: Ivan Ren To: quintela@redhat.com, dgilbert@redhat.com Date: Mon, 29 Jul 2019 10:32:52 +0800 Message-Id: <1564367573-6327-2-git-send-email-ivanren@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1564367573-6327-1-git-send-email-ivanren@tencent.com> References: <1564367573-6327-1-git-send-email-ivanren@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH 1/2] migration: add qemu_file_update_rate_transfer interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add qemu_file_update_rate_transfer for just update bytes_xfer for speed limitation. This will be used for further migration feature such as multifd migration. Signed-off-by: Ivan Ren Reviewed-by: Wei Yang --- migration/qemu-file.c | 5 +++++ migration/qemu-file.h | 1 + 2 files changed, 6 insertions(+) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 0431585502..13e7f03f9b 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -615,6 +615,11 @@ void qemu_file_reset_rate_limit(QEMUFile *f) f->bytes_xfer =3D 0; } =20 +void qemu_file_update_rate_transfer(QEMUFile *f, int64_t len) +{ + f->bytes_xfer +=3D len; +} + void qemu_put_be16(QEMUFile *f, unsigned int v) { qemu_put_byte(f, v >> 8); diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 13baf896bd..6145d10aca 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -147,6 +147,7 @@ int qemu_peek_byte(QEMUFile *f, int offset); void qemu_file_skip(QEMUFile *f, int size); void qemu_update_position(QEMUFile *f, size_t size); void qemu_file_reset_rate_limit(QEMUFile *f); +void qemu_file_update_rate_transfer(QEMUFile *f, int64_t len); void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); int64_t qemu_file_get_rate_limit(QEMUFile *f); void qemu_file_set_error(QEMUFile *f, int ret); --=20 2.17.2 (Apple Git-113) From nobody Sun Feb 8 15:37:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564367671; cv=none; d=zoho.com; s=zohoarc; b=MaDtXWLGikalJ2w6AuS7OfMKCz9ohUjtLTJ2Naxs8VbZA4ESduuWT43BI7hqcs075dZhTuXHa8Yg7jeohnFtVn9jvrux3gQDwin4gp9XRY3aVfIaXGqtb5Fe5IuRBHXKfDIW8XEa/jHsrciqPQKmuswUb8oWQ3CMoR1qeq8iHwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564367671; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=E/4hPH9CYnRQOxbkw9I2lZDmI588i/uLbgGIwXRaeug=; b=HCYTiH7n4EYeBySKxgsqkB7/ZUEAV97PKtscLroxc+voYhDYYQtb/jGMM1QC1hrvoFkdXg6/q/zgwd1ACODSRv2DNs8Q+S4ap6e4qE9Puamkuvb9kOAZISlkT+TrucWzHpjJ+4spquCkwr8EeMn+kH7jRqhgaJVTwG2DhQo0Lso= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15643676710821011.7521026375957; Sun, 28 Jul 2019 19:34:31 -0700 (PDT) Received: from localhost ([::1]:48594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hrvUc-0004gC-60 for importer@patchew.org; Sun, 28 Jul 2019 22:34:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38807) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hrvTE-0002Zj-QO for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hrvTD-00058M-N2 for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:04 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:33894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hrvTD-00056Z-HG for qemu-devel@nongnu.org; Sun, 28 Jul 2019 22:33:03 -0400 Received: by mail-pg1-x543.google.com with SMTP id n9so21197539pgc.1 for ; Sun, 28 Jul 2019 19:33:03 -0700 (PDT) Received: from VM_85_204_centos.localdomain ([129.226.55.250]) by smtp.gmail.com with ESMTPSA id m9sm103281519pgr.24.2019.07.28.19.33.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jul 2019 19:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E/4hPH9CYnRQOxbkw9I2lZDmI588i/uLbgGIwXRaeug=; b=HA+FsrXASIblvbu/s+Kp6wn0lf+e8lB4/Enl/yL1ZvOXnC3nZG4QEk+KXDFBv3qthu zHhq9q6MlENtAiDucRdfOThcZWEhB/JzhVCH3P/ssSOST304ksmMr3IXHRhgfUOMNcyR IbdjgKN4sqywcA4ziju+Ub3vGihiOpnSXVYlpGtS2oPsHIsjdq7fCYuasTp9HVC6DJAT PYBfez+Lx1BFItiUEJ7Sy+Vrmbbq1QZaDGlmi6OLgtMLL9JYtIO/RoPSIWJc3Qslqfx0 O1CImgqckUaqISTCHngCmgvV4Pz41xMrQJJI4ajpzvhqD3vPuiEJK1fLbvnU5FI0pnaG PWGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E/4hPH9CYnRQOxbkw9I2lZDmI588i/uLbgGIwXRaeug=; b=BSahXtklMWn2vHxk9KGoSHr4UUzh4X7zVEqwVN4xqChjZZvsmcsN5CBiZAwG3W90Zv z75u2ks2gKwZ+fRIUIV3ARRZ5dYQXFD8T8DuLxiFroS0zZR11WqEmq7OBdvRTaxEY33q WBKVlbUuCl2m9ijkN87FRAzaaxzwxCFFVGyUG2rhdNqR0b2GpQNb4m+pPYLvSAWXHeyD 4AI6d4+FtsvODT6yGBsGjbmDLQpd1JeXZIR976LWIOuyTM9IWh6IsrRfVaeSPoc5WIjQ Nes+wdYJSyga1qP5lSTxb4UsPNVLCGJgYRUrkKt0KU7h9Ar1R+mD5va5Kp1NLydoGzTk 0JtA== X-Gm-Message-State: APjAAAVRf7kMB6wM/H0udws5lSD2lpPxBBmbddX+sM5+NZbViD34Gv5k IFQk9TsBfAWU1gN0LVtVlpQ= X-Google-Smtp-Source: APXvYqydm6JusUjGUBxSrtiZHyeQyQ3rc+JdAMqgZBzTDSQ8bg4PyYQsy5d8SdwisLay1tf/dN/Brw== X-Received: by 2002:a62:7d13:: with SMTP id y19mr34178377pfc.62.1564367582664; Sun, 28 Jul 2019 19:33:02 -0700 (PDT) From: Ivan Ren X-Google-Original-From: Ivan Ren To: quintela@redhat.com, dgilbert@redhat.com Date: Mon, 29 Jul 2019 10:32:53 +0800 Message-Id: <1564367573-6327-3-git-send-email-ivanren@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1564367573-6327-1-git-send-email-ivanren@tencent.com> References: <1564367573-6327-1-git-send-email-ivanren@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH 2/2] migration: add speed limit for multifd migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Limit the speed of multifd migration through common speed limitation qemu file. Signed-off-by: Ivan Ren --- migration/ram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 889148dd84..e3fde16776 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -922,7 +922,7 @@ struct { * false. */ =20 -static int multifd_send_pages(void) +static int multifd_send_pages(RAMState *rs) { int i; static int next_channel; @@ -954,6 +954,7 @@ static int multifd_send_pages(void) multifd_send_state->pages =3D p->pages; p->pages =3D pages; transferred =3D ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packe= t_len; + qemu_file_update_rate_transfer(rs->f, transferred); ram_counters.multifd_bytes +=3D transferred; ram_counters.transferred +=3D transferred;; qemu_mutex_unlock(&p->mutex); @@ -962,7 +963,7 @@ static int multifd_send_pages(void) return 1; } =20 -static int multifd_queue_page(RAMBlock *block, ram_addr_t offset) +static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t of= fset) { MultiFDPages_t *pages =3D multifd_send_state->pages; =20 @@ -981,12 +982,12 @@ static int multifd_queue_page(RAMBlock *block, ram_ad= dr_t offset) } } =20 - if (multifd_send_pages() < 0) { + if (multifd_send_pages(rs) < 0) { return -1; } =20 if (pages->block !=3D block) { - return multifd_queue_page(block, offset); + return multifd_queue_page(rs, block, offset); } =20 return 1; @@ -1054,7 +1055,7 @@ void multifd_save_cleanup(void) multifd_send_state =3D NULL; } =20 -static void multifd_send_sync_main(void) +static void multifd_send_sync_main(RAMState *rs) { int i; =20 @@ -1062,7 +1063,7 @@ static void multifd_send_sync_main(void) return; } if (multifd_send_state->pages->used) { - if (multifd_send_pages() < 0) { + if (multifd_send_pages(rs) < 0) { error_report("%s: multifd_send_pages fail", __func__); return; } @@ -1083,6 +1084,7 @@ static void multifd_send_sync_main(void) p->packet_num =3D multifd_send_state->packet_num++; p->flags |=3D MULTIFD_FLAG_SYNC; p->pending_job++; + qemu_file_update_rate_transfer(rs->f, p->packet_len); qemu_mutex_unlock(&p->mutex); qemu_sem_post(&p->sem); } @@ -2079,7 +2081,7 @@ static int ram_save_page(RAMState *rs, PageSearchStat= us *pss, bool last_stage) static int ram_save_multifd_page(RAMState *rs, RAMBlock *block, ram_addr_t offset) { - if (multifd_queue_page(block, offset) < 0) { + if (multifd_queue_page(rs, block, offset) < 0) { return -1; } ram_counters.normal++; @@ -3482,7 +3484,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_SETUP); ram_control_after_iterate(f, RAM_CONTROL_SETUP); =20 - multifd_send_sync_main(); + multifd_send_sync_main(*rsp); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 @@ -3570,7 +3572,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_ROUND); =20 out: - multifd_send_sync_main(); + multifd_send_sync_main(rs); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); ram_counters.transferred +=3D 8; @@ -3629,7 +3631,7 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) =20 rcu_read_unlock(); =20 - multifd_send_sync_main(); + multifd_send_sync_main(rs); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 --=20 2.17.2 (Apple Git-113)