From patchwork Tue Mar 15 01:35:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 8584691 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 25B789F3D1 for ; Tue, 15 Mar 2016 01:38:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84C452027D for ; Tue, 15 Mar 2016 01:38:55 +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 CAFED20270 for ; Tue, 15 Mar 2016 01:38:54 +0000 (UTC) Received: from localhost ([::1]:44922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afdwk-0007ft-A5 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 21:38:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afdsd-0000X2-Fy for qemu-devel@nongnu.org; Mon, 14 Mar 2016 21:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afdsa-0002nJ-A0 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 21:34:39 -0400 Received: from [59.151.112.132] (port=17158 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afdsZ-0002l7-Tl for qemu-devel@nongnu.org; Mon, 14 Mar 2016 21:34:36 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4571661" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Mar 2016 09:34:36 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id DC96142B4B10; Tue, 15 Mar 2016 09:34:33 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 15 Mar 2016 09:34:33 +0800 From: Cao jin To: Date: Tue, 15 Mar 2016 09:35:46 +0800 Message-ID: <1458005749-4878-7-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1458005749-4878-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1458005749-4878-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: DC96142B4B10.A82FF 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 v3 6/9] 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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 9670271..223c0ee 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2029,6 +2029,40 @@ out: return; } +static void vfio_bus_check_aer_functions(PCIDevice *pdev, Error **errp) +{ + PCIBus *bus = pdev->bus; + VFIOPCIDevice *vdev; + PCIDevice *dev; + Error *local_err = NULL; + int devfn; + + for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { + dev = bus->devices[devfn]; + if (!dev) { + continue; + } + + if (pci_get_function_0(dev) != pdev) { + return; + } + + 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; @@ -2962,6 +2996,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);