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 E3E9D1FF15E for <inbox@lore.proxmox.com>; Tue, 11 Mar 2025 11:30:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E0E84C5BB; Tue, 11 Mar 2025 11:29:27 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Tue, 11 Mar 2025 11:29:03 +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.949.1741688967.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 09/11] blockdev: change aio on target if io_uring is not default. Content-Type: multipart/mixed; boundary="===============8511658201047310078==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> --===============8511658201047310078== 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 861AED5849 for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D73C6C2EE for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:23 +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:20 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 3EAC3862E4B; Tue, 11 Mar 2025 11:29:09 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 90422119292F; 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 09/11] blockdev: change aio on target if io_uring is not default. Date: Tue, 11 Mar 2025 11:29:03 +0100 Message-Id: <20250311102905.2680524-16-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.121 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 This was a limitation of drive-mirror, blockdev mirror is able to reopen image with a different aio. Do the change when generating the blockdev_format Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> --- PVE/QemuServer.pm | 4 ---- PVE/QemuServer/Drive.pm | 30 +++--------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 63b8f332..d6aa5730 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7735,8 +7735,6 @@ sub qemu_drive_mirror { my $dst_drive = dclone($drive); $dst_drive->{file} = $dst_volid; $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() #add new block device my $target_file_blockdev = generate_file_blockdev($storecfg, $dst_drive); @@ -8109,8 +8107,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( diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 9fe679dd..5b281616 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -1032,33 +1032,6 @@ my sub drive_uses_cache_direct { return $cache_direct; } -# 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. -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 generate_blockdev_drive_aio { my ($drive, $scfg) = @_; @@ -1077,6 +1050,9 @@ sub generate_blockdev_drive_aio { $aio = "threads"; } } + } elsif ($drive->{aio} eq 'io_uring' && !storage_allows_io_uring_default($scfg, $cache_direct)) { + #change aio if io_uring is not supported by storage + $aio = $cache_direct ? 'native' : 'threads'; } return $aio; } -- 2.39.5 --===============8511658201047310078== 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 --===============8511658201047310078==--