proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 21:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pci reservation: encode locklessness of parsers in name

Browse Source 
to avoid that they're misused

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-10-15 14:44:47 +02:00
parent 3bfee796f4
commit cda95d5223
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuServer/PCI.pm
View File

@ -488,10 +488,10 @@ sub prepare_pci_device {
my $PCIID_RESERVATION_FILE = "/var/run/pve-reserved-pciids"; my $PCIID_RESERVATION_FILE = "/var/run/pve-reserved-pciids";
my $PCIID_RESERVATION_LCK = "/var/lock/pve-reserved-pciids.lck"; my $PCIID_RESERVATION_LCK = "/var/lock/pve-reserved-pciids.lck";
my $parse_pci_reservation = sub { my $parse_pci_reservation_unlocked = sub {
my $pciids = {}; my $pciids = {};
if (my $fh = IO::File->new ($PCIID_RESERVATION_FILE, "r")) { if (my $fh = IO::File->new($PCIID_RESERVATION_FILE, "r")) {
while (my $line = <$fh>) { while (my $line = <$fh>) {
if ($line =~ m/^($PCIRE)\s(\d+)\s(time|pid)\:(\d+)$/) { if ($line =~ m/^($PCIRE)\s(\d+)\s(time|pid)\:(\d+)$/) {
$pciids->{$1} = { $pciids->{$1} = {
@ -505,7 +505,7 @@ my $parse_pci_reservation = sub {
return $pciids; return $pciids;
}; };
my $write_pci_reservation = sub { my $write_pci_reservation_unlocked = sub {
my ($pciids) = @_; my ($pciids) = @_;
my $data = ""; my $data = "";
@ -527,13 +527,13 @@ sub remove_pci_reservation {
return if !scalar(@$ids); # do nothing for empty list return if !scalar(@$ids); # do nothing for empty list
my $code = sub { my $code = sub {
my $pciids = $parse_pci_reservation->(); my $pciids = $parse_pci_reservation_unlocked->();
for my $id (@$ids) { for my $id (@$ids) {
delete $pciids->{$id}; delete $pciids->{$id};
} }
$write_pci_reservation->($pciids); $write_pci_reservation_unlocked->($pciids);
}; };
PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, $code); PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, $code);
@ -550,7 +550,7 @@ sub reserve_pci_usage {
PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, sub { PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, sub {
my $ctime = time(); my $ctime = time();
my $pciids = $parse_pci_reservation->(); my $pciids = $parse_pci_reservation_unlocked->();
for my $id (@$ids) { for my $id (@$ids) {
my $errmsg = "PCI device '$id' already in use\n"; my $errmsg = "PCI device '$id' already in use\n";
@ -580,7 +580,7 @@ sub reserve_pci_usage {
$pciids->{$id}->{pid} = $pid if defined($pid); $pciids->{$id}->{pid} = $pid if defined($pid);
} }
$write_pci_reservation->($pciids); $write_pci_reservation_unlocked->($pciids);
return; return;
}); });