|
From: | Chen Fan |
Subject: | Re: [Qemu-devel] [RFC v4 8/9] vfio-pci: pass the aer error to guest |
Date: | Wed, 11 Mar 2015 10:57:48 +0800 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 |
On 03/10/2015 04:29 AM, Alex Williamson wrote:
On Mon, 2015-03-02 at 15:16 +0800, Chen Fan wrote: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 | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 5471437..5669c55 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3241,18 +3241,42 @@ 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; }+ /* 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 (pci_is_express(dev) && + pci_bus_is_express(dev->bus) && + dev->exp.aer_cap) {Isn't simply testing dev->exp.aer_cap sufficient?
Yes, I think you are right. if previous initilization install the aer cap, the check pci_is_express() and pci_bus_is_express() always true. Thanks, Chen
+ 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; + } + /* - * 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. + * 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. ".
[Prev in Thread] | Current Thread | [Next in Thread] |