From patchwork Mon Mar 21 10:08:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 8631281 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 D2877C0553 for ; Mon, 21 Mar 2016 10:13:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA88B20220 for ; Mon, 21 Mar 2016 10:13:51 +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 0408D2021B for ; Mon, 21 Mar 2016 10:13:51 +0000 (UTC) Received: from localhost ([::1]:56707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwqM-0002yh-Cg for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 06:13:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwkC-0008SU-1A for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahwk6-0006Fw-Km 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 1ahwk6-000667-5i for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:22 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4799110" 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 112FC408D260; Mon, 21 Mar 2016 18:07:05 +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:04 +0800 From: Cao jin To: Date: Mon, 21 Mar 2016 18:08:43 +0800 Message-ID: <1458554926-7844-8-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: 112FC408D260.AAF2A 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 07/10] vfio: add check aer functionality for hotplug device 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 because we make the vfio functions are combined in the same way as on the host for aer, so we can do the aer check when the function 0 was hotplugged. Signed-off-by: Chen Fan --- hw/vfio/pci.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index dce3b6d..9902c87 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2030,6 +2030,35 @@ out: return; } +static void vfio_bus_check_aer_functions(PCIDevice *pdev, Error **errp) +{ + VFIOPCIDevice *vdev; + PCIDevice *dev; + Error *local_err = NULL; + int devfn; + + 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; + } + vdev = DO_UPCAST(VFIOPCIDevice, pdev, dev); + if (vdev->features & VFIO_FEATURE_ENABLE_AER) { + vfio_check_hot_bus_reset(vdev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } + } + + return; +} + static void vfio_aer_check_host_bus_reset(Error **errp) { VFIOGroup *group; @@ -2982,6 +3011,22 @@ static int vfio_initfn(PCIDevice *pdev) } } + /* + * If this function is func 0, indicate the closure of the slot. + * we get the chance to check aer-enabled devices whether support + * hot bus reset. + */ + if (DEVICE(pdev)->hotplugged && + pdev == pci_get_function_0(pdev)) { + Error *local_err = NULL; + + vfio_bus_check_aer_functions(pdev, &local_err); + if (local_err) { + error_report_err(local_err); + goto out_teardown; + } + } + vfio_register_err_notifier(vdev); vfio_register_req_notifier(vdev); vfio_setup_resetfn_quirk(vdev);