mirror of
https://git.proxmox.com/git/qemu-server
synced 2025-10-04 21:14:21 +00:00
pci: add conflict tests
best viewed with: git show -w Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
parent
c4e1638148
commit
d7d698f60c
@ -8,122 +8,135 @@ print_pcie_addr
|
|||||||
print_pcie_root_port
|
print_pcie_root_port
|
||||||
);
|
);
|
||||||
|
|
||||||
my $devices = {
|
my $pci_addr_map;
|
||||||
piix3 => { bus => 0, addr => 1 },
|
sub get_pci_addr_map {
|
||||||
ehci => { bus => 0, addr => 1 }, # instead of piix3 on arm
|
$pci_addr_map = {
|
||||||
vga => { bus => 0, addr => 2 },
|
piix3 => { bus => 0, addr => 1, conflict_ok => qw(ehci) },
|
||||||
balloon0 => { bus => 0, addr => 3 },
|
ehci => { bus => 0, addr => 1, conflict_ok => qw(piix3) }, # instead of piix3 on arm
|
||||||
watchdog => { bus => 0, addr => 4 },
|
vga => { bus => 0, addr => 2 },
|
||||||
scsihw0 => { bus => 0, addr => 5 },
|
balloon0 => { bus => 0, addr => 3 },
|
||||||
'pci.3' => { bus => 0, addr => 5 }, #can also be used for virtio-scsi-single bridge
|
watchdog => { bus => 0, addr => 4 },
|
||||||
scsihw1 => { bus => 0, addr => 6 },
|
scsihw0 => { bus => 0, addr => 5, conflict_ok => qw(pci.3) },
|
||||||
ahci0 => { bus => 0, addr => 7 },
|
'pci.3' => { bus => 0, addr => 5, conflict_ok => qw(scsihw0) }, # also used for virtio-scsi-single bridge
|
||||||
qga0 => { bus => 0, addr => 8 },
|
scsihw1 => { bus => 0, addr => 6 },
|
||||||
spice => { bus => 0, addr => 9 },
|
ahci0 => { bus => 0, addr => 7 },
|
||||||
virtio0 => { bus => 0, addr => 10 },
|
qga0 => { bus => 0, addr => 8 },
|
||||||
virtio1 => { bus => 0, addr => 11 },
|
spice => { bus => 0, addr => 9 },
|
||||||
virtio2 => { bus => 0, addr => 12 },
|
virtio0 => { bus => 0, addr => 10 },
|
||||||
virtio3 => { bus => 0, addr => 13 },
|
virtio1 => { bus => 0, addr => 11 },
|
||||||
virtio4 => { bus => 0, addr => 14 },
|
virtio2 => { bus => 0, addr => 12 },
|
||||||
virtio5 => { bus => 0, addr => 15 },
|
virtio3 => { bus => 0, addr => 13 },
|
||||||
hostpci0 => { bus => 0, addr => 16 },
|
virtio4 => { bus => 0, addr => 14 },
|
||||||
hostpci1 => { bus => 0, addr => 17 },
|
virtio5 => { bus => 0, addr => 15 },
|
||||||
net0 => { bus => 0, addr => 18 },
|
hostpci0 => { bus => 0, addr => 16 },
|
||||||
net1 => { bus => 0, addr => 19 },
|
hostpci1 => { bus => 0, addr => 17 },
|
||||||
net2 => { bus => 0, addr => 20 },
|
net0 => { bus => 0, addr => 18 },
|
||||||
net3 => { bus => 0, addr => 21 },
|
net1 => { bus => 0, addr => 19 },
|
||||||
net4 => { bus => 0, addr => 22 },
|
net2 => { bus => 0, addr => 20 },
|
||||||
net5 => { bus => 0, addr => 23 },
|
net3 => { bus => 0, addr => 21 },
|
||||||
vga1 => { bus => 0, addr => 24 },
|
net4 => { bus => 0, addr => 22 },
|
||||||
vga2 => { bus => 0, addr => 25 },
|
net5 => { bus => 0, addr => 23 },
|
||||||
vga3 => { bus => 0, addr => 26 },
|
vga1 => { bus => 0, addr => 24 },
|
||||||
hostpci2 => { bus => 0, addr => 27 },
|
vga2 => { bus => 0, addr => 25 },
|
||||||
hostpci3 => { bus => 0, addr => 28 },
|
vga3 => { bus => 0, addr => 26 },
|
||||||
#addr29 : usb-host (pve-usb.cfg)
|
hostpci2 => { bus => 0, addr => 27 },
|
||||||
'pci.1' => { bus => 0, addr => 30 },
|
hostpci3 => { bus => 0, addr => 28 },
|
||||||
'pci.2' => { bus => 0, addr => 31 },
|
#addr29 : usb-host (pve-usb.cfg)
|
||||||
'net6' => { bus => 1, addr => 1 },
|
'pci.1' => { bus => 0, addr => 30 },
|
||||||
'net7' => { bus => 1, addr => 2 },
|
'pci.2' => { bus => 0, addr => 31 },
|
||||||
'net8' => { bus => 1, addr => 3 },
|
'net6' => { bus => 1, addr => 1 },
|
||||||
'net9' => { bus => 1, addr => 4 },
|
'net7' => { bus => 1, addr => 2 },
|
||||||
'net10' => { bus => 1, addr => 5 },
|
'net8' => { bus => 1, addr => 3 },
|
||||||
'net11' => { bus => 1, addr => 6 },
|
'net9' => { bus => 1, addr => 4 },
|
||||||
'net12' => { bus => 1, addr => 7 },
|
'net10' => { bus => 1, addr => 5 },
|
||||||
'net13' => { bus => 1, addr => 8 },
|
'net11' => { bus => 1, addr => 6 },
|
||||||
'net14' => { bus => 1, addr => 9 },
|
'net12' => { bus => 1, addr => 7 },
|
||||||
'net15' => { bus => 1, addr => 10 },
|
'net13' => { bus => 1, addr => 8 },
|
||||||
'net16' => { bus => 1, addr => 11 },
|
'net14' => { bus => 1, addr => 9 },
|
||||||
'net17' => { bus => 1, addr => 12 },
|
'net15' => { bus => 1, addr => 10 },
|
||||||
'net18' => { bus => 1, addr => 13 },
|
'net16' => { bus => 1, addr => 11 },
|
||||||
'net19' => { bus => 1, addr => 14 },
|
'net17' => { bus => 1, addr => 12 },
|
||||||
'net20' => { bus => 1, addr => 15 },
|
'net18' => { bus => 1, addr => 13 },
|
||||||
'net21' => { bus => 1, addr => 16 },
|
'net19' => { bus => 1, addr => 14 },
|
||||||
'net22' => { bus => 1, addr => 17 },
|
'net20' => { bus => 1, addr => 15 },
|
||||||
'net23' => { bus => 1, addr => 18 },
|
'net21' => { bus => 1, addr => 16 },
|
||||||
'net24' => { bus => 1, addr => 19 },
|
'net22' => { bus => 1, addr => 17 },
|
||||||
'net25' => { bus => 1, addr => 20 },
|
'net23' => { bus => 1, addr => 18 },
|
||||||
'net26' => { bus => 1, addr => 21 },
|
'net24' => { bus => 1, addr => 19 },
|
||||||
'net27' => { bus => 1, addr => 22 },
|
'net25' => { bus => 1, addr => 20 },
|
||||||
'net28' => { bus => 1, addr => 23 },
|
'net26' => { bus => 1, addr => 21 },
|
||||||
'net29' => { bus => 1, addr => 24 },
|
'net27' => { bus => 1, addr => 22 },
|
||||||
'net30' => { bus => 1, addr => 25 },
|
'net28' => { bus => 1, addr => 23 },
|
||||||
'net31' => { bus => 1, addr => 26 },
|
'net29' => { bus => 1, addr => 24 },
|
||||||
'xhci' => { bus => 1, addr => 27 },
|
'net30' => { bus => 1, addr => 25 },
|
||||||
'virtio6' => { bus => 2, addr => 1 },
|
'net31' => { bus => 1, addr => 26 },
|
||||||
'virtio7' => { bus => 2, addr => 2 },
|
'xhci' => { bus => 1, addr => 27 },
|
||||||
'virtio8' => { bus => 2, addr => 3 },
|
'virtio6' => { bus => 2, addr => 1 },
|
||||||
'virtio9' => { bus => 2, addr => 4 },
|
'virtio7' => { bus => 2, addr => 2 },
|
||||||
'virtio10' => { bus => 2, addr => 5 },
|
'virtio8' => { bus => 2, addr => 3 },
|
||||||
'virtio11' => { bus => 2, addr => 6 },
|
'virtio9' => { bus => 2, addr => 4 },
|
||||||
'virtio12' => { bus => 2, addr => 7 },
|
'virtio10' => { bus => 2, addr => 5 },
|
||||||
'virtio13' => { bus => 2, addr => 8 },
|
'virtio11' => { bus => 2, addr => 6 },
|
||||||
'virtio14' => { bus => 2, addr => 9 },
|
'virtio12' => { bus => 2, addr => 7 },
|
||||||
'virtio15' => { bus => 2, addr => 10 },
|
'virtio13' => { bus => 2, addr => 8 },
|
||||||
'ivshmem' => { bus => 2, addr => 11 },
|
'virtio14' => { bus => 2, addr => 9 },
|
||||||
'audio0' => { bus => 2, addr => 12 },
|
'virtio15' => { bus => 2, addr => 10 },
|
||||||
hostpci4 => { bus => 2, addr => 13 },
|
'ivshmem' => { bus => 2, addr => 11 },
|
||||||
hostpci5 => { bus => 2, addr => 14 },
|
'audio0' => { bus => 2, addr => 12 },
|
||||||
hostpci6 => { bus => 2, addr => 15 },
|
hostpci4 => { bus => 2, addr => 13 },
|
||||||
hostpci7 => { bus => 2, addr => 16 },
|
hostpci5 => { bus => 2, addr => 14 },
|
||||||
hostpci8 => { bus => 2, addr => 17 },
|
hostpci6 => { bus => 2, addr => 15 },
|
||||||
hostpci9 => { bus => 2, addr => 18 },
|
hostpci7 => { bus => 2, addr => 16 },
|
||||||
hostpci10 => { bus => 2, addr => 19 },
|
hostpci8 => { bus => 2, addr => 17 },
|
||||||
hostpci11 => { bus => 2, addr => 20 },
|
hostpci9 => { bus => 2, addr => 18 },
|
||||||
hostpci12 => { bus => 2, addr => 21 },
|
hostpci10 => { bus => 2, addr => 19 },
|
||||||
hostpci13 => { bus => 2, addr => 22 },
|
hostpci11 => { bus => 2, addr => 20 },
|
||||||
hostpci14 => { bus => 2, addr => 23 },
|
hostpci12 => { bus => 2, addr => 21 },
|
||||||
hostpci15 => { bus => 2, addr => 24 },
|
hostpci13 => { bus => 2, addr => 22 },
|
||||||
'virtioscsi0' => { bus => 3, addr => 1 },
|
hostpci14 => { bus => 2, addr => 23 },
|
||||||
'virtioscsi1' => { bus => 3, addr => 2 },
|
hostpci15 => { bus => 2, addr => 24 },
|
||||||
'virtioscsi2' => { bus => 3, addr => 3 },
|
'virtioscsi0' => { bus => 3, addr => 1 },
|
||||||
'virtioscsi3' => { bus => 3, addr => 4 },
|
'virtioscsi1' => { bus => 3, addr => 2 },
|
||||||
'virtioscsi4' => { bus => 3, addr => 5 },
|
'virtioscsi2' => { bus => 3, addr => 3 },
|
||||||
'virtioscsi5' => { bus => 3, addr => 6 },
|
'virtioscsi3' => { bus => 3, addr => 4 },
|
||||||
'virtioscsi6' => { bus => 3, addr => 7 },
|
'virtioscsi4' => { bus => 3, addr => 5 },
|
||||||
'virtioscsi7' => { bus => 3, addr => 8 },
|
'virtioscsi5' => { bus => 3, addr => 6 },
|
||||||
'virtioscsi8' => { bus => 3, addr => 9 },
|
'virtioscsi6' => { bus => 3, addr => 7 },
|
||||||
'virtioscsi9' => { bus => 3, addr => 10 },
|
'virtioscsi7' => { bus => 3, addr => 8 },
|
||||||
'virtioscsi10' => { bus => 3, addr => 11 },
|
'virtioscsi8' => { bus => 3, addr => 9 },
|
||||||
'virtioscsi11' => { bus => 3, addr => 12 },
|
'virtioscsi9' => { bus => 3, addr => 10 },
|
||||||
'virtioscsi12' => { bus => 3, addr => 13 },
|
'virtioscsi10' => { bus => 3, addr => 11 },
|
||||||
'virtioscsi13' => { bus => 3, addr => 14 },
|
'virtioscsi11' => { bus => 3, addr => 12 },
|
||||||
'virtioscsi14' => { bus => 3, addr => 15 },
|
'virtioscsi12' => { bus => 3, addr => 13 },
|
||||||
'virtioscsi15' => { bus => 3, addr => 16 },
|
'virtioscsi13' => { bus => 3, addr => 14 },
|
||||||
'virtioscsi16' => { bus => 3, addr => 17 },
|
'virtioscsi14' => { bus => 3, addr => 15 },
|
||||||
'virtioscsi17' => { bus => 3, addr => 18 },
|
'virtioscsi15' => { bus => 3, addr => 16 },
|
||||||
'virtioscsi18' => { bus => 3, addr => 19 },
|
'virtioscsi16' => { bus => 3, addr => 17 },
|
||||||
'virtioscsi19' => { bus => 3, addr => 20 },
|
'virtioscsi17' => { bus => 3, addr => 18 },
|
||||||
'virtioscsi20' => { bus => 3, addr => 21 },
|
'virtioscsi18' => { bus => 3, addr => 19 },
|
||||||
'virtioscsi21' => { bus => 3, addr => 22 },
|
'virtioscsi19' => { bus => 3, addr => 20 },
|
||||||
'virtioscsi22' => { bus => 3, addr => 23 },
|
'virtioscsi20' => { bus => 3, addr => 21 },
|
||||||
'virtioscsi23' => { bus => 3, addr => 24 },
|
'virtioscsi21' => { bus => 3, addr => 22 },
|
||||||
'virtioscsi24' => { bus => 3, addr => 25 },
|
'virtioscsi22' => { bus => 3, addr => 23 },
|
||||||
'virtioscsi25' => { bus => 3, addr => 26 },
|
'virtioscsi23' => { bus => 3, addr => 24 },
|
||||||
'virtioscsi26' => { bus => 3, addr => 27 },
|
'virtioscsi24' => { bus => 3, addr => 25 },
|
||||||
'virtioscsi27' => { bus => 3, addr => 28 },
|
'virtioscsi25' => { bus => 3, addr => 26 },
|
||||||
'virtioscsi28' => { bus => 3, addr => 29 },
|
'virtioscsi26' => { bus => 3, addr => 27 },
|
||||||
'virtioscsi29' => { bus => 3, addr => 30 },
|
'virtioscsi27' => { bus => 3, addr => 28 },
|
||||||
'virtioscsi30' => { bus => 3, addr => 31 },
|
'virtioscsi28' => { bus => 3, addr => 29 },
|
||||||
|
'virtioscsi29' => { bus => 3, addr => 30 },
|
||||||
|
'virtioscsi30' => { bus => 3, addr => 31 },
|
||||||
|
} if !defined($pci_addr_map);
|
||||||
|
return $pci_addr_map;
|
||||||
|
}
|
||||||
|
|
||||||
|
my $get_addr_mapping_from_id = sub {
|
||||||
|
my ($map, $id) = @_;
|
||||||
|
|
||||||
|
my $d = $map->{$id};
|
||||||
|
return undef if !defined($d) || !defined($d->{bus}) || !defined($d->{addr});
|
||||||
|
|
||||||
|
return { bus => $d->{bus}, addr => sprintf("0x%x", $d->{addr}) };
|
||||||
};
|
};
|
||||||
|
|
||||||
sub print_pci_addr {
|
sub print_pci_addr {
|
||||||
@ -131,30 +144,25 @@ sub print_pci_addr {
|
|||||||
|
|
||||||
my $res = '';
|
my $res = '';
|
||||||
|
|
||||||
# We use the same bus slots on all hardware, so we need to check special
|
# using same bus slots on all HW, so we need to check special cases here:
|
||||||
# cases here:
|
|
||||||
my $busname = 'pci';
|
my $busname = 'pci';
|
||||||
if ($arch eq 'aarch64' && $machine =~ /^virt/) {
|
if ($arch eq 'aarch64' && $machine =~ /^virt/) {
|
||||||
die "aarch64/virt cannot use IDE devices\n"
|
die "aarch64/virt cannot use IDE devices\n" if $id =~ /^ide/;
|
||||||
if $id =~ /^ide/;
|
|
||||||
$busname = 'pcie';
|
$busname = 'pcie';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined($devices->{$id}->{bus}) && defined($devices->{$id}->{addr})) {
|
my $map = get_pci_addr_map();
|
||||||
my $addr = sprintf("0x%x", $devices->{$id}->{addr});
|
if (my $d = $get_addr_mapping_from_id->($map, $id)) {
|
||||||
my $bus = $devices->{$id}->{bus};
|
$res = ",bus=$busname.$d->{bus},addr=$d->{addr}";
|
||||||
$res = ",bus=$busname.$bus,addr=$addr";
|
$bridges->{$d->{bus}} = 1 if $bridges;
|
||||||
$bridges->{$bus} = 1 if $bridges;
|
|
||||||
}
|
}
|
||||||
return $res;
|
|
||||||
|
|
||||||
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub print_pcie_addr {
|
my $pcie_addr_map;
|
||||||
my ($id) = @_;
|
sub get_pcie_addr_map {
|
||||||
|
$pcie_addr_map = {
|
||||||
my $res = '';
|
|
||||||
my $devices = {
|
|
||||||
vga => { bus => 'pcie.0', addr => 1 },
|
vga => { bus => 'pcie.0', addr => 1 },
|
||||||
hostpci0 => { bus => "ich9-pcie-port-1", addr => 0 },
|
hostpci0 => { bus => "ich9-pcie-port-1", addr => 0 },
|
||||||
hostpci1 => { bus => "ich9-pcie-port-2", addr => 0 },
|
hostpci1 => { bus => "ich9-pcie-port-2", addr => 0 },
|
||||||
@ -190,15 +198,22 @@ sub print_pcie_addr {
|
|||||||
hostpci13bus0 => { bus => "pcie.0", addr => 22 },
|
hostpci13bus0 => { bus => "pcie.0", addr => 22 },
|
||||||
hostpci14bus0 => { bus => "pcie.0", addr => 23 },
|
hostpci14bus0 => { bus => "pcie.0", addr => 23 },
|
||||||
hostpci15bus0 => { bus => "pcie.0", addr => 24 },
|
hostpci15bus0 => { bus => "pcie.0", addr => 24 },
|
||||||
};
|
} if !defined($pcie_addr_map);
|
||||||
|
|
||||||
if (defined($devices->{$id}->{bus}) && defined($devices->{$id}->{addr})) {
|
return $pcie_addr_map;
|
||||||
my $addr = sprintf("0x%x", $devices->{$id}->{addr});
|
}
|
||||||
my $bus = $devices->{$id}->{bus};
|
|
||||||
$res = ",bus=$bus,addr=$addr";
|
sub print_pcie_addr {
|
||||||
|
my ($id) = @_;
|
||||||
|
|
||||||
|
my $res = '';
|
||||||
|
|
||||||
|
my $map = get_pcie_addr_map($id);
|
||||||
|
if (my $d = $get_addr_mapping_from_id->($map, $id)) {
|
||||||
|
$res = ",bus=$d->{bus},addr=$d->{addr}";
|
||||||
}
|
}
|
||||||
return $res;
|
|
||||||
|
|
||||||
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Generates the device strings for additional pcie root ports. The first 4 pcie
|
# Generates the device strings for additional pcie root ports. The first 4 pcie
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
all: test
|
all: test
|
||||||
|
|
||||||
test: test_snapshot test_ovf test_cfg_to_cmd
|
test: test_snapshot test_ovf test_cfg_to_cmd test_pci_addr_conflicts
|
||||||
|
|
||||||
test_snapshot: run_snapshot_tests.pl
|
test_snapshot: run_snapshot_tests.pl
|
||||||
./run_snapshot_tests.pl
|
./run_snapshot_tests.pl
|
||||||
@ -11,3 +11,6 @@ test_ovf: run_ovf_tests.pl
|
|||||||
|
|
||||||
test_cfg_to_cmd: run_config2command_tests.pl cfg2cmd/*.conf
|
test_cfg_to_cmd: run_config2command_tests.pl cfg2cmd/*.conf
|
||||||
perl -I../ ./run_config2command_tests.pl
|
perl -I../ ./run_config2command_tests.pl
|
||||||
|
|
||||||
|
test_pci_addr_conflicts: run_pci_addr_checks.pl
|
||||||
|
./run_pci_addr_checks.pl
|
||||||
|
|||||||
58
test/run_pci_addr_checks.pl
Executable file
58
test/run_pci_addr_checks.pl
Executable file
@ -0,0 +1,58 @@
|
|||||||
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use experimental 'smartmatch';
|
||||||
|
|
||||||
|
use lib qw(..);
|
||||||
|
|
||||||
|
use Test::More;
|
||||||
|
|
||||||
|
use PVE::QemuServer::PCI;
|
||||||
|
|
||||||
|
print "testing PCI(e) address conflicts\n";
|
||||||
|
|
||||||
|
# exec tests
|
||||||
|
|
||||||
|
#FIXME: make cross PCI <-> PCIe check sense at all??
|
||||||
|
my $addr_map = {};
|
||||||
|
my ($fail, $ignored) = (0, 0);
|
||||||
|
sub check_conflict {
|
||||||
|
my ($id, $what) = @_;
|
||||||
|
|
||||||
|
my ($bus, $addr) = $what->@{qw(bus addr)};
|
||||||
|
my $full_addr = "$bus:$addr";
|
||||||
|
|
||||||
|
if (defined(my $conflict = $addr_map->{$full_addr})) {
|
||||||
|
if (my @ignores = $what->{conflict_ok}) {
|
||||||
|
if ($conflict ~~ @ignores) {
|
||||||
|
note("OK: ignore conflict for '$full_addr' between '$id' and '$conflict'");
|
||||||
|
$ignored++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
note("ERR: conflict for '$full_addr' between '$id' and '$conflict'");
|
||||||
|
$fail++;
|
||||||
|
} else {
|
||||||
|
$addr_map->{$full_addr} = $id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
my $pci_map = PVE::QemuServer::PCI::get_pci_addr_map();
|
||||||
|
while (my ($id, $what) = each %$pci_map) {
|
||||||
|
check_conflict($id, $what);
|
||||||
|
}
|
||||||
|
|
||||||
|
my $pcie_map = PVE::QemuServer::PCI::get_pcie_addr_map();
|
||||||
|
while (my ($id, $what) = each %$pcie_map) {
|
||||||
|
check_conflict($id, $what);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($fail) {
|
||||||
|
fail("PCI(e) address conflict check, ignored: $ignored, conflicts: $fail");
|
||||||
|
} else {
|
||||||
|
pass("PCI(e) address conflict check, ignored: $ignored");
|
||||||
|
}
|
||||||
|
|
||||||
|
done_testing();
|
||||||
Loading…
Reference in New Issue
Block a user