hw/virtio-pci: AER capability
v3 cover hw/virtio-pci: AER capability
From: Andrew Melnychenko <[email protected]>
Now, 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.
Also fixed commit message and added proper link to bugzilla.
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.28.0
PATCH v3 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
@@ -1788,6 +1788,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 );
@@ -1823,7 +1824,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.28.0
PATCH v3 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
@@ -1807,6 +1807,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);
@@ -1848,7 +1854,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)
@@ -1901,6 +1915,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
@@ -45,6 +45,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. */
@@ -84,6 +85,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.28.0
Re: [PATCH v3 2/2] hw/virtio-pci Added AER capability.
Quoted 3 lines · On Mon, Oct 05, 2020 at 02:56:01PM +0300, [email protected] wrote:
From: Andrew <[email protected]>
That's a private bug - what information can you share about the motivation for the patch?
Quoted 43 lines
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 +14
-0@@ -1807,6 +1807,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);@@ -1848,7 +1854,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)
hw/virtio/virtio-pci.c static Property virtio_pci_properties[] = { · line 1922
Quoted 8 lines
hw/virtio/virtio-pci.c +2
-0@@ -1901,6 +1915,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(), };
Does management need ability to enable this capability? If yes let's cc them. If no let's rename to x-aer so we don't commit to a stable interface ...
Quoted 24 lines
hw/virtio/virtio-pci.h +4
-0@@ -45,6 +45,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. */ @@ -84,6 +85,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.28.0
Re: [PATCH v3 2/2] hw/virtio-pci Added AER capability.
Hi Michael,
Quoted 9 lines · Michael S. Tsirkin
Quoted 3 lines · On Mon, Oct 05, 2020 at 02:56:01PM +0300, [email protected] wrote:
From: Andrew <[email protected]>
That's a private bug - what information can you share about the motivation for the patch?
We need AER feature in order to pass MS WHQL tests for the future Windows Server versions.
According to Microsoft driver\device certification requirements for next version of Window Server, PCIe devices must support AER. The exact quote from Microsoft certification requirements:
"Windows Server PCI Express devices are required to support Advanced Error Reporting [AER] as defined in PCI Express Base Specification version 2.1.”
Quoted 42 lines
Quoted 42 lines
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 +14
-0@@ -1807,6 +1807,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);@@ -1848,7 +1854,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); + } }
Quoted 14 lines
hw/virtio/virtio-pci.c static Property virtio_pci_properties[] = { · line 1922
Quoted 10 lines
hw/virtio/virtio-pci.c +2
-0static void virtio_pci_reset (DeviceState *qdev)@@ -1901,6 +1915,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(), };Does management need ability to enable this capability? If yes let's cc them. If no let's rename to x-aer so we don't commit to a stable interface ...
QE is using libvirt in order to spawn test setups. So I think it should be used by management as well. Whom should Andrew CC?
Best regards,
Yan.
Quoted 26 lines
Quoted 26 lines
hw/virtio/virtio-pci.h +4
-0@@ -45,6 +45,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. */ @@ -84,6 +85,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.28.0
Re: [PATCH v3 2/2] hw/virtio-pci Added AER capability.
In reply to Michael S. TsirkinOk,
Main motivation:
Quoted 7 lines
According to Microsoft driver\device certification requirements for next version of Window Server, PCIe device must support AER.
The exact quote of Microsoft certification requirements:
"Windows Server PCI Express devices are required to support Advanced Error Reporting [AER] as defined in PCI Express Base Specification version 2.1.*”*
and
Quoted 2 lines
Does management need ability to enable this capability?
Actually, yes. Can you provide their email address?
I'll prepare a new patch and I'll remove bugzilla link.
Quoted 93 lines · Michael S. Tsirkin
Quoted 3 lines · On Mon, Oct 05, 2020 at 02:56:01PM +0300, [email protected] wrote:
From: Andrew <[email protected]>
That's a private bug - what information can you share about the motivation for the patch?
hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice
Quoted 14 lines
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@@ -1807,6 +1807,12 @@ static void virtio_pci_realize(PCIDevice
*pci_dev, Error **errp)hw/virtio/virtio-pci.c static void virtio_pci_realize(PCIDevice
Quoted 13 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);@@ -1848,7 +1854,15 @@ static void virtio_pci_realize(PCIDevice
*pci_dev, Error **errp)Quoted 16 lines
hw/virtio/virtio-pci.c +8
-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)hw/virtio/virtio-pci.c static Property virtio_pci_properties[] = { · line 1922
Quoted 8 lines
hw/virtio/virtio-pci.c +2
-0@@ -1901,6 +1915,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(), };Does management need ability to enable this capability? If yes let's cc them. If no let's rename to x-aer so we don't commit to a stable interface ...
Quoted 24 lines
hw/virtio/virtio-pci.h +4
-1@@ -45,6 +45,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. */ @@ -84,6 +85,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.28.0