pcie: hotplug fixes
cover pcie: hotplug fixes
Red Hat QE reported several bugs around PCI Express hotplug. Fixes/workarounds follow.
Michael S. Tsirkin (3):
pcie: don't skip multi-mask events
pcie: check that slt ctrl changed before deleting
pcie: work around for racy guest init
include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 35 +++++++++++++++++++++++++++--- 4 files changed, 42 insertions(+), 6 deletions(-)
Signature · 1 line
MST
PATCH 1/3 pcie: don't skip multi-mask events
If we are trying to set multiple bits at once, testing that just one of them is already set gives a false positive. As a result we won't interrupt guest if e.g. presence detection change and attention button press are both set. This happens with multi-function device removal.
--- hw/pci/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/pci/pcie.c +1 -1
@@ -383,7 +383,7 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) {/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (dev->config + dev->exp.exp_cap + -PCI_EXP_SLTSTA , event)) { +PCI_EXP_SLTSTA , event) == event) {return ; }hotplug_event_notify (dev);
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH 1/3] pcie: don't skip multi-mask events
Quoted 6 lines · On Fri, 21 Jun 2019 02:46:46 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
If we are trying to set multiple bits at once, testing that just one of them is already set gives a false positive. As a result we won't interrupt guest if e.g. presence detection change and attention button press are both set. This happens with multi-function device removal.
Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 17 lines
--- hw/pci/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/pci/pcie.c +1
-1@@ -383,7 +383,7 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) {/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (dev->config + dev->exp.exp_cap + -PCI_EXP_SLTSTA , event)) { +PCI_EXP_SLTSTA , event) == event) {return ; }hotplug_event_notify (dev);
Re: [Qemu-devel] [PATCH 1/3] pcie: don't skip multi-mask events
In reply to Michael S. TsirkinQuoted 15 lines · Michael S. Tsirkin
If we are trying to set multiple bits at once, testing that just one of them is already set gives a false positive. As a result we won't interrupt guest if e.g. presence detection change and attention button press are both set. This happens with multi-function device removal.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/pci/pcie.c +0
-0
hw/pci/pcie.c static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) · line 389
Quoted 8 lines
hw/pci/pcie.c +1
-1@@ -383,7 +383,7 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) {/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (dev->config + dev->exp.exp_cap + -PCI_EXP_SLTSTA , event)) { +PCI_EXP_SLTSTA , event) == event) {return ; }hotplug_event_notify (dev);
Thanks,
Marcel
Re: [Qemu-devel] [PATCH 1/3] pcie: don't skip multi-mask events
In reply to Michael S. TsirkinQuoted 16 lines · Michael S. Tsirkin
If we are trying to set multiple bits at once, testing that just one of them is already set gives a false positive. As a result we won't interrupt guest if e.g. presence detection change and attention button press are both set. This happens with multi-function device removal.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/pci/pcie.c +0
-0
hw/pci/pcie.c static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) · line 389
Quoted 8 lines
hw/pci/pcie.c +1
-1@@ -383,7 +383,7 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) {/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (dev->config + dev->exp.exp_cap + -PCI_EXP_SLTSTA , event)) { +PCI_EXP_SLTSTA , event) == event) {return ; }hotplug_event_notify (dev);
PATCH 2/3 pcie: check that slt ctrl changed before deleting
In reply to Michael S. TsirkinDuring boot, linux would sometimes overwrites control of a powered off slot before powering it on. Unfortunately QEMU interprets that as a power off request and ejects the device.
For example:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-monitor stdio disk.qcow2
(qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 (qemu)cont
Balloon is deleted during guest boot.
To fix, save control beforehand and check that power or led state actually change before ejecting.
Note: this is more a hack than a solution, ideally we'd find a better way to detect ejects, or move away from ejects completely and instead monitor whether it's safe to delete device due to e.g. its power state.
--- include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)
include/hw/pci/pcie.h +2 -1
@@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev); -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);
hw/pci-bridge/pcie_root_port.c +4 -1
@@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, {uint32_t root_cmd =pci_get_long (d->config + d->exp.aer_cap +PCI_ERR_ROOT_COMMAND ); +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_ctl, &slt_sta);pci_bridge_write_config (d, address, val, len);rp_aer_vector_update (d); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len);pcie_aer_root_write_config (d, address, val, len, root_cmd); }
hw/pci-bridge/xio3130_downstream.c +4 -1
@@ -41,9 +41,12 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_sta, &slt_ctl);pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len); }
hw/pci/pcie.c +12 -2
@@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev)hotplug_event_update_event_status (dev); } -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slt_ctl,uint16_t *slt_sta) +{ +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; + *slt_ctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); + *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); +} + +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;
@@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev,* controller is off, it is safe to detach the devices. */ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && - ((val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF )) { + (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && + (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting
Quoted 103 lines · On Fri, 21 Jun 2019 02:46:48 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux would sometimes overwrites control of a powered off slot before powering it on. Unfortunately QEMU interprets that as a power off request and ejects the device.
For example:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-monitor stdio disk.qcow2
(qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 (qemu)contBalloon is deleted during guest boot.
To fix, save control beforehand and check that power or led state actually change before ejecting.
Note: this is more a hack than a solution, ideally we'd find a better way to detect ejects, or move away from ejects completely and instead monitor whether it's safe to delete device due to e.g. its power state.
Signed-off-by Michael S. Tsirkin <[email protected]>--- include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)include/hw/pci/pcie.h +2
-1@@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev); -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci-bridge/pcie_root_port.c +4
-1@@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, {uint32_t root_cmd =pci_get_long (d->config + d->exp.aer_cap +PCI_ERR_ROOT_COMMAND ); +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_ctl, &slt_sta);pci_bridge_write_config (d, address, val, len);rp_aer_vector_update (d); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len);pcie_aer_root_write_config (d, address, val, len, root_cmd); }hw/pci-bridge/xio3130_downstream.c +4
-1@@ -41,9 +41,12 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_sta, &slt_ctl);pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len); }hw/pci/pcie.c +9
-1@@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev)hotplug_event_update_event_status (dev); } -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slt_ctl,uint16_t *slt_sta) +{ +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; + *slt_ctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); + *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); +} + +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, · line 632
Quoted 2 lines
hw/pci/pcie.c +0
-0@@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev,* controller is off, it is safe to detach the devices. */
comment above probably should be updated to account for new conditions
Quoted 8 lines
hw/pci/pcie.c +3
-1if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && - ((val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF )) { + (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && + (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting
Quoted 101 lines · Igor Mammedov
Quoted 98 lines · On Fri, 21 Jun 2019 02:46:48 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux would sometimes overwrites control of a powered off slot before powering it on. Unfortunately QEMU interprets that as a power off request and ejects the device.
For example:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-monitor stdio disk.qcow2
(qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 (qemu)contBalloon is deleted during guest boot.
To fix, save control beforehand and check that power or led state actually change before ejecting.
Note: this is more a hack than a solution, ideally we'd find a better way to detect ejects, or move away from ejects completely and instead monitor whether it's safe to delete device due to e.g. its power state.
Signed-off-by Michael S. Tsirkin <[email protected]>--- include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)include/hw/pci/pcie.h +2
-1@@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev); -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci-bridge/pcie_root_port.c +4
-1@@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, {uint32_t root_cmd =pci_get_long (d->config + d->exp.aer_cap +PCI_ERR_ROOT_COMMAND ); +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_ctl, &slt_sta);pci_bridge_write_config (d, address, val, len);rp_aer_vector_update (d); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len);pcie_aer_root_write_config (d, address, val, len, root_cmd); }hw/pci-bridge/xio3130_downstream.c +4
-1@@ -41,9 +41,12 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_sta, &slt_ctl);pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len); }hw/pci/pcie.c +8
-1@@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev)hotplug_event_update_event_status (dev); } -void pcie_cap_slot_write_config(PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slt_ctl,uint16_t *slt_sta) +{ +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; + *slt_ctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); + *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); +} +
Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, · line 632
Quoted 7 lines
hw/pci/pcie.c +1
-0+void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;@@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev,* controller is off, it is safe to detach the devices. */ comment above probably should be updated to account for new conditions
It's actually the same condition: the change is that we do not eject if it was already true.
Quoted 8 lines
Quoted 8 lines
hw/pci/pcie.c +3
-1if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && - ((val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF )) { + (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && + (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting
In reply to Michael S. TsirkinQuoted 103 lines · Michael S. Tsirkin
During boot, linux would sometimes overwrites control of a powered off slot before powering it on. Unfortunately QEMU interprets that as a power off request and ejects the device.
For example:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-monitor stdio disk.qcow2
(qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 (qemu)contBalloon is deleted during guest boot.
To fix, save control beforehand and check that power or led state actually change before ejecting.
Note: this is more a hack than a solution, ideally we'd find a better way to detect ejects, or move away from ejects completely and instead monitor whether it's safe to delete device due to e.g. its power state.
Signed-off-by Michael S. Tsirkin <[email protected]>--- include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)include/hw/pci/pcie.h +2
-1@@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev); -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci-bridge/pcie_root_port.c +4
-1@@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, {uint32_t root_cmd =pci_get_long (d->config + d->exp.aer_cap +PCI_ERR_ROOT_COMMAND ); +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_ctl, &slt_sta);pci_bridge_write_config (d, address, val, len);rp_aer_vector_update (d); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len);pcie_aer_root_write_config (d, address, val, len, root_cmd); }hw/pci-bridge/xio3130_downstream.c +4
-1@@ -41,9 +41,12 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_sta, &slt_ctl);pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len); }hw/pci/pcie.c +9
-1@@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev)hotplug_event_update_event_status (dev); } -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slt_ctl,uint16_t *slt_sta) +{ +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; + *slt_ctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); + *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); +} + +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, · line 639
Quoted 10 lines
hw/pci/pcie.c +3
-1@@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev,* controller is off, it is safe to detach the devices. */ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && - ((val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF )) { + (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && + (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Thanks,
Marcel
Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting
In reply to Michael S. TsirkinQuoted 17 lines · On Fri, 21 Jun 2019 02:46:48 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux would sometimes overwrites control of a powered off slot before powering it on. Unfortunately QEMU interprets that as a power off request and ejects the device.
For example:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-monitor stdio disk.qcow2
(qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 (qemu)contBalloon is deleted during guest boot.
To fix, save control beforehand and check that power or led state actually change before ejecting.
Quoted 6 lines
Note: this is more a hack than a solution, ideally we'd find a better way to detect ejects, or move away from ejects completely and instead monitor whether it's safe to delete device due to e.g. its power state.
Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 90 lines
--- include/hw/pci/pcie.h | 3 ++- hw/pci-bridge/pcie_root_port.c | 5 ++++- hw/pci-bridge/xio3130_downstream.c | 5 ++++- hw/pci/pcie.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)include/hw/pci/pcie.h +2
-1@@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev); -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci-bridge/pcie_root_port.c +4
-1@@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, {uint32_t root_cmd =pci_get_long (d->config + d->exp.aer_cap +PCI_ERR_ROOT_COMMAND ); +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_ctl, &slt_sta);pci_bridge_write_config (d, address, val, len);rp_aer_vector_update (d); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len);pcie_aer_root_write_config (d, address, val, len, root_cmd); }hw/pci-bridge/xio3130_downstream.c +4
-1@@ -41,9 +41,12 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { +uint16_t slt_ctl, slt_sta; + +pcie_cap_slot_get (d, &slt_sta, &slt_ctl);pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len); +pcie_cap_slot_write_config (d, slt_ctl, slt_sta, address, val, len);pcie_aer_write_config (d, address, val, len); }hw/pci/pcie.c +12
-2@@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev)hotplug_event_update_event_status (dev); } -void pcie_cap_slot_write_config (PCIDevice *dev, +void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slt_ctl,uint16_t *slt_sta) +{ +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; + *slt_ctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); + *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); +} + +void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;@@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev,* controller is off, it is safe to detach the devices. */ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && - ((val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF )) { + (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && + (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
PATCH 3/3 pcie: work around for racy guest init
In reply to Michael S. TsirkinDuring boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.
For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \
-device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \
-device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \
-monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)cont
Balloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
hw/pci/pcie.c +19 -0
@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) + +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
Quoted 46 lines · On Fri, 21 Jun 2019 02:46:50 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +7
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +*
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 629
Quoted 10 lines
hw/pci/pcie.c +10
-0+* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) + +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS );
I'm reading it as:
sltsta = LOWER_PART(sltsta) | UPPER_PART(sltsta)
which basically
sltsta = sltsta
or am I missing something here?
Quoted 5 lines
hw/pci/pcie.c +2
-0+pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
Quoted 56 lines · Igor Mammedov
Quoted 53 lines · On Fri, 21 Jun 2019 02:46:50 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +14
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC)
Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 629
Quoted 3 lines
hw/pci/pcie.c +3
-0+ +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS );I'm reading it as:
sltsta =LOWER_PART(sltsta)|UPPER_PART(sltsta)
which basically
sltsta = sltsta
or am I missing something here?
You are missing the underscore.
slt_sta is the old value.
sltsta is the new value.
Quoted 5 lines
Quoted 5 lines
hw/pci/pcie.c +2
-0+pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
Quoted 66 lines · On Mon, 1 Jul 2019 05:20:41 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 56 lines · Igor Mammedov
Quoted 53 lines · On Fri, 21 Jun 2019 02:46:50 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +14
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC)Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 629
Quoted 3 lines
hw/pci/pcie.c +3
-0+ +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS );I'm reading it as:
sltsta =LOWER_PART(sltsta)|UPPER_PART(sltsta)
which basically
sltsta = sltsta
or am I missing something here?
Quoted 4 lines
You are missing the underscore.
slt_stais the old value.
sltsta is the new value.
I did notice it but still don't see where
exp_cap + PCI_EXP_SLTSTA
is being modified in call chain between
pcie_cap_slot_get(d, &slt_ctl, &slt_sta)
...
pcie_cap_slot_write_config():
sltsta = pci_get_word(exp_cap + PCI_EXP_SLTSTA)
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
hw/pci/pcie.c +2
-0+pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
Quoted 74 lines · Igor Mammedov
Quoted 66 lines · On Mon, 1 Jul 2019 05:20:41 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 56 lines · Igor Mammedov
Quoted 53 lines · On Fri, 21 Jun 2019 02:46:50 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +14
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC)Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 629
Quoted 3 lines
hw/pci/pcie.c +3
-0+ +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS );I'm reading it as:
sltsta =LOWER_PART(sltsta)|UPPER_PART(sltsta)
which basically
sltsta = sltsta
or am I missing something here?Quoted 4 lines
You are missing the underscore.
slt_stais the old value.
sltsta is the new value.
Quoted 7 lines
I did notice it but still don't see where
exp_cap+PCI_EXP_SLTSTA
is being modified in call chain between
pcie_cap_slot_get(d, &slt_ctl, &slt_sta)
...
pcie_cap_slot_write_config():
sltsta =pci_get_word(exp_cap + PCI_EXP_SLTSTA)
It's modified by pci_bridge_write_config which calls pci_default_write_config.
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
hw/pci/pcie.c +2
-0+pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
In reply to Michael S. TsirkinQuoted 51 lines · Michael S. Tsirkin
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +12
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 634
Quoted 10 lines
hw/pci/pcie.c +7
-0+ PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) + +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
Thanks,
Marcel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
CCing qemu-devel
Quoted 66 lines · Igor Mammedov
Quoted 55 lines · On Mon, 1 Jul 2019 10:04:01 +0300 Marcel Apfelbaum…
Quoted 54 lines · Michael S. Tsirkin
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +15
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) +Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 634
Quoted 7 lines
hw/pci/pcie.c +4
-0+if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }Reviewed-by Marcel Apfelbaum <[email protected]>
Quoted 8 lines
Hi Marcel,
What about my question about
sltsta = (sltsta & ~PCIE_SLOT_EVENTS) | (slt_sta & PCIE_SLOT_EVENTS);being nop like
sltsta =LOWER_PART(sltsta)|UPPER_PART(sltsta)Can you point out what I'm missing here?
Oops, I missed that, maybe it should looks like:
if (...) {
sltsta = (val & ~PCIE_SLOT_EVENTS) | (sltsta & PCIE_SLOT_EVENTS);
....
}
to keep the PCIE_SLOT_EVENTS that were set before the write.
Thanks,
Marcel
Quoted 3 lines
Quoted 3 lines
Thanks,
Marcel
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
In reply to a message not in the archiveCCing qemu-devel
Quoted 66 lines · Igor Mammedov
Quoted 55 lines · On Mon, 1 Jul 2019 10:04:01 +0300 Marcel Apfelbaum…
Quoted 54 lines · Michael S. Tsirkin
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +15
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) +Quoted 8 lines
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 634
Quoted 7 lines
hw/pci/pcie.c +4
-0+if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }Reviewed-by Marcel Apfelbaum <[email protected]>
Quoted 8 lines
Hi Marcel,
What about my question about
sltsta = (sltsta & ~PCIE_SLOT_EVENTS) | (slt_sta & PCIE_SLOT_EVENTS);being nop like
sltsta =LOWER_PART(sltsta)|UPPER_PART(sltsta)Can you point out what I'm missing here?
Oops, I missed that, maybe it should look like:
if (...) {
sltsta = (val & ~PCIE_SLOT_EVENTS) | (sltsta & PCIE_SLOT_EVENTS);
....
}
to keep the PCIE_SLOT_EVENTS that were set before the write.
Thanks,
Marcel
Quoted 3 lines
Quoted 3 lines
Thanks,
Marcel
Re: [Qemu-devel] [PATCH 3/3] pcie: work around for racy guest init
In reply to Michael S. TsirkinQuoted 19 lines · On Fri, 21 Jun 2019 02:46:50 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
During boot, linux guests tend to clear all bits in pcie slot status register which is used for hotplug.
If they clear bits that weren't set this is racy and will lose events:
not a big problem for manual hotplug on bare-metal, but a problem for us.For example, the following is broken ATM:
/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ -device virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 \ -monitor stdio disk.qcow2(qemu)device_del balloon
(qemu)contBalloon isn't deleted as it should.
As a work-around, detect this attempt to clear slot status and revert status to what it was before the write.
Quoted 8 lines
Note: in theory this can be detected as a duplicate button press which cancels the previous press. Does not seem to happen in practice as guests seem to only have this bug during init.
Note2: the right thing to do is probably to fix Linux to read status before clearing it, and act on the bits that are set.
Signed-off-by Michael S. Tsirkin <[email protected]>
had to change slot addr since #2 seems to be taken by default nic
Quoted 34 lines
--- hw/pci/pcie.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)hw/pci/pcie.c +19
-0@@ -610,6 +610,25 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_suint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA );if (ranges_overlap (addr, len, pos +PCI_EXP_SLTSTA ,2 )) { +/* +* Guests tend to clears all bits during init. +* If they clear bits that weren't set this is racy and will lose events: +* not a big problem for manual button presses, but a problem for us. +* As a work-around, detect this and revert status to what it was +* before the write. +* +* Note: in theory this can be detected as a duplicate button press +* which cancels the previous press. Does not seem to happen in +* practice as guests seem to only have this bug during init. +*/ +#define PCIE_SLOT_EVENTS (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | \ + PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ + PCI_EXP_SLTSTA_CC) + +if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); + }hotplug_event_clear (dev); }
[Qemu-devel] [PATCH 4/3] pcie: minor cleanups for slot control/status
In reply to Michael S. TsirkinRename function arguments to make intent clearer.
Better documentation for slot control logic.
---
include/hw/pci/pcie.h | 3 ++- hw/pci/pcie.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)
include/hw/pci/pcie.h +2 -1
@@ -108,7 +108,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slot_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);
hw/pci/pcie.c +11 -6
@@ -602,7 +602,8 @@ void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); } -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slt_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;
@@ -625,8 +626,8 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ PCI_EXP_SLTSTA_CC) -if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { - sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +if (val & ~old_slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (old_slt_sta &PCIE_SLOT_EVENTS );pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); }hotplug_event_clear (dev);
@@ -646,13 +647,17 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s }/* -* If the slot is polulated, power indicator is off and power +* If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. +* +* Note: don't detach if condition was already true: +* this is a work around for guests that overwrite +* control of powered off slots before powering them on. */ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && - (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || - (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) { + (!(old_slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (old_slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Signature · 1 line
MST
Philippe Mathieu-Daudé
Reviewed-byRe: [Qemu-devel] [PATCH 4/3] pcie: minor cleanups for slot control/status
Quoted 63 lines · Michael S. Tsirkin
Rename function arguments to make intent clearer.
Better documentation for slot control logic.Suggested-by Igor Mammedov <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
include/hw/pci/pcie.h | 3 ++- hw/pci/pcie.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)include/hw/pci/pcie.h +2
-1@@ -108,7 +108,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slot_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci/pcie.c +9
-4@@ -602,7 +602,8 @@ void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); } -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slt_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;@@ -625,8 +626,8 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ PCI_EXP_SLTSTA_CC) -if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { - sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +if (val & ~old_slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (old_slt_sta &PCIE_SLOT_EVENTS );pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); }hotplug_event_clear (dev);@@ -646,13 +647,17 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s }/* -* If the slot is polulated, power indicator is off and power +* If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. +* +* Note: don't detach if condition was already true: +* this is a work around for guests that overwrite +* control of powered off slots before powering them on.
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 663
Quoted 10 lines
hw/pci/pcie.c +2
-2*/ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && - (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || - (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) { + (!(old_slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (old_slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Igor Mammedov
Reviewed-byRe: [Qemu-devel] [PATCH 4/3] pcie: minor cleanups for slot control/status
In reply to Michael S. TsirkinQuoted 5 lines · On Mon, 1 Jul 2019 05:34:54 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Rename function arguments to make intent clearer.
Better documentation for slot control logic.Suggested-by Igor Mammedov <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 67 lines
---
include/hw/pci/pcie.h | 3 ++- hw/pci/pcie.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)include/hw/pci/pcie.h +2
-1@@ -108,7 +108,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slot_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci/pcie.c +11
-6@@ -602,7 +602,8 @@ void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); } -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slt_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;@@ -625,8 +626,8 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ PCI_EXP_SLTSTA_CC) -if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { - sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +if (val & ~old_slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (old_slt_sta &PCIE_SLOT_EVENTS );pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); }hotplug_event_clear (dev);@@ -646,13 +647,17 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s }/* -* If the slot is polulated, power indicator is off and power +* If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. +* +* Note: don't detach if condition was already true: +* this is a work around for guests that overwrite +* control of powered off slots before powering them on. */ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && - (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || - (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) { + (!(old_slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (old_slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Christophe de Dinechin
Reviewed-byRe: [Qemu-devel] [PATCH 4/3] pcie: minor cleanups for slot control/status
In reply to Michael S. TsirkinQuoted 62 lines · Michael S. Tsirkin
Rename function arguments to make intent clearer.
Better documentation for slot control logic.Suggested-by Igor Mammedov <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
include/hw/pci/pcie.h | 3 ++- hw/pci/pcie.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)include/hw/pci/pcie.h +2
-1@@ -108,7 +108,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_get (PCIDevice *dev,uint16_t *slot_ctl,uint16_t *slt_sta); -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slot_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slot_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len);int pcie_cap_slot_post_load (void *opaque,int version_id);void pcie_cap_slot_push_attention_button (PCIDevice *dev);hw/pci/pcie.c +9
-4@@ -602,7 +602,8 @@ void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) *slt_sta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); } -void pcie_cap_slot_write_config (PCIDevice *dev,uint16_t slt_ctl,uint16_t slt_sta, +void pcie_cap_slot_write_config (PCIDevice *dev, +uint16_t old_slt_ctl,uint16_t old_slt_sta,uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;@@ -625,8 +626,8 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | \ PCI_EXP_SLTSTA_CC) -if (val & ~slt_sta &PCIE_SLOT_EVENTS ) { - sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (slt_sta &PCIE_SLOT_EVENTS ); +if (val & ~old_slt_sta &PCIE_SLOT_EVENTS ) { + sltsta = (sltsta & ~PCIE_SLOT_EVENTS ) | (old_slt_sta &PCIE_SLOT_EVENTS );pci_set_word (exp_cap +PCI_EXP_SLTSTA , sltsta); }hotplug_event_clear (dev);@@ -646,13 +647,17 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s }/* -* If the slot is polulated, power indicator is off and power +* If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. +* +* Note: don't detach if condition was already true: +* this is a work around for guests that overwrite +* control of powered off slots before powering them on.
hw/pci/pcie.c void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_s · line 663
Quoted 10 lines
hw/pci/pcie.c +2
-2*/ if ((sltsta &PCI_EXP_SLTSTA_PDS ) && (val &PCI_EXP_SLTCTL_PCC ) && (val &PCI_EXP_SLTCTL_PIC_OFF ) ==PCI_EXP_SLTCTL_PIC_OFF && - (!(slt_ctl &PCI_EXP_SLTCTL_PCC ) || - (slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) { + (!(old_slt_ctl &PCI_EXP_SLTCTL_PCC ) || + (old_slt_ctl &PCI_EXP_SLTCTL_PIC_OFF ) !=PCI_EXP_SLTCTL_PIC_OFF )) {PCIBus *sec_bus =pci_bridge_get_sec_bus (PCI_BRIDGE (dev));pci_for_each_device (sec_bus,pci_bus_num (sec_bus), pcie_unplug_device,NULL );
Good idea.
--
Cheers,
Christophe de Dinechin (IRC c3d)