From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com
Subject: [Qemu-devel] [RFC v10 18/19] vfio-pci: pass the aer error to guest
Date: Tue, 16 Jun 2015 16:11:02 +0800 [thread overview]
Message-ID: <38cb86e02fad36df8e3b767131f2fd128270d3aa.1434356309.git.chen.fan.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1434356309.git.chen.fan.fnst@cn.fujitsu.com>
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 <chen.fan.fnst@cn.fujitsu.com>
---
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 5bdfa73..3b76329 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3699,18 +3699,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
next prev parent reply other threads:[~2015-06-16 8:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 8:10 [Qemu-devel] [RFC v10 00/19] vfio-pci: pass the aer error to guest Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 01/19] vfio: extract vfio_get_hot_reset_info as a single function Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 02/19] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 03/19] pcie: modify the capability size assert Chen Fan
2015-06-17 9:43 ` Marcel Apfelbaum
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 04/19] vfio: make the 4 bytes aligned for capability size Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 05/19] vfio: add pcie extanded capability support Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 06/19] aer: impove pcie_aer_init to support vfio device Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 07/19] vfio: add aer support for " Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 08/19] vfio: add ref for group to support own affected groups Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 09/19] vfio: extract vfio_register_container_listener from vfio_connect_container Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 10/19] vfio: improve vfio_get_group to support adding as is NULL Chen Fan
2015-06-18 16:41 ` Alex Williamson
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 11/19] get all affected groups for each device support aer Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 12/19] vfio: add check host bus reset is support or not Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 13/19] pci: add bus reset_notifiers callbacks for host bus reset Chen Fan
2015-06-16 10:20 ` Michael S. Tsirkin
2015-06-17 1:41 ` Chen Fan
2015-06-17 6:47 ` Michael S. Tsirkin
2015-06-17 15:19 ` Alex Williamson
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 14/19] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 15/19] vfio: improve vfio_pci_hot_reset to support more case Chen Fan
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 16/19] vfio: do hot bus reset when do virtual secondary bus reset Chen Fan
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 17/19] pcie_aer: expose pcie_aer_msg() interface Chen Fan
2015-06-17 9:46 ` Marcel Apfelbaum
2015-06-16 8:11 ` Chen Fan [this message]
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 19/19] vfio: add 'aer' property to expose aercap Chen Fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38cb86e02fad36df8e3b767131f2fd128270d3aa.1434356309.git.chen.fan.fnst@cn.fujitsu.com \
--to=chen.fan.fnst@cn.fujitsu.com \
--cc=alex.williamson@redhat.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.