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 149A47375B for ; Thu, 7 Oct 2021 15:46:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 01AEF1AC5E for ; Thu, 7 Oct 2021 15:45:34 +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 B3FF91AC40 for ; Thu, 7 Oct 2021 15:45:32 +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 77AA044DAF for ; Thu, 7 Oct 2021 15:45:32 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 7 Oct 2021 15:45:30 +0200 Message-Id: <20211007134531.1693674-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211007134531.1693674-1-d.csapak@proxmox.com> References: <20211007134531.1693674-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.303 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pci.pm] Subject: [pve-devel] [PATCH qemu-server v3 2/3] pci: add helpers to (un)reserve pciids for a vm 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, 07 Oct 2021 13:46:04 -0000 saves a list of pciid <-> vmid mappings in /var/run that we can check when we start a vm if we're not given a pid but a timeout, we save the time when the reservation will run out (current time + timeout + 5s) since each vm start (until we can save the pid) varies from config to config reserve_pci_usage and remove_pci_reservation always expect a list of ids so that we can update the reservation for a vm all at once Signed-off-by: Dominik Csapak --- PVE/QemuServer/PCI.pm | 103 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm index b94a99a..102d509 100644 --- a/PVE/QemuServer/PCI.pm +++ b/PVE/QemuServer/PCI.pm @@ -5,6 +5,7 @@ use strict; use PVE::JSONSchema; use PVE::SysFSTools; +use PVE::Tools; use base 'Exporter'; @@ -481,4 +482,106 @@ sub prepare_pci_device { return; } +my $PCIID_RESERVATION_FILE = "/var/run/pve-reserved-pciids"; +my $PCIID_RESERVATION_LCK = "/var/lock/pve-reserved-pciids.lck"; + +my $parse_pci_reservation = sub { + my $pciids = {}; + + if (my $fh = IO::File->new ($PCIID_RESERVATION_FILE, "r")) { + while (my $line = <$fh>) { + if ($line =~ m/^($PCIRE)\s(\d+)\s(time|pid)\:(\d+)$/) { + $pciids->{$1} = { + vmid => $2, + "$3" => $4, + }; + } + } + } + + return $pciids; +}; + +my $write_pci_reservation = sub { + my ($pciids) = @_; + + my $data = ""; + foreach my $p (keys %$pciids) { + my $entry = $pciids->{$p}; + if (defined($entry->{pid})) { + $data .= "$p $entry->{vmid} pid:$entry->{pid}\n"; + } else { + $data .= "$p $entry->{vmid} time:$entry->{time}\n"; + } + } + + PVE::Tools::file_set_contents($PCIID_RESERVATION_FILE, $data); +}; + +sub remove_pci_reservation { + my ($ids) = @_; + + return if !scalar(@$ids); # do nothing for empty list + + my $code = sub { + my $pciids = $parse_pci_reservation->(); + + for my $id (@$ids) { + delete $pciids->{$id}; + } + + $write_pci_reservation->($pciids); + }; + + PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, $code); + die $@ if $@; + + return; +} + +sub reserve_pci_usage { + my ($ids, $vmid, $timeout, $pid) = @_; + + return if !scalar(@$ids); # do nothing for empty list + + PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, sub { + + my $ctime = time(); + my $pciids = $parse_pci_reservation->(); + + for my $id (@$ids) { + my $errmsg = "PCI device '$id' already in use\n"; + if (my $pciid = $pciids->{$id}) { + if ($pciid->{vmid} != $vmid) { + # check time based reservation + die $errmsg if defined($pciid->{time}) && $pciid->{time} > $ctime; + + # check running vm + my $pid = PVE::QemuServer::Helpers::vm_running_locally($pciid->{vmid}); + if (my $oldpid = $pciid->{pid}) { + die $errmsg if defined($pid) && $pid == $oldpid; + warn "leftover PCI reservation found for $id, ignoring...\n" + if !defined($pid) || $pid != $oldpid; + } + } + } + + $pciids->{$id} = { + vmid => $vmid, + }; + if (defined($timeout)) { + # we save the time when the reservation gets invalid (+5s), + # since the start timeout depends on the config + $pciids->{$id}->{time} = $ctime + $timeout + 5; + } + $pciids->{$id}->{pid} = $pid if defined($pid); + } + + $write_pci_reservation->($pciids); + + return; + }); + die $@ if $@; +} + 1; -- 2.30.2