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 8D99F743E2 for ; Mon, 21 Jun 2021 15:56:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 688081C32B for ; Mon, 21 Jun 2021 15:55:37 +0200 (CEST) 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 798971C2E4 for ; Mon, 21 Jun 2021 15:55:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 52A8643003 for ; Mon, 21 Jun 2021 15:55:35 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 21 Jun 2021 15:55:15 +0200 Message-Id: <20210621135534.14807-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210621135534.14807-1-d.csapak@proxmox.com> References: <20210621135534.14807-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.846 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 Subject: [pve-devel] [PATCH common 1/3] SysFSTools: add verbose flag to pci_device_info 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: Mon, 21 Jun 2021 13:56:07 -0000 to also get the subsystem_vendor and device, as well as the iommu group and mediated device support Signed-off-by: Dominik Csapak --- src/PVE/SysFSTools.pm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm index a8d9a7f..7875b26 100644 --- a/src/PVE/SysFSTools.pm +++ b/src/PVE/SysFSTools.pm @@ -197,20 +197,22 @@ sub file_write { } sub pci_device_info { - my ($name) = @_; + my ($name, $verbose) = @_; my $res; return undef if $name !~ m/^${pciregex}$/; my ($domain, $bus, $slot, $func) = ($1, $2, $3, $4); - my $irq = file_read_firstline("$pcisysfs/devices/$name/irq"); + my $devdir = "$pcisysfs/devices/$name"; + + my $irq = file_read_firstline("$devdir/irq"); return undef if !defined($irq) || $irq !~ m/^\d+$/; - my $vendor = file_read_firstline("$pcisysfs/devices/$name/vendor"); + my $vendor = file_read_firstline("$devdir/vendor"); return undef if !defined($vendor) || $vendor !~ s/^0x//; - my $product = file_read_firstline("$pcisysfs/devices/$name/device"); + my $product = file_read_firstline("$devdir/device"); return undef if !defined($product) || $product !~ s/^0x//; $res = { @@ -225,6 +227,25 @@ sub pci_device_info { has_fl_reset => -f "$pcisysfs/devices/$name/reset" || 0, }; + if ($verbose) { + my $sub_vendor = file_read_firstline("$devdir/subsystem_vendor"); + $sub_vendor =~ s/^0x// if defined($sub_vendor); + my $sub_device = file_read_firstline("$devdir/subsystem_device"); + $sub_device =~ s/^0x// if defined($sub_device); + + $res->{subsystem_vendor} = $sub_vendor if defined($sub_vendor); + $res->{subsystem_device} = $sub_device if defined($sub_device); + + if (-e "$devdir/iommu_group") { + my ($iommugroup) = (readlink("$devdir/iommu_group") =~ m/\/(\d+)$/); + $res->{iommugroup} = int($iommugroup); + } + + if (-d "$devdir/mdev_supported_types") { + $res->{mdev} = 1; + } + } + return $res; } -- 2.20.1