Merge "Split PCI pools per PF"

Author: Zuul

nova/pci/stats.py

@@ -139,10 +139,19 @@ def _create_pool_keys_from_dev(
             return None
         tags = devspec.get_tags()
         pool = {k: getattr(dev, k) for k in self.pool_keys}
+
         if tags:
             pool.update(
                 {k: v for k, v in tags.items() if k not in self.ignored_tags}
             )
+        # NOTE(gibi): since PCI in placement maps a PCI dev or a PF to a
+        # single RP and the scheduler allocates from a specific RP we need
+        # to split the pools by PCI or PF address. We can still keep
+        # the VFs from the same parent PF in a single pool though as they
+        # are equivalent from placement perspective.
+        address = dev.parent_addr or dev.address
+        pool['address'] = address
+
         # NOTE(gibi): parent_ifname acts like a tag during pci claim but
         # not provided as part of the whitelist spec as it is auto detected
         # by the virt driver.

nova/tests/functional/libvirt/test_pci_sriov_servers.py

@@ -879,7 +879,7 @@ def test_live_migrate_server_with_neutron(self):
 
         # start two compute services with differing PCI device inventory
         source_pci_info = fakelibvirt.HostPCIDevicesInfo(
-            num_pfs=2, num_vfs=8, numa_node=0)
+            num_pfs=1, num_vfs=4, numa_node=0)
         # add an extra PF without VF to be used by direct-physical ports
         source_pci_info.add_device(
             dev_type='PF',
@@ -932,7 +932,7 @@ def test_live_migrate_server_with_neutron(self):
         # our source host should have marked two PCI devices as used, the VF
         # and the parent PF, while the future destination is currently unused
         self.assertEqual('test_compute0', server['OS-EXT-SRV-ATTR:host'])
-        self.assertPCIDeviceCounts('test_compute0', total=11, free=8)
+        self.assertPCIDeviceCounts('test_compute0', total=6, free=3)
         self.assertPCIDeviceCounts('test_compute1', total=4, free=4)
 
         # the instance should be on host NUMA node 0, since that's where our
@@ -956,7 +956,7 @@ def test_live_migrate_server_with_neutron(self):
                 # TODO(stephenfin): Stop relying on a side-effect of how nova
                 # chooses from multiple PCI devices (apparently the last
                 # matching one)
-                'pci_slot': '0000:81:01.4',
+                'pci_slot': '0000:81:00.4',
                 'physical_network': 'physnet4',
             },
             port['binding:profile'],
@@ -980,7 +980,7 @@ def test_live_migrate_server_with_neutron(self):
 
         # we should now have transitioned our usage to the destination, freeing
         # up the source in the process
-        self.assertPCIDeviceCounts('test_compute0', total=11, free=11)
+        self.assertPCIDeviceCounts('test_compute0', total=6, free=6)
         self.assertPCIDeviceCounts('test_compute1', total=4, free=1)
 
         # the instance should now be on host NUMA node 1, since that's where

nova/tests/unit/compute/test_resource_tracker.py

@@ -2401,7 +2401,10 @@ def test_claim_with_pci(self, migr_mock, pci_stats_mock,
                         vendor_id='0001',
                         product_id='0002',
                         numa_node=0,
-                        tags={'dev_type': 'type-PCI'},
+                        tags={
+                            'dev_type': 'type-PCI',
+                            'address': '0000:81:00.0'
+                        },
                         count=0
                     )
                 ]