[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest
From: |
Chen Hanxiao |
Subject: |
[Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest |
Date: |
Thu, 16 Jul 2015 12:00:52 +0800 |
From: Chen Fan <address@hidden>
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>
Signed-off-by: Chen Hanxiao <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 bd67608..1e04c1e 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3581,18 +3581,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. "
--
2.1.0
- [Qemu-devel] [PATCH v12 04/15] vfio: make the 4 bytes aligned for capability size, (continued)
- [Qemu-devel] [PATCH v12 04/15] vfio: make the 4 bytes aligned for capability size, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 03/15] pcie: modify the capability size assert, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 05/15] vfio: add pcie extanded capability support, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 06/15] aer: impove pcie_aer_init to support vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support or not, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 07/15] vfio: add aer support for vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks for host bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 11/15] vfio: modify vfio_pci_hot_reset to support bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 13/15] pcie_aer: expose pcie_aer_msg() interface, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 10/15] vfio: add sec_bus_reset notifier to notify physical bus reset is needed, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest,
Chen Hanxiao <=
- [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 15/15] vfio: add 'aer' property to expose aercap, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 01/15] vfio: extract vfio_get_hot_reset_info as a single function, Chen Hanxiao, 2015/07/16
- Re: [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest, Alex Williamson, 2015/07/16