From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pve-devel] [PATCH guest-common v3 1/4] mapping: pci: rework properties check
Date: Fri, 31 May 2024 13:37:06 +0200 [thread overview]
Message-ID: <696d617a-b571-4953-b3fe-b7c2f21fa074@proxmox.com> (raw)
In-Reply-To: <20240419124556.3334691-2-d.csapak@proxmox.com>
Am 19.04.24 um 14:45 schrieb Dominik Csapak:
> rename '$cfg' to '$mapping', 'correct' to 'expected'
> reword the error messages
> also check keys from the configured props not only the expected ones
>
Would've been nicer as multiple commits.
> previously we only checked the keys from the 'correct_props' hash
> but that was unintended. We now check the keys from both, but extract
> the relevant properties first.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> changes from v2:
> * don't refactor the properties check out
> * use properties from both configured and expected hashes
> * extract the relevant configured properties from the mapping
> instead of using all (previously we only used the expected ones
> by accident)
> src/PVE/Mapping/PCI.pm | 34 +++++++++++++++++++---------------
> 1 file changed, 19 insertions(+), 15 deletions(-)
>
> diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm
> index 725e106..ef1bd8d 100644
> --- a/src/PVE/Mapping/PCI.pm
> +++ b/src/PVE/Mapping/PCI.pm
> @@ -131,9 +131,9 @@ sub options {
>
> # checks if the given config is valid for the current node
> sub assert_valid {
> - my ($name, $cfg) = @_;
> + my ($name, $mapping) = @_;
>
> - my @paths = split(';', $cfg->{path} // '');
> + my @paths = split(';', $mapping->{path} // '');
>
> my $idx = 0;
> for my $path (@paths) {
> @@ -148,32 +148,36 @@ sub assert_valid {
> my $info = PVE::SysFSTools::pci_device_info($path, 1);
> die "pci device '$path' not found\n" if !defined($info);
>
> - my $correct_props = {
My suggestion is the following code changes. See below for rationale[0].
# make sure to initialize all keys that should be checked below!
> + my $expected_props = {
> id => "$info->{vendor}:$info->{device}",
> iommugroup => $info->{iommugroup},
'subsystem-id' => undef,
> };
>
> if (defined($info->{'subsystem_vendor'}) && defined($info->{'subsystem_device'})) {
> - $correct_props->{'subsystem-id'} = "$info->{'subsystem_vendor'}:$info->{'subsystem_device'}";
> + $expected_props->{'subsystem-id'} = "$info->{'subsystem_vendor'}:$info->{'subsystem_device'}";
> }
>
> - for my $prop (sort keys %$correct_props) {
> + my $configured_props = { $mapping->%{qw(id iommugroup subsystem-id)} };
> +
> + my $merged = { %$expected_props, %$configured_props }; # just for the keys
> + for my $prop (sort keys %$merged) {
I'd prefer to just extract the keys directly and avoid the comment:
my @keys = keys { $expected_props->%*, $configured_props->%* }->%*;
[0]: But we could also just initialize $expected_props like mentioned
above and then simply use the keys from there. Then you also don't need
to construct a new hash for $configured_props and introduce a new
hard-coded list ;)
> next if $prop eq 'iommugroup' && $idx > 0; # check iommu only on the first device
>
> - next if !defined($correct_props->{$prop}) && !defined($cfg->{$prop});
> - die "no '$prop' for device '$path'\n"
> - if defined($correct_props->{$prop}) && !defined($cfg->{$prop});
> - die "'$prop' configured but should not be\n"
> - if !defined($correct_props->{$prop}) && defined($cfg->{$prop});
> + next if !defined($expected_props->{$prop}) && !defined($configured_props->{$prop});
> + die "missing expected property '$prop' for device '$path'\n"
> + if defined($expected_props->{$prop}) && !defined($configured_props->{$prop});
> + die "unexpected property '$prop' configured for device '$path'\n"
> + if !defined($expected_props->{$prop}) && defined($configured_props->{$prop});
>
> - my $correct_prop = $correct_props->{$prop};
> - $correct_prop =~ s/0x//g;
> - my $configured_prop = $cfg->{$prop};
> + my $expected_prop = $expected_props->{$prop};
> + $expected_prop =~ s/0x//g;
> + my $configured_prop = $configured_props->{$prop};
> $configured_prop =~ s/0x//g;
>
> - die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n"
> - if $correct_prop ne $configured_prop;
> + die "'$prop' does not match for '$name' ($expected_prop != $configured_prop)\n"
> + if $expected_prop ne $configured_prop;
> }
> +
> $idx++;
> }
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-05-31 11:37 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 12:45 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 1/4] mapping: pci: rework properties check Dominik Csapak
2024-05-31 11:37 ` Fiona Ebner [this message]
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 2/4] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-05-31 12:02 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 3/4] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 4/4] mapping: remove find_on_current_node Dominik Csapak
2024-05-31 12:09 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 01/10] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 02/10] pci: " Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 03/10] pci: mapping: check mdev config against hardware Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 04/10] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 05/10] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:49 ` Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 07/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:51 ` Dominik Csapak
2024-06-05 9:31 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 08/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-05-31 13:05 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 09/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-05-31 13:13 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 10/10] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2024-05-31 13:37 ` Fiona Ebner
2024-06-05 9:21 ` Dominik Csapak
2024-06-05 9:38 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-05-28 7:25 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-05-31 8:11 ` Eneko Lacunza via pve-devel
[not found] ` <954884c6-3a53-4b3a-bdc8-93478037b6a6@binovo.es>
2024-05-31 8:41 ` Dominik Csapak
2024-06-03 8:43 ` Eneko Lacunza via pve-devel
2024-05-31 11:14 ` Fiona Ebner
2024-06-05 8:01 ` Dominik Csapak
2024-05-31 13:40 ` Fiona Ebner
2024-06-06 9:38 ` Dominik Csapak
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=696d617a-b571-4953-b3fe-b7c2f21fa074@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=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