From patchwork Tue Apr 5 11:41:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 8749881 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 B8CF1C0553 for ; Tue, 5 Apr 2016 11:40:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18E41202EC for ; Tue, 5 Apr 2016 11:40:29 +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 533A3202D1 for ; Tue, 5 Apr 2016 11:40:28 +0000 (UTC) Received: from localhost ([::1]:36370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anPLP-0007S9-Mo for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Apr 2016 07:40:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anPKw-00072n-5R for qemu-devel@nongnu.org; Tue, 05 Apr 2016 07:39:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anPKr-0006Gw-US for qemu-devel@nongnu.org; Tue, 05 Apr 2016 07:39:58 -0400 Received: from [59.151.112.132] (port=60871 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anPKq-0006Eu-9t for qemu-devel@nongnu.org; Tue, 05 Apr 2016 07:39:53 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="5281997" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Apr 2016 19:39:48 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id B7FD0408D27B; Tue, 5 Apr 2016 19:39:47 +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; Tue, 5 Apr 2016 19:39:47 +0800 From: Cao jin To: Date: Tue, 5 Apr 2016 19:41:58 +0800 Message-ID: <1459856523-17085-8-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1459856523-17085-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1459856523-17085-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: B7FD0408D27B.AD20E 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 , izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com, mst@redhat.com Subject: [Qemu-devel] [patch v6 07/12] pci: add a pci_function_is_valid callback to check function if valid 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 PCI hotplug requires that function 0 is added last to close the slot. Since vfio supporting AER, we require that the VM bus contains the same set of devices as the host bus to support AER, we can perform an AER validation test whenever a function 0 in the VM is hot-added. Signed-off-by: Chen Fan --- hw/pci/pci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 + 2 files changed, 50 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e67664d..9dcd7d5 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1840,6 +1840,40 @@ PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) return bus->devices[devfn]; } +static void pci_functions_validate(PCIBus *bus, PCIDevice *d, Error **errp) +{ + PCIDevice *br = pci_bridge_get_device(bus); + PCIDeviceClass *pc; + PCIDevice *dev; + int devfn; + int limit = d->devfn + PCI_FUNC_MAX; + Error *local_err = NULL; + + if (br && + pci_bus_is_express(bus) && + pcie_cap_is_arifwd_enabled(br)) { + limit = 255; + } + + for (devfn = d->devfn; devfn < limit; devfn++) { + dev = pci_find_device(bus, pci_bus_num(bus), devfn); + if (!dev) { + continue; + } + + pc = PCI_DEVICE_GET_CLASS(dev); + if (!pc->is_valid_func) { + continue; + } + + pc->is_valid_func(d, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } +} + static void pci_qdev_realize(DeviceState *qdev, Error **errp) { PCIDevice *pci_dev = (PCIDevice *)qdev; @@ -1882,6 +1916,21 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) pci_qdev_unrealize(DEVICE(pci_dev), NULL); return; } + + /* + * If the function number is 0, indicate the closure of the slot. + * then we get the chance to check all functions on same device + * if valid. + */ + if (DEVICE(pci_dev)->hotplugged && + pci_get_function_0(pci_dev) == pci_dev) { + pci_functions_validate(bus, pci_dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + pci_qdev_unrealize(DEVICE(pci_dev), NULL); + return; + } + } } static void pci_default_realize(PCIDevice *dev, Error **errp) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 0be07c8..4a2f7d4 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -190,6 +190,7 @@ typedef struct PCIDeviceClass { void (*realize)(PCIDevice *dev, Error **errp); int (*init)(PCIDevice *dev);/* TODO convert to realize() and remove */ + void (*is_valid_func)(PCIDevice *dev, Error **errp); PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write;