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 E24521FF15F for ; Mon, 16 Dec 2024 10:13:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1DEC07108; Mon, 16 Dec 2024 10:12:52 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Mon, 16 Dec 2024 10:12:27 +0100 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH v3 qemu-server 09/11] blockdev: mirror: change aio on target if io_uring is not default. Content-Type: multipart/mixed; boundary="===============7512302660488613098==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============7512302660488613098== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: 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 B1B1EC30A3 for ; Mon, 16 Dec 2024 10:12:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84A0C6EA8 for ; Mon, 16 Dec 2024 10:12:47 +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 ; Mon, 16 Dec 2024 10:12:45 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 4D26A860F12; Mon, 16 Dec 2024 10:12:32 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 8E2BB1084C68; Mon, 16 Dec 2024 10:12:31 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v3 qemu-server 09/11] blockdev: mirror: change aio on target if io_uring is not default. Date: Mon, 16 Dec 2024 10:12:27 +0100 Message-Id: <20241216091229.3142660-14-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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.248 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 This was a limitation of drive-mirror, blockdev mirror is able to reopen image with a different aio Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 3d7c41ee..dc12b38f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -8207,8 +8207,16 @@ sub qemu_drive_mirror { $dst_drive->{format} = $dst_format; $dst_drive->{file} = $dst_path; $dst_drive->{zeroinit} = 1 if $is_zero_initialized; - #improve: if target storage don't support aio uring,change it to default native - #and remove clone_disk_check_io_uring() + + #change aio if io_uring is not supported on target + if ($dst_drive->{aio} && $dst_drive->{aio} eq 'io_uring') { + my ($dst_storeid) = PVE::Storage::parse_volume_id($dst_drive->{file}); + my $dst_scfg = PVE::Storage::storage_config($storecfg, $dst_storeid); + my $cache_direct = drive_uses_cache_direct($dst_drive, $dst_scfg); + if(!storage_allows_io_uring_default($dst_scfg, $cache_direct)) { + $dst_drive->{aio} = $cache_direct ? 'native' : 'threads'; + } + } #add new block device my $nodes = get_blockdev_nodes($vmid); @@ -8514,33 +8522,6 @@ sub qemu_drive_mirror_switch_to_active_mode { } } -# Check for bug #4525: drive-mirror will open the target drive with the same aio setting as the -# source, but some storages have problems with io_uring, sometimes even leading to crashes. -my sub clone_disk_check_io_uring { - my ($src_drive, $storecfg, $src_storeid, $dst_storeid, $use_drive_mirror) = @_; - - return if !$use_drive_mirror; - - # Don't complain when not changing storage. - # Assume if it works for the source, it'll work for the target too. - return if $src_storeid eq $dst_storeid; - - my $src_scfg = PVE::Storage::storage_config($storecfg, $src_storeid); - my $dst_scfg = PVE::Storage::storage_config($storecfg, $dst_storeid); - - my $cache_direct = drive_uses_cache_direct($src_drive); - - my $src_uses_io_uring; - if ($src_drive->{aio}) { - $src_uses_io_uring = $src_drive->{aio} eq 'io_uring'; - } else { - $src_uses_io_uring = storage_allows_io_uring_default($src_scfg, $cache_direct); - } - - die "target storage is known to cause issues with aio=io_uring (used by current drive)\n" - if $src_uses_io_uring && !storage_allows_io_uring_default($dst_scfg, $cache_direct); -} - sub clone_disk { my ($storecfg, $source, $dest, $full, $newvollist, $jobs, $completion, $qga, $bwlimit) = @_; @@ -8598,8 +8579,6 @@ sub clone_disk { $dst_format = 'raw'; $size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE; } else { - clone_disk_check_io_uring($drive, $storecfg, $src_storeid, $storeid, $use_drive_mirror); - $size = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10); } $newvolid = PVE::Storage::vdisk_alloc( -- 2.39.5 --===============7512302660488613098== 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 --===============7512302660488613098==--