From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id ACDB91FF187 for ; Mon, 20 Oct 2025 14:18:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E51F70E9; Mon, 20 Oct 2025 14:18:24 +0200 (CEST) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Mon, 20 Oct 2025 14:17:39 +0200 Message-ID: <20251020121807.280441-5-m.frank@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251020121807.280441-1-m.frank@proxmox.com> References: <20251020121807.280441-1-m.frank@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760962692647 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 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 v1 4/11] virtiofs: add live migration support X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" There are two migration methods with virtiofsd. Virtiofsd in the 'find-paths' migration mode, tries to find the path inside of the shared directory for every filesystem object that must be transferred to the destination. Add two extra parameters that verify file handles and confirm paths. In the 'file-handles' migration mode every filesystem object is converted to a file handle. Add a parameter so that migration does not abort if an error occurs. Aborting on error would result in a stopped VM on the destination node. Signed-off-by: Markus Frank --- src/PVE/QemuMigrate/Helpers.pm | 14 +++++++++++--- src/PVE/QemuServer/Virtiofs.pm | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/PVE/QemuMigrate/Helpers.pm b/src/PVE/QemuMigrate/Helpers.pm index f191565a..fef5e422 100644 --- a/src/PVE/QemuMigrate/Helpers.pm +++ b/src/PVE/QemuMigrate/Helpers.pm @@ -20,7 +20,6 @@ sub check_non_migratable_resources { my @blockers = (); if ($state) { push @blockers, "amd-sev" if $conf->{"amd-sev"}; - push @blockers, "virtiofs" if PVE::QemuServer::Virtiofs::virtiofs_enabled($conf); } if (scalar(@blockers) && !$noerr) { @@ -99,8 +98,17 @@ sub check_local_resources { } if ($k =~ m/^virtiofs/) { my $entry = parse_property_string('pve-qm-virtiofs', $conf->{$k}); - $add_missing_mapping->('dir', $k, $entry->{dirid}); - $mapped_res->{$k} = { name => $entry->{dirid} }; + if (my $dirid = $entry->{dirid}) { + $add_missing_mapping->('dir', $k, $dirid); + my $mapped_device = { name => $dirid }; + $mapped_res->{$k} = $mapped_device; + + if ($dir_map->{ids}->{$dirid}->{'live-migration-method'}) { + $mapped_device->{'live-migration'} = 1; + # don't add mapped device with live migration as blocker + next; + } + } } # sockets are safe: they will recreated be on the target side post-migrate next if $k =~ m/^serial/ && ($conf->{$k} eq 'socket'); diff --git a/src/PVE/QemuServer/Virtiofs.pm b/src/PVE/QemuServer/Virtiofs.pm index b820ad27..b8285192 100644 --- a/src/PVE/QemuServer/Virtiofs.pm +++ b/src/PVE/QemuServer/Virtiofs.pm @@ -177,6 +177,9 @@ sub start_virtiofsd { my $dir_cfg = PVE::Mapping::Dir::find_on_current_node($virtiofs->{dirid}); + my $dirid = $virtiofs->{dirid}; + my $dir_properties = PVE::Mapping::Dir::config()->{ids}->{$dirid}; + my $virtiofsd_bin = '/usr/libexec/virtiofsd'; if (!-f $virtiofsd_bin) { die "virtiofsd is not installed. To use virtio-fs, install virtiofsd via apt.\n"; @@ -201,6 +204,20 @@ sub start_virtiofsd { push @$cmd, '--readonly' if $virtiofs->{readonly}; push @$cmd, '--cache=' . $virtiofs->{cache} if $virtiofs->{cache}; push @$cmd, '--inode-file-handles=prefer' if $prefer_inode_fh; + + if (my $method = $dir_properties->{'live-migration-method'}) { + # migration-on-error=abort would result in a stopped VM on the target node + push @$cmd, '--migration-on-error=guest-error'; + if ($method eq 'find-paths') { + push @$cmd, '--migration-mode=find-paths'; + push @$cmd, '--migration-verify-handles'; + push @$cmd, '--migration-confirm-paths'; + } + if ($method eq 'file-handles') { + push @$cmd, '--migration-mode=file-handles'; + } + } + push @$cmd, '--syslog'; exec(@$cmd); } elsif (!defined($pid2)) { -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel