[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v11 14/15] vfio-pci: pass the aer error to guest
From: |
Chen Fan |
Subject: |
[Qemu-devel] [v11 14/15] vfio-pci: pass the aer error to guest |
Date: |
Wed, 24 Jun 2015 17:46:07 +0800 |
when the vfio device encounters an uncorrectable error in host,
the vfio_pci driver will signal the eventfd registered by this
vfio device, the results in the qemu eventfd handler getting
invoked.
this patch is to pass the error to guest and have the guest driver
recover from the error.
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/pci.c | 45 +++++++++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 9181c15..adc15f8 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3605,18 +3605,51 @@ static void vfio_put_device(VFIOPCIDevice *vdev)
static void vfio_err_notifier_handler(void *opaque)
{
VFIOPCIDevice *vdev = opaque;
+ PCIDevice *dev = &vdev->pdev;
+ PCIEAERMsg msg = {
+ .severity = 0,
+ .source_id = (pci_bus_num(dev->bus) << 8) | dev->devfn,
+ };
if (!event_notifier_test_and_clear(&vdev->err_notifier)) {
return;
}
/*
- * TBD. Retrieve the error details and decide what action
- * needs to be taken. One of the actions could be to pass
- * the error to the guest and have the guest driver recover
- * from the error. This requires that PCIe capabilities be
- * exposed to the guest. For now, we just terminate the
- * guest to contain the error.
+ * in case the real hardware configration has been changed,
+ * here we should recheck the bus reset capability.
+ */
+ if ((vdev->features & VFIO_FEATURE_ENABLE_AER) &&
+ vfio_check_host_bus_reset(vdev)) {
+ goto stop;
+ }
+ /*
+ * we should read the error details from the real hardware
+ * configuration spaces, here we only need to do is signaling
+ * to guest an uncorrectable error has occurred.
+ */
+ if ((vdev->features & VFIO_FEATURE_ENABLE_AER) &&
+ dev->exp.aer_cap) {
+ uint8_t *aer_cap = dev->config + dev->exp.aer_cap;
+ uint32_t uncor_status;
+ bool isfatal;
+
+ uncor_status = vfio_pci_read_config(dev,
+ dev->exp.aer_cap + PCI_ERR_UNCOR_STATUS, 4);
+
+ isfatal = uncor_status & pci_get_long(aer_cap + PCI_ERR_UNCOR_SEVER);
+
+ msg.severity = isfatal ? PCI_ERR_ROOT_CMD_FATAL_EN :
+ PCI_ERR_ROOT_CMD_NONFATAL_EN;
+
+ pcie_aer_msg(dev, &msg);
+ return;
+ }
+
+stop:
+ /*
+ * If the aer capability is not exposed to the guest. we just
+ * terminate the guest to contain the error.
*/
error_report("%s(%04x:%02x:%02x.%x) Unrecoverable error detected. "
--
1.9.3
- [Qemu-devel] [v11 02/15] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, (continued)
- [Qemu-devel] [v11 02/15] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 05/15] vfio: add pcie extanded capability support, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 06/15] aer: impove pcie_aer_init to support vfio device, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 09/15] pci: add bus reset_notifiers callbacks for host bus reset, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 10/15] vfio: add sec_bus_reset notifier to notify physical bus reset is needed, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 11/15] vfio: modify vfio_pci_hot_reset to support bus reset, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 08/15] vfio: add check host bus reset is support or not, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 12/15] vfio: do hot bus reset when do virtual secondary bus reset, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 13/15] pcie_aer: expose pcie_aer_msg() interface, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 07/15] vfio: add aer support for vfio device, Chen Fan, 2015/06/24
- [Qemu-devel] [v11 14/15] vfio-pci: pass the aer error to guest,
Chen Fan <=
- [Qemu-devel] [v11 15/15] vfio: add 'aer' property to expose aercap, Chen Fan, 2015/06/24
- Re: [Qemu-devel] [v11 00/15] vfio-pci: pass the aer error to guest, Chen Fan, 2015/06/30