From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH qemu-server v5 3/6] check_local_resources: extend for mapped resources
Date: Tue, 13 Jun 2023 14:43:25 +0200 [thread overview]
Message-ID: <54fazm2zlkmo2d7dxjnwbhgtsxxjnuk6djdxnwj5hltslv3pyd@57vglczjkw6o> (raw)
In-Reply-To: <20230606135222.984747-6-d.csapak@proxmox.com>
On Tue, Jun 06, 2023 at 03:52:04PM +0200, Dominik Csapak wrote:
> by adding them to their own list, saving the nodes where
> they are not allowed, and return those on 'wantarray' so we don't break
> existing callers that don't expect it.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> PVE/QemuServer.pm | 43 ++++++++++++++++++++++++++++++++++--
> test/MigrationTest/Shared.pm | 14 ++++++++++++
> 2 files changed, 55 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 2fd45f61..95bf4338 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -34,6 +34,8 @@ use PVE::DataCenterConfig;
> use PVE::Exception qw(raise raise_param_exc);
> use PVE::Format qw(render_duration render_bytes);
> use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne);
> +use PVE::Mapping::PCI;
> +use PVE::Mapping::USB;
> use PVE::INotify;
> use PVE::JSONSchema qw(get_standard_option parse_property_string);
> use PVE::ProcFSTools;
> @@ -2704,6 +2706,28 @@ sub check_local_resources {
> my ($conf, $noerr) = @_;
>
> my @loc_res = ();
> + my $mapped_res = [];
> +
> + my $nodelist = PVE::Cluster::get_nodelist();
> + my $pci_map = PVE::Mapping::PCI::config();
> + my $usb_map = PVE::Mapping::USB::config();
> +
> + my $not_allowed_nodes = { map { $_ => [] } @$nodelist };
Can we find a better name for this?
This maps nodes to lists of conflicting config keys...
$node_conflicts or even just $missing_devices?{,_by_node}?
> +
> + my $add_not_allowed_nodes = sub {
$check_mapped_devices_on_nodes?
> + my ($type, $key, $id) = @_;
> + for my $node (@$nodelist) {
> + my $entry;
> + if ($type eq 'pci') {
> + $entry = PVE::Mapping::PCI::get_node_mapping($pci_map, $id, $node);
> + } elsif ($type eq 'usb') {
> + $entry = PVE::Mapping::USB::get_node_mapping($usb_map, $id, $node);
> + }
> + if (!scalar($entry->@*)) {
> + push @{$not_allowed_nodes->{$node}}, $key;
> + }
> + }
> + };
>
> push @loc_res, "hostusb" if $conf->{hostusb}; # old syntax
> push @loc_res, "hostpci" if $conf->{hostpci}; # old syntax
> @@ -2711,7 +2735,22 @@ sub check_local_resources {
> push @loc_res, "ivshmem" if $conf->{ivshmem};
>
> foreach my $k (keys %$conf) {
> - next if $k =~ m/^usb/ && ($conf->{$k} =~ m/^spice(?![^,])/);
> + if ($k =~ m/^usb/) {
> + my $entry = parse_property_string($usb_fmt, $conf->{$k});
> + my $usb = PVE::QemuServer::USB::parse_usb_device($entry->{host});
> + next if $usb->{spice};
> + if ($usb->{mapped}) {
> + $add_not_allowed_nodes->('usb', $k, $entry->{host});
> + push @$mapped_res, $k;
> + }
> + }
> + if ($k =~ m/^hostpci/) {
> + my $entry = parse_property_string('pve-qm-hostpci', $conf->{$k});
> + if ($entry->{host} !~ m/:/) {
> + $add_not_allowed_nodes->('pci', $k, $entry->{host});
> + push @$mapped_res, $k;
> + }
> + }
> # sockets are safe: they will recreated be on the target side post-migrate
> next if $k =~ m/^serial/ && ($conf->{$k} eq 'socket');
> push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel)\d+$/;
> @@ -2719,7 +2758,7 @@ sub check_local_resources {
>
> die "VM uses local resources\n" if scalar @loc_res && !$noerr;
>
> - return \@loc_res;
> + return wantarray ? (\@loc_res, $mapped_res, $not_allowed_nodes) : \@loc_res;
> }
>
> # check if used storages are available on all nodes (use by migrate)
> diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm
> index bd4d20c0..aa7203d1 100644
> --- a/test/MigrationTest/Shared.pm
> +++ b/test/MigrationTest/Shared.pm
> @@ -76,6 +76,20 @@ $cluster_module->mock(
> },
> );
>
> +our $mapping_usb_module = Test::MockModule->new("PVE::Mapping::USB");
> +$mapping_usb_module->mock(
> + config => sub {
> + return {};
> + },
> +);
> +
> +our $mapping_pci_module = Test::MockModule->new("PVE::Mapping::PCI");
> +$mapping_pci_module->mock(
> + config => sub {
> + return {};
> + },
> +);
> +
> our $ha_config_module = Test::MockModule->new("PVE::HA::Config");
> $ha_config_module->mock(
> vm_is_ha_managed => sub {
> --
> 2.30.2
next prev parent reply other threads:[~2023-06-13 12:43 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 13:51 [pve-devel] [PATCH access-control/guest-common/qemu-server/manager v5] cluster mapping Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH access-control v5 1/1] add privileges and paths for cluster resource mapping Dominik Csapak
2023-06-07 17:03 ` [pve-devel] applied: " Thomas Lamprecht
2023-06-06 13:52 ` [pve-devel] [PATCH guest-common v5 1/1] add PCI/USB Mapping configs Dominik Csapak
2023-06-07 17:17 ` [pve-devel] applied: " Thomas Lamprecht
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 1/6] enable cluster mapped USB devices for guests Dominik Csapak
2023-06-13 12:23 ` Wolfgang Bumiller
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 2/6] enable cluster mapped PCI " Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 3/6] check_local_resources: extend for mapped resources Dominik Csapak
2023-06-13 12:43 ` Wolfgang Bumiller [this message]
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 4/6] api: migrate preconditions: use new check_local_resources info Dominik Csapak
2023-06-13 12:46 ` Wolfgang Bumiller
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 5/6] migration: check for mapped resources Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH qemu-server v5 6/6] add test for mapped pci devices Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 01/15] pvesh: fix parameters for proxyto_callback Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 02/15] api: add resource map api endpoints for PCI and USB Dominik Csapak
2023-06-13 11:26 ` Wolfgang Bumiller
2023-06-06 13:52 ` [pve-devel] [PATCH v5 03/15] ui: parser: add helpers for lists of property strings Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 04/15] ui: form/USBSelector: make it more flexible with nodename Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 05/15] ui: form: add PCIMapSelector Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 06/15] ui: form: add USBMapSelector Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 07/15] ui: qemu/PCIEdit: rework panel to add a mapped configuration Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 08/15] ui: qemu/USBEdit: add 'mapped' device case Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 09/15] ui: form: add MultiPCISelector Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 10/15] ui: add edit window for pci mappings Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 11/15] ui: add edit window for usb mappings Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 12/15] ui: add ResourceMapTree Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 13/15] ui: allow configuring pci and usb mapping Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 14/15] ui: window/Migrate: allow mapped devices Dominik Csapak
2023-06-06 13:52 ` [pve-devel] [PATCH v5 15/15] ui: improve permission handling for hardware 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=54fazm2zlkmo2d7dxjnwbhgtsxxjnuk6djdxnwj5hltslv3pyd@57vglczjkw6o \
--to=w.bumiller@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