From nobody Sun May 5 15:41:49 2024 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567774963; cv=none; d=zoho.com; s=zohoarc; b=e5bXgMPa+8eL2rHRj0ckWYHyw8WKaxAcubb/EoobJeTVh78916u/xBI54o7eHEiwiI2nOY4561Y8ss3FhS8GvJhR9TTwdQ4MsUwrB4ubDi9/L9WLzHqOjwQmoZBZ1Nc2REqhRFyH/0SjW8t6T6Kqrns2WsVoWyuh8h98vtVdnaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567774963; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=wMPTOwSjiQrH5gjZTXPhj8N++DTBMZGvWgX+CgaBFhQ=; b=KmGEPPr203ILHOoOrsageTUwEwMmKIYKQr4vjS1gL3zQaIy8X3I9Gcouw2rv2KnurKHf6eopfmH1twUCjANwhhfvwvLi8sPZiKfDGwm63WgtESk/BlKWJ4LshkS/y50TkJf2p/f2mUTNxN4JqenRpiPtJIDC3aUIZMAhKva8sKI= ARC-Authentication-Results: i=1; mx.zoho.com; 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 156777496359916.79645116000256; Fri, 6 Sep 2019 06:02:43 -0700 (PDT) Received: from localhost ([::1]:56130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6Dsr-00038X-2L for importer@patchew.org; Fri, 06 Sep 2019 09:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59314) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6Drc-0002gC-Ah for qemu-devel@nongnu.org; Fri, 06 Sep 2019 09:01:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i6Dra-0002UL-6a for qemu-devel@nongnu.org; Fri, 06 Sep 2019 09:01:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i6Dra-0002St-07 for qemu-devel@nongnu.org; Fri, 06 Sep 2019 09:01:18 -0400 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 976F7796E9 for ; Fri, 6 Sep 2019 13:01:16 +0000 (UTC) Received: by mail-pf1-f197.google.com with SMTP id v15so4516178pfe.7 for ; Fri, 06 Sep 2019 06:01:16 -0700 (PDT) Received: from xz-x1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id o64sm4880342pjb.24.2019.09.06.06.01.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 06:01:13 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=lL1moXYI5g6KK6FwXJ6Li1H8CgN3SoepTEzdoFZG3rQ=; b=j+Dr1fi3r287HUPzL73B7XB/PN97RFta0VSQo003L4sP/SQ7AanmZeA6iT2NSjZSve 6TZBuezJX6FfPCdkCWTXZXK+T+PGUHWtBvKrMpZKEEFRhqC6K/WB/AtoJOJLcIirPxZk vbEIeBT5eQkEF3++IcWpq5RXbKo5RLSx3mfkHxBkoECKiDKq6GiPer5XdmWP9WXDvISo kPO/8xyLN8U944e0Ml38jhg/ZyGP1ddyWiXAMdemHks3j2fjtlC8VdbZEKYJqNO2CQth FH5wEswnpbi/3wsPmYuGhLTw3BDAMNRHcuYXprL2Dz4Mb/gNLjhVPPf1D1Mz7CN+938D bJNg== X-Gm-Message-State: APjAAAXq2QG7lt0Gm6WMq1v47Vr76hi4xDH/ZJgZwm+cykIrjlPXGpNI SLkWZyvgOxEeKK3RAldKAN+TtYS1lJQPuJGzYvgRgFSnGBNFlbFvQOXLJYV5mhAAVEbdft5QUc7 FGTvBjUVl06X7LiA= X-Received: by 2002:a17:90a:c687:: with SMTP id n7mr9118488pjt.3.1567774875393; Fri, 06 Sep 2019 06:01:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiqYUKbFAaiS2zAyJBeWIR/EbWiCIsKJgCS/6ChL59YhEtBj31z5m6a/EsmrOGHGnKE83RLw== X-Received: by 2002:a17:90a:c687:: with SMTP id n7mr9118457pjt.3.1567774875112; Fri, 06 Sep 2019 06:01:15 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 6 Sep 2019 21:01:03 +0800 Message-Id: <20190906130103.20961-1-peterx@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] migration: Fix postcopy bw for recovery 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: Laurent Vivier , Xiaohui Li , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We've got max-postcopy-bandwidth parameter but it's not applied correctly after a postcopy recovery so the recovered migration stream will still eat the whole net bandwidth. Fix that up. Reported-by: Xiaohui Li Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- migration/migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 8b9f2fe30a..b307813aa3 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3327,7 +3327,8 @@ void migrate_fd_connect(MigrationState *s, Error *err= or_in) =20 if (resume) { /* This is a resumed migration */ - rate_limit =3D INT64_MAX; + rate_limit =3D s->parameters.max_postcopy_bandwidth / + XFER_LIMIT_RATIO; } else { /* This is a fresh new migration */ rate_limit =3D s->parameters.max_bandwidth / XFER_LIMIT_RATIO; --=20 2.21.0