hw/pci/pcie: Forbid hot-plug if it's disabled on the slot
v2 cover hw/pci/pcie: Forbid hot-plug if it's disabled on the slot
Julia Suvorova (2):
hw/pci/pcie: Forbid hot-plug if it's disabled on the slot hw/pci/pcie: Replace PCI_DEVICE() casts with existing variable
hw/pci/pcie.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.3
PATCH v2 1/2 hw/pci/pcie: Forbid hot-plug if it's disabled on the slot
Raise an error when trying to hot-plug/unplug a device through QMP to a device with disabled hot-plug capability. This makes the device behaviour more consistent and provides an explanation of the failure in the case of asynchronous unplug.
---
v2:
* Change error text [Igor, Michael]
* Move cleanup to a separate patch [Marcel]
hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
hw/pci/pcie.c +19 -0
@@ -415,6 +415,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {PCIDevice *hotplug_pdev =PCI_DEVICE (hotplug_dev);uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap; +uint32_t sltcap =pci_get_word (exp_cap +PCI_EXP_SLTCAP );PCIDevice *pci_dev =PCI_DEVICE (dev);/* Don't send event when device is enabled during qemu machine creation:
@@ -430,6 +431,13 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } +/* Check if hot-plug is disabled on the slot */ +if ((sltcap &PCI_EXP_SLTCAP_HPC ) ==0 ) { +error_setg (errp,"Hot-plug failed: unsupported by the port device '%s'" , +DEVICE (hotplug_pdev)->id); +return ; + } +/* To enable multifunction hot-plug, we just ensure the function * 0 added last. When function 0 is added, we set the sltsta and * inform OS via event notification.
@@ -470,6 +478,17 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,Error *local_err =NULL ;PCIDevice *pci_dev =PCI_DEVICE (dev);PCIBus *bus =pci_get_bus (pci_dev); +PCIDevice *hotplug_pdev =PCI_DEVICE (hotplug_dev); +uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap; +uint32_t sltcap =pci_get_word (exp_cap +PCI_EXP_SLTCAP ); + +/* Check if hot-unplug is disabled on the slot */ +if ((sltcap &PCI_EXP_SLTCAP_HPC ) ==0 ) { +error_setg (errp,"Hot-unplug failed: " +"unsupported by the port device '%s'" , +DEVICE (hotplug_pdev)->id); +return ; + }pcie_cap_slot_plug_common (PCI_DEVICE (hotplug_dev), dev, &local_err);if (local_err) {
Signature · 1 line
2.25.3
Quoted 48 lines · Julia Suvorova
Raise an error when trying to hot-plug/unplug a device through QMP to a device with disabled hot-plug capability. This makes the device behaviour more consistent and provides an explanation of the failure in the case of asynchronous unplug.
Signed-off-by Julia Suvorova <[email protected]>---
v2:
* Change error text [Igor, Michael]
* Move cleanup to a separate patch [Marcel]hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +12
-0@@ -415,6 +415,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, {PCIDevice *hotplug_pdev =PCI_DEVICE (hotplug_dev);uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap; +uint32_t sltcap =pci_get_word (exp_cap +PCI_EXP_SLTCAP );PCIDevice *pci_dev =PCI_DEVICE (dev);/* Don't send event when device is enabled during qemu machine creation: @@ -430,6 +431,13 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } +/* Check if hot-plug is disabled on the slot */ +if ((sltcap &PCI_EXP_SLTCAP_HPC ) ==0 ) { +error_setg (errp,"Hot-plug failed: unsupported by the port device '%s'" , +DEVICE (hotplug_pdev)->id); +return ; + } +/* To enable multifunction hot-plug, we just ensure the function * 0 added last. When function 0 is added, we set the sltsta and * inform OS via event notification. @@ -470,6 +478,17 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,Error *local_err =NULL ;PCIDevice *pci_dev =PCI_DEVICE (dev);PCIBus *bus =pci_get_bus (pci_dev); +PCIDevice *hotplug_pdev =PCI_DEVICE (hotplug_dev); +uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap; +uint32_t sltcap =pci_get_word (exp_cap +PCI_EXP_SLTCAP ); +
hw/pci/pcie.c void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, · line 494
Quoted 10 lines
hw/pci/pcie.c +7
-0+/* Check if hot-unplug is disabled on the slot */ +if ((sltcap &PCI_EXP_SLTCAP_HPC ) ==0 ) { +error_setg (errp,"Hot-unplug failed: " +"unsupported by the port device '%s'" , +DEVICE (hotplug_pdev)->id); +return ; + }pcie_cap_slot_plug_common (PCI_DEVICE (hotplug_dev), dev, &local_err);if (local_err) {
Thanks,
Marcel
PATCH v2 2/2 hw/pci/pcie: Replace PCI_DEVICE() casts with existing variable
In reply to Julia SuvorovaA little cleanup is possible because of hotplug_pdev introduction.
--- hw/pci/pcie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/pci/pcie.c +3 -3
@@ -449,7 +449,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,pci_word_test_and_set_mask (exp_cap +PCI_EXP_LNKSTA ,PCI_EXP_LNKSTA_DLLLA ); } -pcie_cap_slot_event (PCI_DEVICE (hotplug_dev), +pcie_cap_slot_event (hotplug_pdev,PCI_EXP_HP_EV_PDC |PCI_EXP_HP_EV_ABP ); } }
@@ -490,7 +490,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,return ; } -pcie_cap_slot_plug_common (PCI_DEVICE (hotplug_dev), dev, &local_err); +pcie_cap_slot_plug_common (hotplug_pdev, dev, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -509,7 +509,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,return ; } -pcie_cap_slot_push_attention_button (PCI_DEVICE (hotplug_dev)); +pcie_cap_slot_push_attention_button (hotplug_pdev); }/* pci express slot for pci express root/downstream port
Signature · 1 line
2.25.3
Re: [PATCH v2 2/2] hw/pci/pcie: Replace PCI_DEVICE() casts with existing variable
Quoted 30 lines · Julia Suvorova
A little cleanup is possible because of
hotplug_pdevintroduction.Signed-off-by Julia Suvorova <[email protected]>--- hw/pci/pcie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/pci/pcie.c +2
-2@@ -449,7 +449,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,pci_word_test_and_set_mask (exp_cap +PCI_EXP_LNKSTA ,PCI_EXP_LNKSTA_DLLLA ); } -pcie_cap_slot_event (PCI_DEVICE (hotplug_dev), +pcie_cap_slot_event (hotplug_pdev,PCI_EXP_HP_EV_PDC |PCI_EXP_HP_EV_ABP ); } }@@ -490,7 +490,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,return ; } -pcie_cap_slot_plug_common (PCI_DEVICE (hotplug_dev), dev, &local_err); +pcie_cap_slot_plug_common (hotplug_pdev, dev, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/pci/pcie.c void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, · line 515
Quoted 8 lines
hw/pci/pcie.c +1
-1@@ -509,7 +509,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,return ; } -pcie_cap_slot_push_attention_button (PCI_DEVICE (hotplug_dev)); +pcie_cap_slot_push_attention_button (hotplug_pdev); }/* pci express slot for pci express root/downstream port
Thanks,
Marcel
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
TEST check-unit: tests/test-qhtsocket_accept failed: Resource temporarily unavailable
**
ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0) /tmp/qemu-test/src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
make: *** [check-qtest-aarch64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 022
TEST check-unit: tests/test-qht-par
---
TEST iotest-qcow2: 039socket_accept failed: Resource temporarily unavailable
**
ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0) /tmp/qemu-test/src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
make: *** [check-qtest-x86_64] Error 1
TEST iotest-qcow2: 040 TEST iotest-qcow2: 041 TEST iotest-qcow2: 042
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=c66f60264261441e87b973b137ab56d7', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ksshgsdx/src/docker-src.2020-04-27-15.54.25.26190:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=c66f60264261441e87b973b137ab56d7
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ksshgsdx/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 16m11.272s
user 0m9.880s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 50 lines · On Mon, Apr 27, 2020 at 10:11 PM <[email protected]> wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===TEST check-unit: tests/test-qht
socket_acceptfailed: Resource temporarily unavailable
**
ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd>= 0 &&s->qmp_fd>= 0)/tmp/qemu-test/src/tests/qtest/libqtest.c:166:kill_qemu()tried to terminate QEMU process but encountered exit status 1 (expected 0) ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd>= 0 &&s->qmp_fd>= 0)
make: *** [check-qtest-aarch64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 022
TEST check-unit: tests/test-qht-par
---
TEST iotest-qcow2: 039socket_acceptfailed: Resource temporarily unavailable
**
ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd>= 0 &&s->qmp_fd>= 0)/tmp/qemu-test/src/tests/qtest/libqtest.c:166:kill_qemu()tried to terminate QEMU process but encountered exit status 1 (expected 0) ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd>= 0 &&s->qmp_fd>= 0)
make: *** [check-qtest-x86_64] Error 1TEST iotest-qcow2: 040 TEST iotest-qcow2: 041 TEST iotest-qcow2: 042---
raiseCalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=c66f60264261441e87b973b137ab56d7', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ksshgsdx/src/docker-src.2020-04-27-15.54.25.26190:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=c66f60264261441e87b973b137ab56d7
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ksshgsdx/src'
make: *** [docker-run-test-quick@centos7] Error 2real 16m11.272s
user 0m9.880s
Quoted 5 lines
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Looks like false positive.