From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 8DC141FF17A
for <inbox@lore.proxmox.com>; Tue, 6 Aug 2024 14:22:16 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 107A01CF97;
Tue, 6 Aug 2024 14:22:10 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 6 Aug 2024 14:22:03 +0200
Message-Id: <20240806122203.2266054-7-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240806122203.2266054-1-d.csapak@proxmox.com>
References: <20240806122203.2266054-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.016 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
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 manager 1/1] api/ui: improve mdev listing for
pci mappings
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
currently when we have a pci resource mapping, we manually check only
the available models for the first pci entry. This often works, but not
always, since one could have completely different devices in one
mapping, or with the new nvidia sysfs api we don't get the generally
available models.
To improve this, extend the 'pciid' regex to include pciids or mapping
names, and for mappings, iterate over all local pci devices in it and
extract the mdev types.
This also vastly simplifies the ui code, since we only have to give the
mapping to the selector instead of an (arbitrarily selected) pci id.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/API2/Hardware/PCI.pm | 45 +++++++++++++++++++++++++++++-------
www/manager6/qemu/PCIEdit.js | 12 +---------
2 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/PVE/API2/Hardware/PCI.pm b/PVE/API2/Hardware/PCI.pm
index a3a689bf..7135a605 100644
--- a/PVE/API2/Hardware/PCI.pm
+++ b/PVE/API2/Hardware/PCI.pm
@@ -135,7 +135,7 @@ __PACKAGE__->register_method ({
__PACKAGE__->register_method ({
name => 'pciindex',
- path => '{pciid}',
+ path => '{pciid-or-mapping}',
method => 'GET',
description => "Index of available pci methods",
permissions => {
@@ -145,9 +145,9 @@ __PACKAGE__->register_method ({
additionalProperties => 0,
properties => {
node => get_standard_option('pve-node'),
- pciid => {
+ 'pciid-or-mapping' => {
type => 'string',
- pattern => '(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F]',
+ pattern => '(?:(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F])|([a-zA-Z][a-zA-Z0-9_-]+)',
},
},
},
@@ -171,7 +171,7 @@ __PACKAGE__->register_method ({
__PACKAGE__->register_method ({
name => 'mdevscan',
- path => '{pciid}/mdev',
+ path => '{pciid-or-mapping}/mdev',
method => 'GET',
description => "List mediated device types for given PCI device.",
protected => 1,
@@ -183,10 +183,10 @@ __PACKAGE__->register_method ({
additionalProperties => 0,
properties => {
node => get_standard_option('pve-node'),
- pciid => {
+ 'pciid-or-mapping' => {
type => 'string',
- pattern => '(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F]',
- description => "The PCI ID to list the mdev types for."
+ pattern => '(?:(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F])|([a-zA-Z][a-zA-Z0-9_-]+)',
+ description => "The PCI ID or mapping to list the mdev types for."
},
},
},
@@ -206,6 +206,12 @@ __PACKAGE__->register_method ({
},
description => {
type => 'string',
+ description => "Additional description of the type."
+ },
+ name => {
+ type => 'string',
+ optional => 1,
+ description => 'A human readable name for the type.',
},
},
},
@@ -213,5 +219,28 @@ __PACKAGE__->register_method ({
code => sub {
my ($param) = @_;
- return PVE::SysFSTools::get_mdev_types($param->{pciid});
+ if ($param->{'pciid-or-mapping'} =~ m/^(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F]$/) {
+ return PVE::SysFSTools::get_mdev_types($param->{'pciid-or-mapping'});
+ } else {
+ my $mapping = $param->{'pciid-or-mapping'};
+
+ my $types = {};
+ my $devices = PVE::Mapping::PCI::find_on_current_node($mapping);
+ for my $device ($devices->@*) {
+ my $id = $device->{path};
+ next if $id =~ m/;/; # mdev not supported for multifunction devices
+
+ my $device_types = PVE::SysFSTools::get_mdev_types($id);
+
+ for my $type_definition ($device_types->@*) {
+ my $type = $type_definition->{type};
+ if (!defined($types->{$type})) {
+ $types->{$type} = $type_definition;
+ }
+ }
+ }
+
+ return [sort { $a->{type} cmp $b->{type} } values($types->%*)];
+ }
+
}});
diff --git a/www/manager6/qemu/PCIEdit.js b/www/manager6/qemu/PCIEdit.js
index 970e81c2..7c1b7b85 100644
--- a/www/manager6/qemu/PCIEdit.js
+++ b/www/manager6/qemu/PCIEdit.js
@@ -67,17 +67,7 @@ Ext.define('PVE.qemu.PCIInputPanel', {
let path = value;
if (pciDev.data.map) {
- // find local mapping
- for (const entry of pciDev.data.map) {
- let mapping = PVE.Parser.parsePropertyString(entry);
- if (mapping.node === pcisel.up('inputpanel').nodename) {
- path = mapping.path.split(';')[0];
- break;
- }
- }
- if (path.indexOf('.') === -1) {
- path += '.0';
- }
+ path = pciDev.data.id;
}
if (pciDev.data.mdev) {
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel