From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 352581FF16F for <inbox@lore.proxmox.com>; Thu, 13 Feb 2025 14:19:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A9E43502B; Thu, 13 Feb 2025 14:17:53 +0100 (CET) From: Dominik Csapak <d.csapak@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 13 Feb 2025 14:17:08 +0100 Message-Id: <20250213131716.3062383-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250213131716.3062383-1-d.csapak@proxmox.com> References: <20250213131716.3062383-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v6 09/10] migrate: show vfio state transferred too X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Show the transferred VFIO state (when there is one), but since there is no total here, so we can't show that, just what was transferred up until now. Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- no changes in v6 PVE/API2/Qemu.pm | 2 +- PVE/QemuMigrate.pm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 6a303337..8e744107 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4733,7 +4733,7 @@ __PACKAGE__->register_method({ } # if nothing came up, add it to the allowed nodes - if (!$res->{not_allowed_nodes}->{$node}) { + if (scalar($res->{not_allowed_nodes}->{$node}->%*) == 0) { push $res->{allowed_nodes}->@*, $node; } } diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 6909fc82..d6f9132b 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -1241,6 +1241,7 @@ sub phase2 { $self->log('info', "migrate uri => $migrate_uri failed: $merr") if $merr; my $last_mem_transferred = 0; + my $last_vfio_transferred = 0; my $usleep = 1000000; my $i = 0; my $err_count = 0; @@ -1300,8 +1301,11 @@ sub phase2 { last; } - if ($memstat->{transferred} ne $last_mem_transferred) { + if ($memstat->{transferred} ne $last_mem_transferred || + $stat->{vfio}->{transferred} ne $last_vfio_transferred + ) { my $trans = $memstat->{transferred} || 0; + my $vfio_transferred = $stat->{vfio}->{transferred} || 0; my $rem = $memstat->{remaining} || 0; my $total = $memstat->{total} || 0; my $speed = ($memstat->{'pages-per-second'} // 0) * ($memstat->{'page-size'} // 0); @@ -1319,6 +1323,11 @@ sub phase2 { my $progress = "transferred $transferred_h of $total_h VM-state, ${speed_h}/s"; + if ($vfio_transferred > 0) { + my $vfio_h = render_bytes($vfio_transferred, 1); + $progress .= " (+ $vfio_h VFIO-state)"; + } + if ($dirty_rate > $speed) { my $dirty_rate_h = render_bytes($dirty_rate, 1); $progress .= ", VM dirties lots of memory: $dirty_rate_h/s"; @@ -1360,6 +1369,7 @@ sub phase2 { } $last_mem_transferred = $memstat->{transferred}; + $last_vfio_transferred = $stat->{vfio}->{transferred}; } if ($self->{storage_migration}) { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel