Received: from eggs.gnu.org ([2001:4830:134:3::10]:37218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0XDF-0003Gj-GF for qemu-devel@nongnu.org; Mon, 15 Dec 2014 10:05:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0XD9-0001QQ-MB for qemu-devel@nongnu.org; Mon, 15 Dec 2014 10:05:29 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:60025 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0XD9-0001Ol-CO for qemu-devel@nongnu.org; Mon, 15 Dec 2014 10:05:23 -0500 From: Peter Lieven Date: Mon, 15 Dec 2014 16:05:03 +0100 Message-Id: <1418655903-7613-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH] vfio-pci: add a switch to disable PCI AER List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, Peter Lieven AER is meant to let a device driver recover from errors discovered on the PCIe bus. However, the current implementation of vfio-pci does not distingish between correctable or uncorrectalbe as well as fatal vs. non-fatal errors. Any kind of error can trigger the error correction interrupt and cause all vServers to switch to RUN_STATE_INTERNAL_ERROR. I have observed correctable non-fatal errors on a PCI root hub which where then propagated to all vServers on this root hub causing them to shut down. I added this switch to be able to ignore AER interrupts until a proper interface to propagate the error type from kernel to qemu is there. That would be the old behaviour of pci-assign or a host kernel not supporting AER. Signed-off-by: Peter Lieven --- hw/misc/vfio.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index fd318a1..b479708 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -217,6 +217,8 @@ typedef struct VFIODevice { uint32_t features; #define VFIO_FEATURE_ENABLE_VGA_BIT 0 #define VFIO_FEATURE_ENABLE_VGA (1 << VFIO_FEATURE_ENABLE_VGA_BIT) +#define VFIO_FEATURE_ENABLE_PCI_AER_BIT 1 +#define VFIO_FEATURE_ENABLE_PCI_AER (1 << VFIO_FEATURE_ENABLE_PCI_AER_BIT) int32_t bootindex; uint8_t pm_cap; bool reset_works; @@ -4025,7 +4027,13 @@ static int vfio_get_device(VFIOGroup *group, const char *name, VFIODevice *vdev) DPRINTF("VFIO_DEVICE_GET_IRQ_INFO failure: %m\n"); ret = 0; } else if (irq_info.count == 1) { - vdev->pci_aer = true; + vdev->pci_aer = !!(vdev->features & VFIO_FEATURE_ENABLE_PCI_AER); + if (!vdev->pci_aer) { + error_report("vfio: %04x:%02x:%02x.%x " + "Ignoring error recovery interrupts for the device", + vdev->host.domain, vdev->host.bus, vdev->host.slot, + vdev->host.function); + } } else { error_report("vfio: %04x:%02x:%02x.%x " "Could not enable error recovery for the device", @@ -4381,6 +4389,9 @@ static Property vfio_pci_dev_properties[] = { intx.mmap_timeout, 1100), DEFINE_PROP_BIT("x-vga", VFIODevice, features, VFIO_FEATURE_ENABLE_VGA_BIT, false), + DEFINE_PROP_BIT("pci-aer", VFIODevice, features, + VFIO_FEATURE_ENABLE_PCI_AER, true), + /* * TODO - support passed fds... is this necessary? * DEFINE_PROP_STRING("vfiofd", VFIODevice, vfiofd_name), -- 1.7.9.5