hw/pci: SR-IOV related fixes and improvements
v13 cover hw/pci: SR-IOV related fixes and improvements
Supersedes: <[email protected]> ("[PATCH v2 0/4] hw/pci: Convert rom_bar into OnOffAuto")
I submitted a RFC series[1] to add support for SR-IOV emulation to virtio-net-pci. During the development of the series, I fixed some trivial bugs and made improvements that I think are independently useful. This series extracts those fixes and improvements from the RFC series.
[1]: https://patchew.org/QEMU/[email protected]/
---
Changes in v13:
- Added patch "s390x/pci: Check for multifunction after device realization". I found SR-IOV devices, which are multifunction devices, are not supposed to work at all with s390x on QEMU.
- Link to v12: https://lore.kernel.org/r/[email protected]
Changes in v12:
- Changed to ignore invalid PCI_SRIOV_NUM_VF writes as done for PCI_SRIOV_CTRL_VFE.
- Updated the message for patch "hw/pci: Use -1 as the default value for rombar". (Markus Armbruster)
- Link to v11: https://lore.kernel.org/r/[email protected]
Changes in v11:
- Rebased.
- Dropped patch "hw/pci: Convert rom_bar into OnOffAuto".
- Added patch "hw/pci: Use -1 as the default value for rombar".
- Added for-9.2 to give a testing period for possible breakage with libvirt/s390x.
- Link to v10: https://lore.kernel.org/r/[email protected]
Changes in v10:
- Added patch "hw/ppc/spapr_pci: Do not reject VFs created after a PF".
- Added patch "hw/ppc/spapr_pci: Do not create DT for disabled PCI device".
- Added patch "hw/pci: Convert rom_bar into OnOffAuto".
- Dropped patch "hw/pci: Determine if rombar is explicitly enabled".
- Dropped patch "hw/qdev: Remove opts member".
- Link to v9: https://lore.kernel.org/r/[email protected]
Changes in v9:
- Rebased.
- Restored '#include "qapi/error.h"' (Michael S. Tsirkin)
- Added patch "pcie_sriov: Ensure VF function number does not overflow" to fix abortion with wrong PF addr.
- Link to v8: https://lore.kernel.org/r/[email protected]
Changes in v8:
- Clarified that "hw/pci: Replace -1 with UINT32_MAX for romsize" is not a bug fix. (Markus Armbruster)
- Squashed patch "vfio: Avoid inspecting option QDict for rombar" into "hw/pci: Determine if rombar is explicitly enabled".
(Markus Armbruster)
- Noted the minor semantics change for patch "hw/pci: Determine if rombar is explicitly enabled". (Markus Armbruster)
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Replaced -1 with UINT32_MAX when expressing uint32_t.
(Markus Armbruster)
- Added patch "hw/pci: Replace -1 with UINT32_MAX for romsize".
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- Fixed migration.
- Added patch "pcie_sriov: Do not manually unrealize".
- Restored patch "pcie_sriov: Release VFs failed to realize" that was missed in v5.
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Added patch "hw/pci: Always call pcie_sriov_pf_reset()".
- Added patch "pcie_sriov: Reset SR-IOV extended capability".
- Removed a reference to PCI_SRIOV_CTRL_VFE in hw/nvme.
(Michael S. Tsirkin)
- Noted the impact on the guest of patch "pcie_sriov: Do not reset NumVFs after unregistering VFs". (Michael S. Tsirkin)
- Changed to use pcie_sriov_num_vfs().
- Restored pci_set_power() and changed it to call pci_set_enabled() only for PFs with an expalanation. (Michael S. Tsirkin)
- Reordered patches.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Reverted the change to pci_rom_bar_explicitly_enabled().
(Michael S. Tsirkin)
- Added patch "pcie_sriov: Do not reset NumVFs after unregistering VFs".
- Added patch "hw/nvme: Refer to dev->exp.sriov_pf.num_vfs".
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Extracted patch "hw/pci: Use -1 as a default value for rombar" from patch "hw/pci: Determine if rombar is explicitly enabled"
(Philippe Mathieu-Daudé)
- Added an audit result of PCIDevice::rom_bar to the message of patch "hw/pci: Use -1 as a default value for rombar"
(Philippe Mathieu-Daudé)
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Reset after enabling a function so that NVMe VF state gets updated.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Akihiko Odaki (12):
hw/pci: Rename has_power to enabled hw/ppc/spapr_pci: Do not create DT for disabled PCI device hw/ppc/spapr_pci: Do not reject VFs created after a PF s390x/pci: Check for multifunction after device realization
pcie_sriov: Do not manually unrealize
pcie_sriov: Ensure VF function number does not overflow
pcie_sriov: Reuse SR-IOV VF device instances
pcie_sriov: Release VFs failed to realize
pcie_sriov: Remove num_vfs from PCIESriovPF
pcie_sriov: Register VFs after migration
hw/pci: Use -1 as the default value for rombar hw/qdev: Remove opts member
docs/pcie_sriov.txt | 8 ++- include/hw/pci/pci.h | 2 +- include/hw/pci/pci_device.h | 19 ++++- include/hw/pci/pcie_sriov.h | 9 +-- include/hw/qdev-core.h | 4 -- hw/core/qdev.c | 1 - hw/net/igb.c | 13 +++- hw/nvme/ctrl.c | 24 ++++--- hw/pci/pci.c | 23 +++--- hw/pci/pci_host.c | 4 +- hw/pci/pcie_sriov.c | 165 +++++++++++++++++++++++++------------------- hw/ppc/spapr_pci.c | 8 ++- hw/s390x/s390-pci-bus.c | 14 ++-- hw/vfio/pci.c | 5 +- system/qdev-monitor.c | 12 ++-- hw/pci/trace-events | 2 +- 16 files changed, 187 insertions(+), 126 deletions(-)
---
base-commit: 31669121a01a14732f57c49400bc239cf9fd505f
change-id: 20240129-reuse-faae22b11934
Best regards,
Signature · 1 line
Akihiko Odaki <[email protected]>
PATCH v13 1/12 hw/pci: Rename has_power to enabled
The renamed state will not only represent powering state of PFs, but also represent SR-IOV VF enablement in the future.
--- include/hw/pci/pci.h | 7 ++++++- include/hw/pci/pci_device.h | 2 +- hw/pci/pci.c | 14 +++++++------- hw/pci/pci_host.c | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-)
include/hw/pci/pci.h +6 -1
@@ -678,6 +678,11 @@ static inline void pci_irq_pulse(PCIDevice *pci_dev) }MSIMessage pci_get_msi_message (PCIDevice *dev,int vector); -void pci_set_power (PCIDevice *pci_dev,bool state); +void pci_set_enabled (PCIDevice *pci_dev,bool state); + +static inline void pci_set_power (PCIDevice *pci_dev,bool state) +{ +pci_set_enabled (pci_dev, state); +}#endif
include/hw/pci/pci_device.h +1 -1
@@ -57,7 +57,7 @@ typedef struct PCIReqIDCache PCIReqIDCache;struct PCIDevice {DeviceState qdev;bool partially_hotplugged; -bool has_power; +bool enabled;/* PCI config space */ uint8_t *config;
hw/pci/pci.c +7 -7
@@ -1525,7 +1525,7 @@ static void pci_update_mappings(PCIDevice *d)continue ; new_addr =pci_bar_address (d, i, r->type, r->size); -if (!d->has_power) { +if (!d->enabled) { new_addr =PCI_BAR_UNMAPPED ; }
@@ -1613,7 +1613,7 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, intpci_update_irq_disabled (d, was_irq_disabled);memory_region_set_enabled (&d->bus_master_enable_region, (pci_get_word (d->config +PCI_COMMAND ) - &PCI_COMMAND_MASTER ) && d->has_power); + &PCI_COMMAND_MASTER ) && d->enabled); }msi_write_config (d, addr, val_in, l);
@@ -2884,18 +2884,18 @@ MSIMessage pci_get_msi_message(PCIDevice *dev, int vector)return msg; } -void pci_set_power (PCIDevice *d,bool state) +void pci_set_enabled (PCIDevice *d,bool state) { -if (d->has_power == state) { +if (d->enabled == state) {return ; } - d->has_power = state; + d->enabled = state;pci_update_mappings (d);memory_region_set_enabled (&d->bus_master_enable_region, (pci_get_word (d->config +PCI_COMMAND ) - &PCI_COMMAND_MASTER ) && d->has_power); -if (!d->has_power) { + &PCI_COMMAND_MASTER ) && d->enabled); +if (!d->enabled) {pci_device_reset (d); } }
hw/pci/pci_host.c +2 -2
@@ -86,7 +86,7 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,* allowing direct removal of unexposed functions. */ if ((pci_dev->qdev.hotplugged && !pci_get_function_0 (pci_dev)) || - !pci_dev->has_power ||is_pci_dev_ejected (pci_dev)) { + !pci_dev->enabled ||is_pci_dev_ejected (pci_dev)) {return ; }
@@ -111,7 +111,7 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr,* allowing direct removal of unexposed functions. */ if ((pci_dev->qdev.hotplugged && !pci_get_function_0 (pci_dev)) || - !pci_dev->has_power ||is_pci_dev_ejected (pci_dev)) { + !pci_dev->enabled ||is_pci_dev_ejected (pci_dev)) {return ~0x0 ; }
Signature · 1 line
2.45.2
PATCH v13 2/12 hw/ppc/spapr_pci: Do not create DT for disabled PCI device
In reply to Akihiko OdakiDisabled means it is a disabled SR-IOV VF or it is powered off, and hidden from the guest.
--- hw/ppc/spapr_pci.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/ppc/spapr_pci.c +4 -0
@@ -1296,6 +1296,10 @@ static void spapr_dt_pci_device_cb(PCIBus *bus, PCIDevice *pdev,return ; } +if (!pdev->enabled) { +return ; + } + err =spapr_dt_pci_device (p->sphb, pdev, p->fdt, p->offset);if (err <0 ) { p->err = err;
Signature · 1 line
2.45.2
PATCH v13 3/12 hw/ppc/spapr_pci: Do not reject VFs created after a PF
In reply to Akihiko OdakiA PF may automatically create VFs and the PF may be function 0.
--- hw/ppc/spapr_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/ppc/spapr_pci.c +3 -1
@@ -1573,7 +1573,9 @@ static void spapr_pci_pre_plug(HotplugHandler *plug_handler,* hotplug, we do not allow functions to be hotplugged to a * slot that already has function 0 present */ -if (plugged_dev->hotplugged && bus->devices[PCI_DEVFN (slotnr,0 )] && +if (plugged_dev->hotplugged && + !pci_is_vf (pdev) && + bus->devices[PCI_DEVFN (slotnr,0 )] &&PCI_FUNC (pdev->devfn) !=0 ) { error_setg(errp, "PCI: slot %d function 0 already occupied by %s," " additional functions can no longer be exposed to guest.",
Signature · 1 line
2.45.2
PATCH v13 4/12 s390x/pci: Check for multifunction after device realization
In reply to Akihiko OdakiThe SR-IOV PFs set the multifunction bits during device realization so check them after that. This forbids adding SR-IOV devices to s390x.
--- hw/s390x/s390-pci-bus.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
hw/s390x/s390-pci-bus.c +6 -8
@@ -971,14 +971,7 @@ static void s390_pcihost_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, "this device"); } -if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { -PCIDevice *pdev =PCI_DEVICE (dev); - -if (pdev->cap_present &QEMU_PCI_CAP_MULTIFUNCTION ) { -error_setg (errp,"multifunction not supported in s390" ); -return ; - } - }else if (object_dynamic_cast (OBJECT (dev),TYPE_S390_PCI_DEVICE )) { +if (object_dynamic_cast (OBJECT (dev),TYPE_S390_PCI_DEVICE )) {S390PCIBusDevice *pbdev =S390_PCI_DEVICE (dev);if (!s390_pci_alloc_idx (s, pbdev)) {
@@ -1069,6 +1062,11 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, }else if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { pdev =PCI_DEVICE (dev); +if (pdev->cap_present &QEMU_PCI_CAP_MULTIFUNCTION ) { +error_setg (errp,"multifunction not supported in s390" ); +return ; + } +if (!dev->id) {/* In the case the PCI device does not define an id */ /* we generate one based on the PCI address */
Signature · 1 line
2.45.2
PATCH v13 5/12 pcie_sriov: Do not manually unrealize
In reply to Akihiko OdakiA device gets automatically unrealized when being unparented.
--- hw/pci/pcie_sriov.c | 4 ---- 1 file changed, 4 deletions(-)
hw/pci/pcie_sriov.c +0 -4
@@ -204,11 +204,7 @@ static void unregister_vfs(PCIDevice *dev)trace_sriov_unregister_vfs (dev->name,PCI_SLOT (dev->devfn),PCI_FUNC (dev->devfn), num_vfs);for (i =0 ; i < num_vfs; i++) { -Error *err =NULL ;PCIDevice *vf = dev->exp.sriov_pf.vf[i]; -if (!object_property_set_bool (OBJECT (vf),"realized" , false, &err)) { -error_reportf_err (err,"Failed to unplug: " ); - }object_unparent (OBJECT (vf));object_unref (OBJECT (vf)); }
Signature · 1 line
2.45.2
PATCH v13 6/12 pcie_sriov: Ensure VF function number does not overflow
In reply to Akihiko Odakipci_new() aborts when creating a VF with a function number equals to or is greater than PCI_DEVFN_MAX.
--- docs/pcie_sriov.txt | 8 +++++--- include/hw/pci/pcie_sriov.h | 5 +++-- hw/net/igb.c | 13 ++++++++++--- hw/nvme/ctrl.c | 24 ++++++++++++++++-------- hw/pci/pcie_sriov.c | 19 +++++++++++++++++-- 5 files changed, 51 insertions(+), 18 deletions(-)
docs/pcie_sriov.txt +5 -3
@@ -52,9 +52,11 @@ setting up a BAR for a VF. ... /* Add and initialize the SR/IOV capability */ - pcie_sriov_pf_init(d, 0x200, "your_virtual_dev", - vf_devid, initial_vfs, total_vfs, - fun_offset, stride); + if (!pcie_sriov_pf_init(d, 0x200, "your_virtual_dev", + vf_devid, initial_vfs, total_vfs, + fun_offset, stride, errp)) { + return; + } /* Set up individual VF BARs (parameters as for normal BARs) */ pcie_sriov_pf_init_vf_bar( ... )
include/hw/pci/pcie_sriov.h +3 -2
@@ -27,10 +27,11 @@ typedef struct PCIESriovVF {uint16_t vf_number;/* Logical VF number of this function */ } PCIESriovVF; -void pcie_sriov_pf_init (PCIDevice *dev,uint16_t offset, +bool pcie_sriov_pf_init (PCIDevice *dev,uint16_t offset,const char *vfname,uint16_t vf_dev_id,uint16_t init_vfs,uint16_t total_vfs, -uint16_t vf_offset,uint16_t vf_stride); +uint16_t vf_offset,uint16_t vf_stride, +Error **errp);void pcie_sriov_pf_exit (PCIDevice *dev);/* Set up a VF bar in the SR/IOV bar area */
hw/net/igb.c +10 -3
@@ -446,9 +446,16 @@ static void igb_pci_realize(PCIDevice *pci_dev, Error **errp)pcie_ari_init (pci_dev,0x150 ); -pcie_sriov_pf_init (pci_dev,IGB_CAP_SRIOV_OFFSET ,TYPE_IGBVF , -IGB_82576_VF_DEV_ID ,IGB_MAX_VF_FUNCTIONS ,IGB_MAX_VF_FUNCTIONS , -IGB_VF_OFFSET ,IGB_VF_STRIDE ); +if (!pcie_sriov_pf_init (pci_dev,IGB_CAP_SRIOV_OFFSET , +TYPE_IGBVF ,IGB_82576_VF_DEV_ID , +IGB_MAX_VF_FUNCTIONS ,IGB_MAX_VF_FUNCTIONS , +IGB_VF_OFFSET ,IGB_VF_STRIDE , + errp)) { +pcie_cap_exit (pci_dev); +igb_cleanup_msix (s); +msi_uninit (pci_dev); +return ; + } pcie_sriov_pf_init_vf_bar(pci_dev, IGBVF_MMIO_BAR_IDX, PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH,
hw/nvme/ctrl.c +16 -8
@@ -8271,7 +8271,8 @@ out:return pow2ceil (bar_size); } -static void nvme_init_sriov (NvmeCtrl *n,PCIDevice *pci_dev,uint16_t offset) +static bool nvme_init_sriov (NvmeCtrl *n,PCIDevice *pci_dev,uint16_t offset, +Error **errp) {uint16_t vf_dev_id = n->params.use_intel_id ?PCI_DEVICE_ID_INTEL_NVME :PCI_DEVICE_ID_REDHAT_NVME ;
@@ -8280,12 +8281,17 @@ static void nvme_init_sriov(NvmeCtrl *n, PCIDevice *pci_dev, uint16_t offset)le16_to_cpu (cap->vifrsm), NULL, NULL); -pcie_sriov_pf_init (pci_dev, offset,"nvme" , vf_dev_id, - n->params.sriov_max_vfs, n->params.sriov_max_vfs, -NVME_VF_OFFSET ,NVME_VF_STRIDE ); +if (!pcie_sriov_pf_init (pci_dev, offset,"nvme" , vf_dev_id, + n->params.sriov_max_vfs, n->params.sriov_max_vfs, +NVME_VF_OFFSET ,NVME_VF_STRIDE , + errp)) { +return false; + }pcie_sriov_pf_init_vf_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , bar_size); + +return true; }static int nvme_add_pm_capability (PCIDevice *pci_dev,uint8_t offset)
@@ -8410,6 +8416,12 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)return false; } +if (!pci_is_vf (pci_dev) && n->params.sriov_max_vfs && + !nvme_init_sriov (n, pci_dev,0x120 , errp)) { +msix_uninit (pci_dev, &n->bar0, &n->bar0); +return false; + } +nvme_update_msixcap_ts (pci_dev, n->conf_msix_qsize);pcie_cap_deverr_init (pci_dev);
@@ -8439,10 +8451,6 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)nvme_init_pmr (n, pci_dev); } -if (!pci_is_vf (pci_dev) && n->params.sriov_max_vfs) { -nvme_init_sriov (n, pci_dev,0x120 ); - } -return true; }
hw/pci/pcie_sriov.c +17 -2
@@ -24,14 +24,27 @@ static PCIDevice *register_vf(PCIDevice *pf, int devfn, const char *name, uint16_t vf_num);static void unregister_vfs (PCIDevice *dev); -void pcie_sriov_pf_init (PCIDevice *dev,uint16_t offset, +bool pcie_sriov_pf_init (PCIDevice *dev,uint16_t offset,const char *vfname,uint16_t vf_dev_id,uint16_t init_vfs,uint16_t total_vfs, -uint16_t vf_offset,uint16_t vf_stride) +uint16_t vf_offset,uint16_t vf_stride, +Error **errp) {uint8_t *cfg = dev->config + offset;uint8_t *wmask; +if (total_vfs) { +uint16_t ari_cap =pcie_find_capability (dev,PCI_EXT_CAP_ID_ARI ); +uint16_t first_vf_devfn = dev->devfn + vf_offset; +uint16_t last_vf_devfn = first_vf_devfn + vf_stride * (total_vfs -1 ); + +if ((!ari_cap &&PCI_SLOT (dev->devfn) !=PCI_SLOT (last_vf_devfn)) || + last_vf_devfn >=PCI_DEVFN_MAX ) { +error_setg (errp,"VF function number overflows" ); +return false; + } + } +pcie_add_capability (dev,PCI_EXT_CAP_ID_SRIOV ,1 , offset,PCI_EXT_CAP_SRIOV_SIZEOF ); dev->exp.sriov_cap = offset;
@@ -69,6 +82,8 @@ void pcie_sriov_pf_init(PCIDevice *dev, uint16_t offset,pci_set_word (wmask +PCI_SRIOV_SYS_PGSIZE ,0x553 );qdev_prop_set_bit (&dev->qdev,"multifunction" , true); + +return true; }void pcie_sriov_pf_exit (PCIDevice *dev)
Signature · 1 line
2.45.2
PATCH v13 7/12 pcie_sriov: Reuse SR-IOV VF device instances
In reply to Akihiko OdakiDisable SR-IOV VF devices by reusing code to power down PCI devices instead of removing them when the guest requests to disable VFs. This allows to realize devices and report VF realization errors at PF realization time.
--- include/hw/pci/pci.h | 5 --- include/hw/pci/pci_device.h | 15 +++++++ include/hw/pci/pcie_sriov.h | 1 - hw/pci/pci.c | 2 +- hw/pci/pcie_sriov.c | 95 +++++++++++++++++++-------------------------- 5 files changed, 56 insertions(+), 62 deletions(-)
include/hw/pci/pci.h +0 -5
@@ -680,9 +680,4 @@ static inline void pci_irq_pulse(PCIDevice *pci_dev)MSIMessage pci_get_msi_message (PCIDevice *dev,int vector);void pci_set_enabled (PCIDevice *pci_dev,bool state); -static inline void pci_set_power (PCIDevice *pci_dev,bool state) -{ -pci_set_enabled (pci_dev, state); -} -#endif
include/hw/pci/pci_device.h +15 -0
@@ -212,6 +212,21 @@ static inline uint16_t pci_get_bdf(PCIDevice *dev)return PCI_BUILD_BDF (pci_bus_num (pci_get_bus (dev)), dev->devfn); } +static inline void pci_set_power (PCIDevice *pci_dev,bool state) +{ +/* +* Don't change the enabled state of VFs when powering on/off the device. +* +* When powering on, VFs must not be enabled immediately but they must +* wait until the guest configures SR-IOV. +* When powering off, their corresponding PFs will be reset and disable +* VFs. +*/ +if (!pci_is_vf (pci_dev)) { +pci_set_enabled (pci_dev, state); + } +} +uint16_t pci_requester_id (PCIDevice *dev);/* DMA access functions */
include/hw/pci/pcie_sriov.h +0 -1
@@ -18,7 +18,6 @@typedef struct PCIESriovPF {uint16_t num_vfs;/* Number of virtual functions created */ uint8_t vf_bar_type[PCI_NUM_REGIONS ];/* Store type for each VF bar */ -const char *vfname;/* Reference to the device type used for the VFs */ PCIDevice **vf;/* Pointer to an array of num_vfs VF devices */ }PCIESriovPF ;
hw/pci/pci.c +1 -1
@@ -2895,7 +2895,7 @@ void pci_set_enabled(PCIDevice *d, bool state)memory_region_set_enabled (&d->bus_master_enable_region, (pci_get_word (d->config +PCI_COMMAND ) &PCI_COMMAND_MASTER ) && d->enabled); -if (!d->enabled) { +if (d->qdev.realized) {pci_device_reset (d); } }
hw/pci/pcie_sriov.c +40 -55
158 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v13 8/12 pcie_sriov: Release VFs failed to realize
In reply to Akihiko OdakiRelease VFs failed to realize just as we do in unregister_vfs().
--- hw/pci/pcie_sriov.c | 2 ++ 1 file changed, 2 insertions(+)
hw/pci/pcie_sriov.c +2 -0
@@ -99,6 +99,8 @@ bool pcie_sriov_pf_init(PCIDevice *dev, uint16_t offset, vf->exp.sriov_vf.vf_number = i;if (!qdev_realize (&vf->qdev, bus, errp)) { +object_unparent (OBJECT (vf)); +object_unref (vf);unparent_vfs (dev, i);return false; }
Signature · 1 line
2.45.2
PATCH v13 9/12 pcie_sriov: Remove num_vfs from PCIESriovPF
In reply to Akihiko Odakinum_vfs is not migrated so use PCI_SRIOV_CTRL_VFE and PCI_SRIOV_NUM_VF instead.
--- include/hw/pci/pcie_sriov.h | 1 - hw/pci/pcie_sriov.c | 38 +++++++++++++++++++++++++++----------- hw/pci/trace-events | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-)
include/hw/pci/pcie_sriov.h +0 -1
@@ -16,7 +16,6 @@#include "hw/pci/pci.h" typedef struct PCIESriovPF { -uint16_t num_vfs;/* Number of virtual functions created */ uint8_t vf_bar_type[PCI_NUM_REGIONS ];/* Store type for each VF bar */ PCIDevice **vf;/* Pointer to an array of num_vfs VF devices */ }PCIESriovPF ;
hw/pci/pcie_sriov.c +27 -11
@@ -57,7 +57,6 @@ bool pcie_sriov_pf_init(PCIDevice *dev, uint16_t offset,pcie_add_capability (dev,PCI_EXT_CAP_ID_SRIOV ,1 , offset,PCI_EXT_CAP_SRIOV_SIZEOF ); dev->exp.sriov_cap = offset; - dev->exp.sriov_pf.num_vfs =0 ; dev->exp.sriov_pf.vf =NULL ;pci_set_word (cfg +PCI_SRIOV_VF_OFFSET , vf_offset);
@@ -194,29 +193,28 @@ static void register_vfs(PCIDevice *dev)assert (sriov_cap >0 ); num_vfs =pci_get_word (dev->config + sriov_cap +PCI_SRIOV_NUM_VF ); -if (num_vfs >pci_get_word (dev->config + sriov_cap +PCI_SRIOV_TOTAL_VF )) { -return ; - }trace_sriov_register_vfs (dev->name,PCI_SLOT (dev->devfn),PCI_FUNC (dev->devfn), num_vfs);for (i =0 ; i < num_vfs; i++) {pci_set_enabled (dev->exp.sriov_pf.vf[i], true); } - dev->exp.sriov_pf.num_vfs = num_vfs; + +pci_set_word (dev->wmask + sriov_cap +PCI_SRIOV_NUM_VF ,0 ); }static void unregister_vfs (PCIDevice *dev) { -uint16_t num_vfs = dev->exp.sriov_pf.num_vfs; +uint8_t *cfg = dev->config + dev->exp.sriov_cap;uint16_t i;trace_sriov_unregister_vfs (dev->name,PCI_SLOT (dev->devfn), -PCI_FUNC (dev->devfn), num_vfs); -for (i =0 ; i < num_vfs; i++) { +PCI_FUNC (dev->devfn)); +for (i =0 ; i <pci_get_word (cfg +PCI_SRIOV_TOTAL_VF ); i++) {pci_set_enabled (dev->exp.sriov_pf.vf[i], false); } - dev->exp.sriov_pf.num_vfs =0 ; + +pci_set_word (dev->wmask + dev->exp.sriov_cap +PCI_SRIOV_NUM_VF ,0xffff ); } void pcie_sriov_config_write(PCIDevice *dev, uint32_t address,
@@ -242,6 +240,17 @@ void pcie_sriov_config_write(PCIDevice *dev, uint32_t address, }else {unregister_vfs (dev); } + }else if (range_covers_byte (off, len,PCI_SRIOV_NUM_VF )) { +uint8_t *cfg = dev->config + sriov_cap; +uint8_t *wmask = dev->wmask + sriov_cap; +uint16_t num_vfs =pci_get_word (cfg +PCI_SRIOV_NUM_VF ); +uint16_t val =PCI_SRIOV_CTRL_MSE |PCI_SRIOV_CTRL_ARI ; + +if (num_vfs <=pci_get_word (cfg +PCI_SRIOV_TOTAL_VF )) { + val |=PCI_SRIOV_CTRL_VFE ; + } + +pci_set_word (wmask +PCI_SRIOV_CTRL , val); } }
@@ -258,6 +267,8 @@ void pcie_sriov_pf_reset(PCIDevice *dev)unregister_vfs (dev);pci_set_word (dev->config + sriov_cap +PCI_SRIOV_NUM_VF ,0 ); +pci_set_word (dev->wmask + sriov_cap +PCI_SRIOV_CTRL , +PCI_SRIOV_CTRL_VFE |PCI_SRIOV_CTRL_MSE |PCI_SRIOV_CTRL_ARI );/* * Default is to use 4K pages, software can modify it
@@ -304,7 +315,7 @@ PCIDevice *pcie_sriov_get_pf(PCIDevice *dev)PCIDevice *pcie_sriov_get_vf_at_index (PCIDevice *dev,int n) {assert (!pci_is_vf (dev)); -if (n < dev->exp.sriov_pf.num_vfs) { +if (n <pcie_sriov_num_vfs (dev)) {return dev->exp.sriov_pf.vf[n]; }return NULL ;
@@ -312,5 +323,10 @@ PCIDevice *pcie_sriov_get_vf_at_index(PCIDevice *dev, int n)uint16_t pcie_sriov_num_vfs (PCIDevice *dev) { -return dev->exp.sriov_pf.num_vfs; +uint16_t sriov_cap = dev->exp.sriov_cap; +uint8_t *cfg = dev->config + sriov_cap; + +return sriov_cap && + (pci_get_word (cfg +PCI_SRIOV_CTRL ) &PCI_SRIOV_CTRL_VFE ) ? +pci_get_word (cfg +PCI_SRIOV_NUM_VF ) :0 ; }
hw/pci/trace-events +1 -1
@@ -14,7 +14,7 @@ msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d mask # hw/pci/pcie_sriov.c sriov_register_vfs(const char *name, int slot, int function, int num_vfs) "%s %02x:%x: creating %d vf devs" -sriov_unregister_vfs(const char *name, int slot, int function, int num_vfs) "%s %02x:%x: Unregistering %d vf devs" +sriov_unregister_vfs(const char *name, int slot, int function) "%s %02x:%x: Unregistering vf devs" sriov_config_write(const char *name, int slot, int fun, uint32_t offset, uint32_t val, uint32_t len) "%s %02x:%x: sriov offset 0x%x val 0x%x len %d" # pcie.c
Signature · 1 line
2.45.2
PATCH v13 10/12 pcie_sriov: Register VFs after migration
In reply to Akihiko Odakipcie_sriov doesn't have code to restore its state after migration, but igb, which uses pcie_sriov, naively claimed its migration capability.
Add code to register VFs after migration and fix igb migration.
--- include/hw/pci/pcie_sriov.h | 2 ++ hw/pci/pci.c | 7 +++++++ hw/pci/pcie_sriov.c | 7 +++++++ 3 files changed, 16 insertions(+)
include/hw/pci/pcie_sriov.h +2 -0
@@ -57,6 +57,8 @@ void pcie_sriov_pf_add_sup_pgsize(PCIDevice *dev, uint16_t opt_sup_pgsize);void pcie_sriov_config_write (PCIDevice *dev,uint32_t address,uint32_t val,int len); +void pcie_sriov_pf_post_load (PCIDevice *dev); +/* Reset SR/IOV */ void pcie_sriov_pf_reset (PCIDevice *dev);
hw/pci/pci.c +7 -0
@@ -733,10 +733,17 @@ static bool migrate_is_not_pcie(void *opaque, int version_id)return !pci_is_express ((PCIDevice *)opaque); } +static int pci_post_load (void *opaque,int version_id) +{ +pcie_sriov_pf_post_load (opaque); +return 0 ; +} +const VMStateDescription vmstate_pci_device = { .name ="PCIDevice" , .version_id =2 , .minimum_version_id =1 , + .post_load = pci_post_load, .fields = (const VMStateField []) {VMSTATE_INT32_POSITIVE_LE (version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO_TEST(config, PCIDevice,
hw/pci/pcie_sriov.c +7 -0
@@ -254,6 +254,13 @@ void pcie_sriov_config_write(PCIDevice *dev, uint32_t address, } } +void pcie_sriov_pf_post_load (PCIDevice *dev) +{ +if (dev->exp.sriov_cap) { +register_vfs (dev); + } +} +/* Reset SR/IOV */ void pcie_sriov_pf_reset (PCIDevice *dev)
Signature · 1 line
2.45.2
PATCH v13 11/12 hw/pci: Use -1 as the default value for rombar
In reply to Akihiko Odakivfio_pci_size_rom() distinguishes whether rombar is explicitly set to 1 by checking dev->opts, bypassing the QOM property infrastructure.
Use -1 as the default value for rombar to tell if the user explicitly set it to 1. The property is also converted from unsigned to signed. -1 is signed so it is safe to give it a new meaning. The values in [2 ^ 31, 2 ^ 32) become invalid, but nobody should have typed these values by chance.
--- include/hw/pci/pci_device.h | 2 +- hw/pci/pci.c | 2 +- hw/vfio/pci.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-)
include/hw/pci/pci_device.h +1 -1
@@ -148,7 +148,7 @@ struct PCIDevice {uint32_t romsize;bool has_rom;MemoryRegion rom; -uint32_t rom_bar; +int32_t rom_bar;/* INTx routing notifier */ PCIINTxRoutingNotifier intx_routing_notifier;
hw/pci/pci.c +1 -1
@@ -71,7 +71,7 @@ static Property pci_props[] = {DEFINE_PROP_PCI_DEVFN ("addr" , PCIDevice, devfn,-1 ),DEFINE_PROP_STRING ("romfile" , PCIDevice, romfile),DEFINE_PROP_UINT32 ("romsize" , PCIDevice, romsize,UINT32_MAX ), -DEFINE_PROP_UINT32 ("rombar" , PCIDevice, rom_bar,1 ), +DEFINE_PROP_INT32 ("rombar" , PCIDevice, rom_bar,-1 ),DEFINE_PROP_BIT ("multifunction" , PCIDevice, cap_present,QEMU_PCI_CAP_MULTIFUNCTION_BITNR , false), DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present,
hw/vfio/pci.c +2 -3
@@ -1012,7 +1012,6 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) {uint32_t orig, size =cpu_to_le32 ((uint32_t )PCI_ROM_ADDRESS_MASK );off_t offset = vdev->config_offset +PCI_ROM_ADDRESS ; -DeviceState *dev =DEVICE (vdev);char *name;int fd = vdev->vbasedev.fd;
@@ -1046,12 +1045,12 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) }if (vfio_opt_rom_in_denylist (vdev)) { -if (dev->opts &&qdict_haskey (dev->opts,"rombar" )) { +if (vdev->pdev.rom_bar >0 ) {warn_report ("Device at %s is known to cause system instability" " issues during option rom execution" , vdev->vbasedev.name);error_printf ("Proceeding anyway since user specified" -" non zero value for rombar\n" ); +" positive value for rombar\n" ); }else { warn_report("Rom loading for device at %s has been disabled" " due to system instability issues",
Signature · 1 line
2.45.2
PATCH v13 12/12 hw/qdev: Remove opts member
In reply to Akihiko OdakiIt is no longer used.
--- include/hw/qdev-core.h | 4 ---- hw/core/qdev.c | 1 - system/qdev-monitor.c | 12 +++++++----- 3 files changed, 7 insertions(+), 10 deletions(-)
include/hw/qdev-core.h +0 -4
@@ -237,10 +237,6 @@ struct DeviceState {* @pending_deleted_expires_ms: optional timeout for deletion events */ int64_t pending_deleted_expires_ms; -/** -* @opts: QDict of options for the device -*/ -QDict *opts;/** * @hotplugged: was device added after PHASE_MACHINE_READY? */
hw/core/qdev.c +0 -1
@@ -706,7 +706,6 @@ static void device_finalize(Object *obj) dev->canonical_path =NULL ; } -qobject_unref (dev->opts);g_free (dev->id); }
system/qdev-monitor.c +7 -5
@@ -624,6 +624,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,char *id;DeviceState *dev =NULL ;BusState *bus =NULL ; +QDict *properties; driver =qdict_get_try_str (opts,"driver" );if (!driver) {
@@ -705,13 +706,14 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, }/* set properties */ - dev->opts =qdict_clone_shallow (opts); -qdict_del (dev->opts,"driver" ); -qdict_del (dev->opts,"bus" ); -qdict_del (dev->opts,"id" ); + properties =qdict_clone_shallow (opts); +qdict_del (properties,"driver" ); +qdict_del (properties,"bus" ); +qdict_del (properties,"id" ); -object_set_properties_from_keyval (&dev->parent_obj, dev->opts, from_json, +object_set_properties_from_keyval (&dev->parent_obj, properties, from_json, errp); +qobject_unref (properties);if (*errp) { goto err_del_dev; }
Signature · 1 line
2.45.2