From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v4 12/12] migration: show vfio state transferred too
Date: Thu, 6 Jun 2024 11:22:13 +0200 [thread overview]
Message-ID: <20240606092220.1190913-19-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com>
there is no total here, so we can't show any, just what was transferred
up until now (if any).
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
new in v4
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 0a999006..34bfcdf4 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4541,7 +4541,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 41ff12c2..bd65558c 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -1242,6 +1242,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;
@@ -1301,8 +1302,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);
@@ -1320,6 +1324,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";
@@ -1361,6 +1370,7 @@ sub phase2 {
}
$last_mem_transferred = $memstat->{transferred};
+ $last_vfio_transferred = $stat->{vfio}->{transferred};
}
if ($self->{storage_migration}) {
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-06-06 9:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 9:21 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v4] implement experimental vgpu live migration Dominik Csapak
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 1/6] mapping: pci: assert_valid: rename cfg to mapping Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 2/6] mapping: pci: assert_valid: reword error messages Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 3/6] mapping: pci: make sure all desired properties are checked Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 4/6] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-07-05 8:33 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH guest-common v4 5/6] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH guest-common v4 6/6] mapping: remove find_on_current_node Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 01/12] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-07-04 11:29 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 02/12] pci: " Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 03/12] pci: mapping: check mdev config against hardware Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 04/12] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-07-05 8:36 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 05/12] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-07-04 12:24 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 06/12] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 07/12] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 08/12] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 09/12] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 10/12] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 11/12] tests: cfg2cmd: fix mdev tests Dominik Csapak
2024-06-06 9:22 ` Dominik Csapak [this message]
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH docs v4 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-08-14 14:14 ` Alexander Zeidler
2024-06-06 9:22 ` [pve-devel] [PATCH docs v4 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-07-05 9:00 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v4] implement experimental vgpu live migration Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606092220.1190913-19-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox