From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 603DE1FF183 for ; Mon, 11 Nov 2024 11:18:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD3AF3F0F9; Mon, 11 Nov 2024 11:18:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 11 Nov 2024 11:17:57 +0100 Message-Id: <20241111101758.1259669-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111101758.1259669-1-d.csapak@proxmox.com> References: <20241111101758.1259669-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 common v4 2/2] sysfstools: fix regression on binding to vfio-pci 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" when starting a vm with passthrough, we have to bind all normal pci devices to vfio-pci. This happens by * unbinding from current driver * telling vfio-pci the 'vendorid modelid' combo so it knows this device class can use the driver (by writing to 'new_id') * actually binding the device to vfio-pci if there are multiple devices of the same 'vendorid modelid' class on the host (and passed through), only the first write to 'new_id' is successful, all subsequent ones return EEXIST. This could happen e.g. for setups with multiple GPUs that have the same audio chip. To fix this, ignore the EEXIST error for this write to new_id, by adding a new parameter to file_write for this. If we need to ignore other errors in the future, we can still make this more generic. Signed-off-by: Dominik Csapak --- changes from v3: * add ignoring to file_write in this patch * only add a single option for ignoring EEXIST, we can add more/make it more generic later too if we need it. src/PVE/SysFSTools.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm index 772f6d6..8f39da3 100644 --- a/src/PVE/SysFSTools.pm +++ b/src/PVE/SysFSTools.pm @@ -4,6 +4,7 @@ use strict; use warnings; use IO::File; +use POSIX qw(EEXIST); use PVE::Tools qw(file_read_firstline dir_glob_foreach); @@ -212,8 +213,9 @@ sub check_iommu_support{ } # writes $buf into $filename, on success returns 1, on error returns 0 and warns +# if $allow_existing is set, an EEXIST error will be handled as success sub file_write { - my ($filename, $buf) = @_; + my ($filename, $buf, $allow_existing) = @_; my $fh = IO::File->new($filename, "w"); return undef if !$fh; @@ -224,6 +226,7 @@ sub file_write { if (defined($res)) { return 1; } elsif (my $err = $!) { + return 1 if $allow_existing && $err == EEXIST; warn "error writing '$buf' to '$filename': $err\n"; } @@ -309,7 +312,8 @@ sub pci_dev_bind_to_vfio { return 1 if -d $testdir; my $data = "$dev->{vendor} $dev->{device}"; - return undef if !file_write("$vfio_basedir/new_id", $data); + # allow EEXIST for multiple devices with the same vendor/modelid + return undef if !file_write("$vfio_basedir/new_id", $data, 1); my $fn = "$pcisysfs/devices/$name/driver/unbind"; if (!file_write($fn, $name)) { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel