mirror of
https://git.proxmox.com/git/pve-common
synced 2025-04-28 15:28:55 +00:00
sysfstools: fix regression on binding to vfio-pci
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 <d.csapak@proxmox.com>
This commit is contained in:
parent
e8ab2427d6
commit
3b6ce501ad
@ -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;
|
||||
@ -225,6 +227,7 @@ sub file_write {
|
||||
if (defined($res)) {
|
||||
return 1;
|
||||
} elsif ($syserr) {
|
||||
return 1 if $allow_existing && $syserr == EEXIST;
|
||||
warn "error writing '$buf' to '$filename': $syserr\n";
|
||||
}
|
||||
|
||||
@ -310,7 +313,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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user