Skip to contentSkip to conversation

Hotplug vs. multifunction regression

Qemu-devel Applied Nigel Kukard 4 participants 5 messages Feb 16, 2014 – Feb 17, 2014

lore
Share & tools
lore
#0 lore raw

Hi guys,

Starting from the patch series in 9f117d41 the below error is observed... (reverting to the patch right before it works fine a1483f88)

Here is the error:
qemu-system-x86_64: hw/pci/pcie.c:240: pcie_cap_slot_hotplug_common:
Assertion `((pci_dev->devfn) & 0x07) == 0' failed.

Here is the command that generated it...

CMDLINE: $VAR1 = [

          'qemu-system-x86_64',
          '-m',
          '8G',
          '-machine',
          'q35',
          '-cpu',
          'qemu64',
          '-smp',
          '4,sockets=1,cores=4,threads=1',
          '-enable-kvm',
          '-device',

'ioh3420,bus=pcie.0,addr=1c.0,multifunction=on,port=1,chassis=1,id=root.1',

          '-device',

'vfio-pci,host=03:00.0,bus=root.1,addr=0.0,multifunction=on,x-vga=on',

          '-device',
          'vfio-pci,host=03:00.1,bus=root.1,addr=0.1',
          '-device',
          'ide-drive,drive=sata-disk0,bus=ide.0',
          '-drive',

'file=510-drive_sda.qcow2,id=sata-disk0,format=qcow2,cache=writeback,if=none',

          '-vga',
          'none',
          '-nographic',
          '-boot',
          'menu=on',
        ];

It seems the hotplug interface doesn't know how to handle multifunction devices.

-N

#1 lore raw

PATCH 1/1 PCIE: fix regression with coldplugged multifunction device

QEMU abort is caused by misplaced assertion, which should be checked only when device is hotplugged.

Refernce to regression report:
http://www.mail-archive.com/[email protected]/msg216226.html

---
 hw/pci/pcie.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
hw/pci/pcie.c +8 -8
index 8ecd11e..02cde6f 100644
@@ -221,29 +221,23 @@ static void pcie_cap_slot_hotplug_common(PCIDevice *hotplug_dev,
                                          DeviceState *dev,
                                          uint8_t **exp_cap, Error **errp)
 {
-    PCIDevice *pci_dev = PCI_DEVICE(dev);
     *exp_cap = hotplug_dev->config + hotplug_dev->exp.exp_cap;
     uint16_t sltsta = pci_get_word(*exp_cap + PCI_EXP_SLTSTA);
 
-    PCIE_DEV_PRINTF(pci_dev, "hotplug state: %d\n", state);
+    PCIE_DEV_PRINTF(PCI_DEVICE(dev), "hotplug state: %d\n", state);
     if (sltsta & PCI_EXP_SLTSTA_EIS) {
         /* the slot is electromechanically locked.
          * This error is propagated up to qdev and then to HMP/QMP.
          */
         error_setg_errno(errp, -EBUSY, "slot is electromechanically locked");
     }
-
-    /* TODO: multifunction hot-plug.
-     * Right now, only a device of function = 0 is allowed to be
-     * hot plugged/unplugged.
-     */
-    assert(PCI_FUNC(pci_dev->devfn) == 0);
 }
 
 void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
                               Error **errp)
 {
     uint8_t *exp_cap;
+    PCIDevice *pci_dev = PCI_DEVICE(dev);
 
     pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);
 
@@ -256,6 +250,12 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
         return;
     }
 
+    /* TODO: multifunction hot-plug.
+     * Right now, only a device of function = 0 is allowed to be
+     * hot plugged/unplugged.
+     */
+    assert(PCI_FUNC(pci_dev->devfn) == 0);
+
     pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
                                PCI_EXP_SLTSTA_PDS);
     pcie_cap_slot_event(PCI_DEVICE(hotplug_dev), PCI_EXP_HP_EV_PDC);
Signature · 1 line
1.7.1
#2 lore raw

Re: [Qemu-devel] [PATCH] PCIE: fix regression with coldplugged multifunction device

Quoted 8 lines · Igor Mammedov

QEMU abort is caused by misplaced assertion, which should be checked only when device is hotplugged.

Refernce to regression report:
http://www.mail-archive.com/[email protected]/msg216226.html

Applied, thanks!

BTW we really should make hotplug return an error not assert.

Quoted 55 lines
---
 hw/pci/pcie.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
hw/pci/pcie.c +8 -8
index 8ecd11e..02cde6f 100644
@@ -221,29 +221,23 @@ static void pcie_cap_slot_hotplug_common(PCIDevice *hotplug_dev,
                                          DeviceState *dev,
                                          uint8_t **exp_cap, Error **errp)
 {
-    PCIDevice *pci_dev = PCI_DEVICE(dev);
     *exp_cap = hotplug_dev->config + hotplug_dev->exp.exp_cap;
     uint16_t sltsta = pci_get_word(*exp_cap + PCI_EXP_SLTSTA);
 
-    PCIE_DEV_PRINTF(pci_dev, "hotplug state: %d\n", state);
+    PCIE_DEV_PRINTF(PCI_DEVICE(dev), "hotplug state: %d\n", state);
     if (sltsta & PCI_EXP_SLTSTA_EIS) {
         /* the slot is electromechanically locked.
          * This error is propagated up to qdev and then to HMP/QMP.
          */
         error_setg_errno(errp, -EBUSY, "slot is electromechanically locked");
     }
-
-    /* TODO: multifunction hot-plug.
-     * Right now, only a device of function = 0 is allowed to be
-     * hot plugged/unplugged.
-     */
-    assert(PCI_FUNC(pci_dev->devfn) == 0);
 }
 
 void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
                               Error **errp)
 {
     uint8_t *exp_cap;
+    PCIDevice *pci_dev = PCI_DEVICE(dev);
 
     pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);
 
@@ -256,6 +250,12 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
         return;
     }
 
+    /* TODO: multifunction hot-plug.
+     * Right now, only a device of function = 0 is allowed to be
+     * hot plugged/unplugged.
+     */
+    assert(PCI_FUNC(pci_dev->devfn) == 0);
+
     pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
                                PCI_EXP_SLTSTA_PDS);
     pcie_cap_slot_event(PCI_DEVICE(hotplug_dev), PCI_EXP_HP_EV_PDC);
Signature · 1 line
1.7.1
#3 lore raw
In reply to Nigel Kukard

[cc +igor, +mst]

Appears that it's no longer possible to use multifunction devices at PCIe at all due to hotplug being an integral part of device realization now. Thanks,

Alex

Quoted 47 lines · Nigel Kukard

Hi guys,

Starting from the patch series in 9f117d41 the below error is observed... (reverting to the patch right before it works fine a1483f88)

Here is the error:
qemu-system-x86_64: hw/pci/pcie.c:240: pcie_cap_slot_hotplug_common:
Assertion `((pci_dev->devfn) & 0x07) == 0' failed.

Here is the command that generated it...

CMDLINE: $VAR1 = [

          'qemu-system-x86_64',
          '-m',
          '8G',
          '-machine',
          'q35',
          '-cpu',
          'qemu64',
          '-smp',
          '4,sockets=1,cores=4,threads=1',
          '-enable-kvm',
          '-device',

'ioh3420,bus=pcie.0,addr=1c.0,multifunction=on,port=1,chassis=1,id=root.1',

          '-device',

'vfio-pci,host=03:00.0,bus=root.1,addr=0.0,multifunction=on,x-vga=on',

          '-device',
          'vfio-pci,host=03:00.1,bus=root.1,addr=0.1',
          '-device',
          'ide-drive,drive=sata-disk0,bus=ide.0',
          '-drive',

'file=510-drive_sda.qcow2,id=sata-disk0,format=qcow2,cache=writeback,if=none',

          '-vga',
          'none',
          '-nographic',
          '-boot',
          'menu=on',
        ];

It seems the hotplug interface doesn't know how to handle multifunction devices.

-N

#4 lore raw
Quoted 7 lines · Alex Williamson

[cc +igor, +mst]

Appears that it's no longer possible to use multifunction devices at PCIe at all due to hotplug being an integral part of device realization now. Thanks,

Alex

Yes, Igor just fixed it.

Quoted 50 lines · Nigel Kukard
Quoted 47 lines

Hi guys,

Starting from the patch series in 9f117d41 the below error is observed... (reverting to the patch right before it works fine a1483f88)

Here is the error:
qemu-system-x86_64: hw/pci/pcie.c:240: pcie_cap_slot_hotplug_common:
Assertion `((pci_dev->devfn) & 0x07) == 0' failed.

Here is the command that generated it...

CMDLINE: $VAR1 = [

          'qemu-system-x86_64',
          '-m',
          '8G',
          '-machine',
          'q35',
          '-cpu',
          'qemu64',
          '-smp',
          '4,sockets=1,cores=4,threads=1',
          '-enable-kvm',
          '-device',

'ioh3420,bus=pcie.0,addr=1c.0,multifunction=on,port=1,chassis=1,id=root.1',

          '-device',

'vfio-pci,host=03:00.0,bus=root.1,addr=0.0,multifunction=on,x-vga=on',

          '-device',
          'vfio-pci,host=03:00.1,bus=root.1,addr=0.1',
          '-device',
          'ide-drive,drive=sata-disk0,bus=ide.0',
          '-drive',

'file=510-drive_sda.qcow2,id=sata-disk0,format=qcow2,cache=writeback,if=none',

          '-vga',
          'none',
          '-nographic',
          '-boot',
          'menu=on',
        ];

It seems the hotplug interface doesn't know how to handle multifunction devices.

-N