From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH common] SysFSTools: allow longer pci domains
Date: Mon, 28 Feb 2022 14:48:19 +0100 [thread overview]
Message-ID: <20220228134820.848910-1-d.csapak@proxmox.com> (raw)
by default, there is only one pci domain ('0000'), but there are systems
where there are more, and they don't need to be exactly 4 characters
long (see [0]), so extend that regex to allow domains 4 characters or
longer
0: https://forum.proxmox.com/threads/problem-with-gpu-passthrough-in-a-virtual-machine.105720/
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PVE/SysFSTools.pm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm
index 8b26599..aabe833 100644
--- a/src/PVE/SysFSTools.pm
+++ b/src/PVE/SysFSTools.pm
@@ -8,7 +8,7 @@ use IO::File;
use PVE::Tools qw(file_read_firstline dir_glob_foreach);
my $pcisysfs = "/sys/bus/pci";
-my $pciregex = "([a-f0-9]{4}):([a-f0-9]{2}):([a-f0-9]{2})\.([a-f0-9])";
+my $pciregex = "([a-f0-9]{4,}):([a-f0-9]{2}):([a-f0-9]{2})\.([a-f0-9])";
my $parse_pci_ids = sub {
my $ids = {};
@@ -149,7 +149,7 @@ sub get_mdev_types {
my ($id) = @_;
my $fullid = $id;
- if ($id !~ m/^[0-9a-fA-f]{4}:/) {
+ if ($id !~ m/^[0-9a-fA-f]{4,}:/) {
$fullid = "0000:$id";
}
@@ -300,11 +300,11 @@ sub pci_dev_group_bind_to_vfio {
}
die "Cannot find vfio-pci module!\n" if !-d $vfio_basedir;
- $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4}:/;
+ $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4,}:/;
# get IOMMU group devices
opendir(my $D, "$pcisysfs/devices/$pciid/iommu_group/devices/") || die "Cannot open iommu_group: $!\n";
- my @devs = grep /^[0-9a-f]{4}:/, readdir($D);
+ my @devs = grep /^[0-9a-f]{4,}:/, readdir($D);
closedir($D);
foreach my $pciid (@devs) {
@@ -323,7 +323,7 @@ sub pci_dev_group_bind_to_vfio {
sub pci_create_mdev_device {
my ($pciid, $uuid, $type) = @_;
- $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4}:/;
+ $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4,}:/;
my $basedir = "$pcisysfs/devices/$pciid";
my $mdev_dir = "$basedir/mdev_supported_types";
@@ -360,7 +360,7 @@ sub pci_create_mdev_device {
sub pci_cleanup_mdev_device {
my ($pciid, $uuid) = @_;
- $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4}:/;
+ $pciid = "0000:$pciid" if $pciid !~ m/^[0-9a-f]{4,}:/;
my $basedir = "$pcisysfs/devices/$pciid/$uuid";
--
2.30.2
next reply other threads:[~2022-02-28 13:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 13:48 Dominik Csapak [this message]
2022-02-28 13:48 ` [pve-devel] [PATCH qemu-server] PCI: " Dominik Csapak
2022-03-16 17:04 ` [pve-devel] applied: " Thomas Lamprecht
2022-03-16 18:09 ` [pve-devel] applied: [PATCH common] SysFSTools: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228134820.848910-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox