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 [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6EFC51FF15E for <inbox@lore.proxmox.com>; Tue, 11 Mar 2025 11:30:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C6CEC64B; Tue, 11 Mar 2025 11:29:29 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Tue, 11 Mar 2025 11:29:04 +0100 In-Reply-To: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> References: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: <mailman.950.1741688968.293.pve-devel@lists.proxmox.com> List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Post: <mailto:pve-devel@lists.proxmox.com> From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com> Precedence: list Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> 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/> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> Subject: [pve-devel] [PATCH v4 qemu-server 10/11] blockdev: add backing_chain support Content-Type: multipart/mixed; boundary="===============7784265256701077963==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> --===============7784265256701077963== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: <root@formationkvm1.odiso.net> X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A39C9D5851 for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F240FC3FF for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:24 +0100 (CET) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:19 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 44406862E4C; Tue, 11 Mar 2025 11:29:09 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 963F8119292E; Tue, 11 Mar 2025 11:29:09 +0100 (CET) From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> To: pve-devel@lists.proxmox.com Subject: [PATCH v4 qemu-server 10/11] blockdev: add backing_chain support Date: Tue, 11 Mar 2025 11:29:04 +0100 Message-Id: <20250311102905.2680524-17-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> References: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.119 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record We need to define name-nodes for all backing chain images, to be able to live rename them with blockdev-reopen For linked clone, we don't need to definebase image(s) chain. They are auto added with #block nodename. Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> --- PVE/QemuServer.pm | 26 ++---------------- PVE/QemuServer/Drive.pm | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index d6aa5730..60481acc 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -54,7 +54,7 @@ use PVE::QemuServer::Helpers qw(config_aware_timeout min_version kvm_user_versio use PVE::QemuServer::Cloudinit; use PVE::QemuServer::CGroup; use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options get_cpu_bitness is_native_arch get_amd_sev_object); -use PVE::QemuServer::Drive qw(is_valid_drivename checked_volume_format drive_is_cloudinit drive_is_cdrom drive_is_read_only parse_drive print_drive print_drive_throttle_group generate_drive_blockdev); +use PVE::QemuServer::Drive qw(is_valid_drivename checked_volume_format drive_is_cloudinit drive_is_cdrom drive_is_read_only parse_drive print_drive print_drive_throttle_group generate_drive_blockdev do_snapshots_with_qemu); use PVE::QemuServer::Machine; use PVE::QemuServer::Memory qw(get_current_memory); use PVE::QemuServer::MetaInfo; @@ -3765,6 +3765,7 @@ sub config_to_command { # extra protection for templates, but SATA and IDE don't support it.. $drive->{ro} = 1 if drive_is_read_only($conf, $drive); my $blockdev = generate_drive_blockdev($storecfg, $vmid, $drive, $live_blockdev_name); + #FIXME: verify if external snapshot backing chain is matching config push @$devices, '-blockdev', JSON->new->canonical->allow_nonref->encode($blockdev) if $blockdev; push @$devices, '-device', print_drivedevice_full( $storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type); @@ -7559,29 +7560,6 @@ sub foreach_storage_used_by_vm { } } -my $qemu_snap_storage = { - rbd => 1, -}; -sub do_snapshots_with_qemu { - my ($storecfg, $volid, $deviceid) = @_; - - return if $deviceid =~ m/tpmstate0/; - - my $storage_name = PVE::Storage::parse_volume_id($volid); - my $scfg = $storecfg->{ids}->{$storage_name}; - die "could not find storage '$storage_name'\n" if !defined($scfg); - - if ($qemu_snap_storage->{$scfg->{type}} && !$scfg->{krbd}){ - return 1; - } - - if ($volid =~ m/\.(qcow2|qed)$/){ - return 1; - } - - return; -} - sub qga_check_running { my ($vmid, $nowarn) = @_; diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 5b281616..51513546 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -18,6 +18,7 @@ our @EXPORT_OK = qw( is_valid_drivename checked_parse_volname checked_volume_format +do_snapshots_with_qemu drive_is_cloudinit drive_is_cdrom drive_is_read_only @@ -1230,6 +1231,32 @@ sub generate_file_blockdev { return $blockdev; } +my $qemu_snap_storage = { + rbd => 1, +}; + +sub do_snapshots_with_qemu { + my ($storecfg, $volid, $deviceid) = @_; + + return if $deviceid =~ m/tpmstate0/; + + my $storage_name = PVE::Storage::parse_volume_id($volid); + my $scfg = $storecfg->{ids}->{$storage_name}; + die "could not find storage '$storage_name'\n" if !defined($scfg); + + if ($qemu_snap_storage->{$scfg->{type}} && !$scfg->{krbd}){ + return 1; + } + + return 2 if $scfg->{snapext} || $scfg->{type} eq 'lvm' && $volid =~ m/\.(qcow2)/; + + if ($volid =~ m/\.(qcow2|qed)$/){ + return 1; + } + + return; +} + sub generate_format_blockdev { my ($storecfg, $drive, $file, $snap, $nodename) = @_; @@ -1272,6 +1299,37 @@ sub generate_format_blockdev { return $blockdev; } +sub generate_backing_blockdev { + my ($storecfg, $snapshots, $deviceid, $drive, $snap_id) = @_; + + my $snapshot = $snapshots->{$snap_id}; + my $parentid = $snapshot->{parent}; + + my $volid = $drive->{file}; + + my $snap_file_blockdev = generate_file_blockdev($storecfg, $drive, $snap_id); + $snap_file_blockdev->{filename} = $snapshot->{file}; + $drive->{ro} = 1; + my $snap_fmt_blockdev = generate_format_blockdev($storecfg, $drive, $snap_file_blockdev, $snap_id); + $snap_fmt_blockdev->{backing} = generate_backing_blockdev($storecfg, $snapshots, $deviceid, $drive, $parentid) if $parentid; + return $snap_fmt_blockdev; +} + +sub generate_backing_chain_blockdev { + my ($storecfg, $deviceid, $drive) = @_; + + my $volid = $drive->{file}; + my $do_snapshots_with_qemu = do_snapshots_with_qemu($storecfg, $volid, $deviceid); + return if !$do_snapshots_with_qemu || $do_snapshots_with_qemu != 2; + + my $chain_blockdev = undef; + PVE::Storage::activate_volumes($storecfg, [$volid]); + my $snapshots = PVE::Storage::volume_snapshot_info($storecfg, $volid); + my $parentid = $snapshots->{'current'}->{parent}; + $chain_blockdev = generate_backing_blockdev($storecfg, $snapshots, $deviceid, $drive, $parentid) if $parentid; + return $chain_blockdev; +} + sub generate_drive_blockdev { my ($storecfg, $vmid, $drive, $live_restore_name) = @_; @@ -1293,6 +1351,8 @@ sub generate_drive_blockdev { my $blockdev_file = generate_file_blockdev($storecfg, $drive); my $blockdev_format = generate_format_blockdev($storecfg, $drive, $blockdev_file); + my $backing_chain = generate_backing_chain_blockdev($storecfg, "drive-$drive_id", $drive); + $blockdev_format->{backing} = $backing_chain if $backing_chain; my $blockdev_live_restore = undef; if ($live_restore_name) { -- 2.39.5 --===============7784265256701077963== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============7784265256701077963==--