[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [patch v6 07/12] pci: add a pci_function_is_valid callback
From: |
Cao jin |
Subject: |
[Qemu-devel] [patch v6 07/12] pci: add a pci_function_is_valid callback to check function if valid |
Date: |
Tue, 5 Apr 2016 19:41:58 +0800 |
From: Chen Fan <address@hidden>
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 <address@hidden>
---
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;
--
1.9.3
- [Qemu-devel] [patch v6 00/12] vfio-pci: pass the aer error to guest, part2, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 01/12] vfio: extract vfio_get_hot_reset_info as a single function, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 02/12] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 03/12] vfio: add pcie extended capability support, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 05/12] vfio: refine function vfio_pci_host_match, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 04/12] vfio: add aer support for vfio device, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 09/12] vfio: vote the function 0 to do host bus reset when aer occurred, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 08/12] vfio: add check aer functionality for hotplug device, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 07/12] pci: add a pci_function_is_valid callback to check function if valid,
Cao jin <=
- [Qemu-devel] [patch v6 06/12] vfio: add check host bus reset is support or not, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 12/12] vfio: add 'aer' property to expose aercap, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 10/12] vfio-pci: pass the aer error to guest, Cao jin, 2016/04/05
- [Qemu-devel] [patch v6 11/12] vfio: register aer resume notification handler for aer resume, Cao jin, 2016/04/05