hw/virtio-pci: AER capability
v4 cover hw/virtio-pci: AER capability
From: Andrew Melnychenko <[email protected]>
Main motivation:
According to Microsoft driver\device certification requirements for next version of Window Server, PCIe device must support AER. "Windows Server PCI Express devices are required to support Advanced Error Reporting [AER] as defined in
PCI Express Base Specification version 2.1."
AER capability for virtio-pci is disabled by default. AER capability is only for PCI with PCIe interface on PCIe bus. During migration - device "realize" should initialize AER if requested by device properties.
Fixed commit message.
Andrew (2):
hw/virtio-pci Added counter for pcie capabilities offsets. hw/virtio-pci Added AER capability.
hw/virtio/virtio-pci.c | 20 +++++++++++++++++++- hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-)
Signature · 1 line
2.29.2
PATCH v4 1/2 hw/virtio-pci Added counter for pcie capabilities offsets.
From: Andrew <[email protected]>
Removed hardcoded offset for ats. Added cap offset counter for future capabilities like AER.
--- hw/virtio/virtio-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio/virtio-pci.c +3 -1
@@ -1798,6 +1798,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)if (pcie_port &&pci_is_express (pci_dev)) {int pos; +uint16_t last_pcie_cap_offset =PCI_CONFIG_SPACE_SIZE ; pos =pcie_endpoint_cap_init (pci_dev,0 );assert (pos >0 );
@@ -1833,7 +1834,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) }if (proxy->flags &VIRTIO_PCI_FLAG_ATS ) { -pcie_ats_init (pci_dev,256 ); +pcie_ats_init (pci_dev, last_pcie_cap_offset); + last_pcie_cap_offset +=PCI_EXT_CAP_ATS_SIZEOF ; }if (proxy->flags &VIRTIO_PCI_FLAG_INIT_FLR ) {
Signature · 1 line
2.29.2
PATCH v4 2/2 hw/virtio-pci Added AER capability.
In reply to [email protected]From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is disabled.
--- hw/virtio/virtio-pci.c | 16 ++++++++++++++++ hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 20 insertions(+)
hw/virtio/virtio-pci.c +16 -0
@@ -1817,6 +1817,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 ); +if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);
@@ -1858,7 +1864,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)
@@ -1911,6 +1925,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , false), DEFINE_PROP_END_OF_LIST(), };
hw/virtio/virtio-pci.h +4 -0
@@ -41,6 +41,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -80,6 +81,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq;
Signature · 1 line
2.29.2
Re: [PATCH v4 2/2] hw/virtio-pci Added AER capability.
Quoted 18 lines · On Thu, Dec 03, 2020 at 01:07:13PM +0200, [email protected] wrote:
From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is disabled.Signed-off-by Andrew Melnychenko <[email protected]>--- hw/virtio/virtio-pci.c | 16 ++++++++++++++++ hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 20 insertions(+)hw/virtio/virtio-pci.c +0
-0@@ -1817,6 +1817,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 );
hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) · line 1828
Quoted 10 lines
hw/virtio/virtio-pci.c +6
-0+if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);
My only issue here is that if requested for a non express device, it will assert instead of a graceful failure.
Can be fixed as a patch on top though.
Quoted 49 lines
hw/virtio/virtio-pci.c +10
-0@@ -1858,7 +1864,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)@@ -1911,6 +1925,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , false), DEFINE_PROP_END_OF_LIST(), };hw/virtio/virtio-pci.h +4
-0@@ -41,6 +41,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */ @@ -80,6 +81,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq;Signature · 1 line
2.29.2
Re: [PATCH v4 2/2] hw/virtio-pci Added AER capability.
Good point.
I'll add checks during initialization.
Quoted 87 lines · Michael S. Tsirkin
hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice
Quoted 16 lines · On Thu, Dec 03, 2020 at 01:07:13PM +0200, [email protected] wrote:
From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is disabled.Signed-off-by Andrew Melnychenko <[email protected]>--- hw/virtio/virtio-pci.c | 16 ++++++++++++++++ hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 20 insertions(+)hw/virtio/virtio-pci.c +0
-0@@ -1817,6 +1817,12 @@ static void virtio_pci_realize(PCIDevice
*pci_dev, Error **errp)hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) · line 1828
Quoted 12 lines
hw/virtio/virtio-pci.c +6
-0*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 ); +if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);My only issue here is that if requested for a non express device, it will assert instead of a graceful failure.
Can be fixed as a patch on top though.hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice
Quoted 1 line
hw/virtio/virtio-pci.c +0
-0@@ -1858,7 +1864,15 @@ static void virtio_pci_realize(PCIDevice
*pci_dev, Error **errp)Quoted 48 lines
hw/virtio/virtio-pci.c +10
-0static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)@@ -1911,6 +1925,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , false), DEFINE_PROP_END_OF_LIST(), };hw/virtio/virtio-pci.h +4
-1@@ -41,6 +41,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */ @@ -80,6 +81,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq; --2.29.2