From patchwork Mon Mar 21 10:08:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 8631231 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4E55FC0553 for ; Mon, 21 Mar 2016 10:10:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CBEF201FE for ; Mon, 21 Mar 2016 10:10:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50B4A201F5 for ; Mon, 21 Mar 2016 10:10:53 +0000 (UTC) Received: from localhost ([::1]:56674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwnU-00067B-BK for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 06:10:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwk8-0008KG-58 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahwk7-0006G4-3n for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:24 -0400 Received: from [59.151.112.132] (port=28238 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwk6-0006DY-6Z for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:23 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4799109" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Mar 2016 18:07:08 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 7DE69408D262; Mon, 21 Mar 2016 18:07:07 +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:07 +0800 From: Cao jin To: Date: Mon, 21 Mar 2016 18:08:44 +0800 Message-ID: <1458554926-7844-9-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: 7DE69408D262.AC118 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 08/10] vfio: vote the function 0 to do host bus reset when aer occurred 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chen Fan Due to all devices assigned to VM on the same way as host if enable aer, so we can easily do the hot reset by selecting the function #0 to do the hot reset. Signed-off-by: Chen Fan --- hw/vfio/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vfio/pci.h | 2 ++ 2 files changed, 52 insertions(+) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 9902c87..718cde7 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1900,6 +1900,8 @@ static void vfio_check_hot_bus_reset(VFIOPCIDevice *vdev, Error **errp) /* List all affected devices by bus reset */ devices = &info->devices[0]; + vdev->single_depend_dev = (info->count == 1); + /* Verify that we have all the groups required */ for (i = 0; i < info->count; i++) { PCIHostDeviceAddress host; @@ -2608,11 +2610,36 @@ static void vfio_put_device(VFIOPCIDevice *vdev) static void vfio_err_notifier_handler(void *opaque) { VFIOPCIDevice *vdev = opaque; + PCIDevice *pdev = &vdev->pdev; if (!event_notifier_test_and_clear(&vdev->err_notifier)) { return; } + if (vdev->features & VFIO_FEATURE_ENABLE_AER) { + VFIOPCIDevice *tmp; + PCIDevice *dev; + int devfn; + + /* + * 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. + */ + for (devfn = 0; devfn < 8; devfn++) { + dev = pci_find_device(pdev->bus, pci_bus_num(pdev->bus), + PCI_DEVFN(PCI_SLOT(pdev->devfn), devfn)); + if (!dev) { + continue; + } + if (!object_dynamic_cast(OBJECT(dev), "vfio-pci")) { + continue; + } + tmp = DO_UPCAST(VFIOPCIDevice, pdev, dev); + tmp->aer_occurred = true; + } + } + /* * TBD. Retrieve the error details and decide what action * needs to be taken. One of the actions could be to pass @@ -3075,6 +3102,29 @@ static void vfio_pci_reset(DeviceState *dev) trace_vfio_pci_reset(vdev->vbasedev.name); + if (vdev->aer_occurred) { + PCIDevice *br = pci_bridge_get_device(pdev->bus); + + if (br && + (pci_get_word(br->config + PCI_BRIDGE_CONTROL) & + PCI_BRIDGE_CTL_BUS_RESET)) { + /* simply voting the function 0 to do hot bus reset */ + if (pci_get_function_0(pdev) == pdev) { + if (vdev->features & VFIO_FEATURE_ENABLE_AER) { + vfio_pci_hot_reset(vdev, vdev->single_depend_dev); + } else { + /* if this device has not AER capability, code + * coming here indicates there is another function + * on the bus has AER capability. + * */ + vfio_pci_hot_reset(vdev, false); + } + } + vdev->aer_occurred = false; + return; + } + } + vfio_pci_pre_reset(vdev); if (vdev->resetfn && !vdev->resetfn(vdev)) { diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index db7c6d5..17c75b8 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -143,6 +143,8 @@ typedef struct VFIOPCIDevice { bool no_kvm_intx; bool no_kvm_msi; bool no_kvm_msix; + bool aer_occurred; + bool single_depend_dev; } VFIOPCIDevice; uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);