[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support
From: |
Chen Hanxiao |
Subject: |
[Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support or not |
Date: |
Thu, 16 Jul 2015 12:00:46 +0800 |
From: Chen Fan <address@hidden>
when init vfio devices done, we should test all the devices supported
aer whether conflict with others. For each one, get the hot reset
info for the affected device list. For each affected device, all
should attach to the VM and on the same slot. also, we should test
all of the non-AER supporting vfio-pci devices on or below the target
bus to verify they have a reset mechanism.
Signed-off-by: Chen Fan <address@hidden>
Signed-off-by: Chen Hanxiao <address@hidden>
---
hw/vfio/pci.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 155 insertions(+), 7 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 5e24e9d..ed4d87e 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -32,6 +32,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
+#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_bridge.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
@@ -2849,6 +2850,133 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev,
uint8_t pos)
return 0;
}
+static bool vfio_pci_host_match(PCIHostDeviceAddress *host1,
+ PCIHostDeviceAddress *host2)
+{
+ return (host1->domain == host2->domain && host1->bus == host2->bus &&
+ host1->slot == host2->slot && host1->function == host2->function);
+}
+
+static int vfio_check_host_bus_reset(VFIOPCIDevice *vdev)
+{
+ PCIDevice *pdev = &vdev->pdev;
+ struct vfio_pci_hot_reset_info *info = NULL;
+ struct vfio_pci_dependent_device *devices;
+ VFIOGroup *group;
+ int ret, i, k;
+
+ ret = vfio_get_hot_reset_info(vdev, &info);
+ if (ret) {
+ error_report("vfio: Cannot get hot reset info");
+ return ret;
+ }
+
+ /* List all affected devices by bus reset */
+ devices = &info->devices[0];
+
+ /* Verify that we have all the groups required */
+ for (i = 0; i < info->count; i++) {
+ PCIHostDeviceAddress host;
+ VFIOPCIDevice *tmp;
+ VFIODevice *vbasedev;
+ bool found = false;
+
+ host.domain = devices[i].segment;
+ host.bus = devices[i].bus;
+ host.slot = PCI_SLOT(devices[i].devfn);
+ host.function = PCI_FUNC(devices[i].devfn);
+
+ /* Skip the current device */
+ if (vfio_pci_host_match(&host, &vdev->host)) {
+ continue;
+ }
+
+ /* Ensure we own the group of the affected device */
+ QLIST_FOREACH(group, &vfio_group_list, next) {
+ if (group->groupid == devices[i].group_id) {
+ break;
+ }
+ }
+
+ if (!group) {
+ /* Print all the device associated with that
+ * unfound group_id in vfio_group_list.
+ */
+ for (k = 0; k< info->count; k++) {
+ if (devices[k].group_id == devices[i].group_id)
+ error_report("vfio: Cannot enable AER for device %s "
+ "depends on group %d which is not owned.",
+ vdev->vbasedev.name,
+ devices[k].group_id);
+ }
+
+ ret = -1;
+ goto out;
+ }
+
+ /* Ensure affected devices for reset in the same slot */
+ QLIST_FOREACH(vbasedev, &group->device_list, next) {
+ if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) {
+ continue;
+ }
+ tmp = container_of(vbasedev, VFIOPCIDevice, vbasedev);
+ if (vfio_pci_host_match(&host, &tmp->host)) {
+ PCIDevice *pci = PCI_DEVICE(tmp);
+
+ if (pci->bus == pdev->bus &&
+ PCI_SLOT(pci->devfn) == PCI_SLOT(pdev->devfn)) {
+ found = true;
+ break;
+ }
+ error_report("vfio: Cannot enable AER for device %s, "
+ "the dependent device %s is not in the same slot",
+ vdev->vbasedev.name, tmp->vbasedev.name);
+ ret = -1;
+ goto out;
+ }
+ }
+
+ /* Ensure all affected devices assigned to VM */
+ if (!found) {
+ error_report("vfio: Cannot enable AER for device %s, "
+ "the dependent device %04x:%02x:%02x.%x "
+ "is not assigned to VM.",
+ vdev->vbasedev.name, host.domain, host.bus,
+ host.slot, host.function);
+ ret = -1;
+ goto out;
+ }
+ }
+
+ ret = 0;
+out:
+ g_free(info);
+ return ret;
+}
+
+static int vfio_check_devices_host_bus_reset(void)
+{
+ VFIOGroup *group;
+ VFIODevice *vbasedev;
+ VFIOPCIDevice *vdev;
+
+ /* Check whether all of vfio-pci devices have bus reset capability */
+ QLIST_FOREACH(group, &vfio_group_list, next) {
+ QLIST_FOREACH(vbasedev, &group->device_list, next) {
+ if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) {
+ continue;
+ }
+ vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
+ if ((vdev->features & VFIO_FEATURE_ENABLE_AER) &&
+ vfio_check_host_bus_reset(vdev)) {
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
int pos, uint16_t size)
{
@@ -2885,6 +3013,14 @@ static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t
cap_ver,
dev_iter = pci_bridge_get_device(dev_iter->bus);
}
+ if (DEVICE(vdev)->hotplugged) {
+ /* Make sure this device does not conflict the existing aer topology */
+ ret = vfio_check_devices_host_bus_reset();
+ if (ret) {
+ return ret;
+ }
+ }
+
errcap = vfio_pci_read_config(pdev, pdev->exp.aer_cap + PCI_ERR_CAP, 4);
/*
* The ability to record multiple headers is depending on
@@ -3040,13 +3176,6 @@ static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
vfio_enable_intx(vdev);
}
-static bool vfio_pci_host_match(PCIHostDeviceAddress *host1,
- PCIHostDeviceAddress *host2)
-{
- return (host1->domain == host2->domain && host1->bus == host2->bus &&
- host1->slot == host2->slot && host1->function == host2->function);
-}
-
static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)
{
VFIOGroup *group;
@@ -3708,6 +3837,20 @@ static void vfio_setup_resetfn(VFIOPCIDevice *vdev)
}
}
+static void vfio_pci_machine_done_notify(Notifier *notifier, void *unused)
+{
+ int ret;
+
+ ret = vfio_check_devices_host_bus_reset();
+ if (ret) {
+ hw_error("Some host bus did not support reset capability");
+ }
+}
+
+static Notifier machine_notifier = {
+ .notify = vfio_pci_machine_done_notify,
+};
+
static int vfio_initfn(PCIDevice *pdev)
{
VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
@@ -3993,6 +4136,11 @@ static const TypeInfo vfio_pci_dev_info = {
static void register_vfio_pci_dev_type(void)
{
type_register_static(&vfio_pci_dev_info);
+ /*
+ * Register notifier when machine init is done, since we need
+ * check the configration manner after all vfio device are inited.
+ */
+ qemu_add_machine_init_done_notifier(&machine_notifier);
}
type_init(register_vfio_pci_dev_type)
--
2.1.0
- [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 02/15] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 04/15] vfio: make the 4 bytes aligned for capability size, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 03/15] pcie: modify the capability size assert, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 05/15] vfio: add pcie extanded capability support, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 06/15] aer: impove pcie_aer_init to support vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 08/15] vfio: add check host bus reset is support or not,
Chen Hanxiao <=
- [Qemu-devel] [PATCH v12 07/15] vfio: add aer support for vfio device, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 09/15] pci: add bus reset_notifiers callbacks for host bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 11/15] vfio: modify vfio_pci_hot_reset to support bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 13/15] pcie_aer: expose pcie_aer_msg() interface, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 10/15] vfio: add sec_bus_reset notifier to notify physical bus reset is needed, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 14/15] vfio-pci: pass the aer error to guest, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 12/15] vfio: do hot bus reset when do virtual secondary bus reset, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 15/15] vfio: add 'aer' property to expose aercap, Chen Hanxiao, 2015/07/16
- [Qemu-devel] [PATCH v12 01/15] vfio: extract vfio_get_hot_reset_info as a single function, Chen Hanxiao, 2015/07/16
- Re: [Qemu-devel] [PATCH v12 00/15] vfio-pci: pass the aer error to guest, Alex Williamson, 2015/07/16