From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV4JP-0001yf-Gy for qemu-devel@nongnu.org; Mon, 09 Mar 2015 16:30:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YV4JK-0002Xb-S9 for qemu-devel@nongnu.org; Mon, 09 Mar 2015 16:30:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV4JK-0002XJ-KO for qemu-devel@nongnu.org; Mon, 09 Mar 2015 16:29:58 -0400 Message-ID: <1425932992.4675.214.camel@redhat.com> From: Alex Williamson Date: Mon, 09 Mar 2015 14:29:52 -0600 In-Reply-To: <58a16cd7d25048223734014522ff2f8c0e85e2f3.1425280224.git.chen.fan.fnst@cn.fujitsu.com> References: <58a16cd7d25048223734014522ff2f8c0e85e2f3.1425280224.git.chen.fan.fnst@cn.fujitsu.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC v4 8/9] vfio-pci: pass the aer error to guest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chen Fan Cc: izumi.taku@jp.fujitsu.com, qemu-devel@nongnu.org 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 > --- > 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? > + 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. "