From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9FD1B6AA6E for ; Thu, 17 Mar 2022 09:12:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D9572FA91 for ; Thu, 17 Mar 2022 09:12:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 id 130E72FA88 for ; Thu, 17 Mar 2022 09:12:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D894E41B3B for ; Thu, 17 Mar 2022 09:12:27 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 17 Mar 2022 09:12:26 +0100 Message-Id: <20220317081226.740703-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.152 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sysfstools.pm] Subject: [pve-devel] [PATCH common] SysFSTools: factor out the domain fixup and domain regex 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: , X-List-Received-Date: Thu, 17 Mar 2022 08:12:28 -0000 Signed-off-by: Dominik Csapak --- src/PVE/SysFSTools.pm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm index aabe833..4038eed 100644 --- a/src/PVE/SysFSTools.pm +++ b/src/PVE/SysFSTools.pm @@ -8,7 +8,8 @@ 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 $domainregex = "[a-f0-9]{4,}"; +my $pciregex = "($domainregex):([a-f0-9]{2}):([a-f0-9]{2})\.([a-f0-9])"; my $parse_pci_ids = sub { my $ids = {}; @@ -33,6 +34,14 @@ my $parse_pci_ids = sub { return $ids; }; +my $fixup_missing_domain = sub { + my ($id) = @_; + + $id = "0000:$id" if $id !~ m/^${domainregex}:/; + + return $id; +}; + # returns a list of pci devices # # filter is either a string (then it tries to match to the id) @@ -148,14 +157,11 @@ sub lspci { sub get_mdev_types { my ($id) = @_; - my $fullid = $id; - if ($id !~ m/^[0-9a-fA-f]{4,}:/) { - $fullid = "0000:$id"; - } + $id = $fixup_missing_domain->($id); my $types = []; - my $mdev_path = "$pcisysfs/devices/$fullid/mdev_supported_types"; + my $mdev_path = "$pcisysfs/devices/$id/mdev_supported_types"; if (!-d $mdev_path) { return $types; } @@ -300,11 +306,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 = $fixup_missing_domain->($pciid); # 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 /^${domainregex}:/, readdir($D); closedir($D); foreach my $pciid (@devs) { @@ -323,7 +329,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 = $fixup_missing_domain->($pciid); my $basedir = "$pcisysfs/devices/$pciid"; my $mdev_dir = "$basedir/mdev_supported_types"; @@ -360,7 +366,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 = $fixup_missing_domain->($pciid); my $basedir = "$pcisysfs/devices/$pciid/$uuid"; -- 2.30.2