From patchwork Mon Mar 21 10:08:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 600036 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qTBV26w4Bz9s3T for ; Mon, 21 Mar 2016 21:12:58 +1100 (AEDT) Received: from localhost ([::1]:56700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwpV-0001lu-3C for incoming@patchwork.ozlabs.org; Mon, 21 Mar 2016 06:12:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwkB-0008Rn-Lm for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahwk8-0006Gg-7O for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:27 -0400 Received: from [59.151.112.132] (port=46748 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwk7-000667-Oy for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:24 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4799115" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Mar 2016 18:07:11 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 19A4F408D261; Mon, 21 Mar 2016 18:07:10 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Mon, 21 Mar 2016 18:07:09 +0800 From: Cao jin To: Date: Mon, 21 Mar 2016 18:08:45 +0800 Message-ID: <1458554926-7844-10-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1458554926-7844-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1458554926-7844-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: 19A4F408D261.A999D X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: chen.fan.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v4 09/10] vfio-pci: pass the aer error to guest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Fan when the vfio device encounters an uncorrectable error in host, the vfio_pci driver will signal the eventfd registered by this vfio device, resulting in the qemu eventfd handler getting invoked. this patch is to pass the error to guest and let the guest driver recover from the error. Signed-off-by: Chen Fan --- hw/vfio/pci.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 718cde7..d2f47ee 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2611,6 +2611,11 @@ static void vfio_err_notifier_handler(void *opaque) { VFIOPCIDevice *vdev = opaque; PCIDevice *pdev = &vdev->pdev; + Error *local_err = NULL; + PCIEAERMsg msg = { + .severity = 0, + .source_id = (pci_bus_num(pdev->bus) << 8) | pdev->devfn, + }; if (!event_notifier_test_and_clear(&vdev->err_notifier)) { return; @@ -2622,6 +2627,16 @@ static void vfio_err_notifier_handler(void *opaque) int devfn; /* + * in case the real hardware configuration has been changed, + * here we should recheck the bus reset capability. + */ + vfio_check_hot_bus_reset(vdev, &local_err); + if (local_err) { + error_report_err(local_err); + goto stop; + } + + /* * If one device has aer capability on a bus, when aer occurred, * we should notify all devices on the bus there was an aer arrived, * then we are able to vote the device #0 to do host bus reset. @@ -2638,15 +2653,42 @@ static void vfio_err_notifier_handler(void *opaque) tmp = DO_UPCAST(VFIOPCIDevice, pdev, dev); tmp->aer_occurred = true; } + + /* + * 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 (pdev->exp.aer_cap) { + uint8_t *aer_cap = pdev->config + pdev->exp.aer_cap; + uint32_t uncor_status; + bool isfatal; + + uncor_status = vfio_pci_read_config(pdev, + pdev->exp.aer_cap + PCI_ERR_UNCOR_STATUS, 4); + + /* + * if the error is not emitted by this device, we can + * just ignore it. + */ + if (!(uncor_status & ~0UL)) { + return; + } + + 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(pdev, &msg); + return; + } } +stop: /* - * 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(%s) Unrecoverable error detected. Please collect any data possible and then kill the guest", __func__, vdev->vbasedev.name);