All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com
Subject: [Qemu-devel] [RFC v8.1 10/13] vfio: do hot bus reset when do virtual secondary bus reset
Date: Wed, 27 May 2015 10:46:31 +0800	[thread overview]
Message-ID: <46619f0d035b8cb160694963cb8d4c249e744ee3.1432694455.git.chen.fan.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1432694455.git.chen.fan.fnst@cn.fujitsu.com>

when do virtual secondary bus reset, the vfio device under
this bus need to do host bus reset to reset the device.
so add this case.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
 hw/vfio/pci.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a8c5988..b05ccdf 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3803,6 +3803,64 @@ out:
     g_free(info);
 }
 
+/* Check when device reset the affected devices is single or multi,
+ * because there was differentiate the hot reset of mulitple in-use
+ * devices and hot reset of a single in-use device. */
+static int vfio_pci_affect_devices_is_multi(VFIOPCIDevice *vdev)
+{
+    VFIOGroup *group;
+    struct vfio_pci_hot_reset_info *info = NULL;
+    struct vfio_pci_dependent_device *devices;
+    int ret, i, count = 0;
+
+    ret = vfio_get_hot_reset_info(vdev, &info);
+    if (ret < 0) {
+        goto out;
+    }
+
+    devices = &info->devices[0];
+
+    /* Verify that we have all the groups required */
+    for (i = 0; i < info->count; i++) {
+        PCIHostDeviceAddress host;
+        VFIODevice *vbasedev_iter;
+
+        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) {
+            ret = -1;
+            goto out;
+        }
+
+        QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
+            if (vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {
+                continue;
+            }
+            count++;
+        }
+    }
+
+    ret = count;
+out:
+    g_free(info);
+    return ret;
+}
+
 static void vfio_pci_machine_done_notify(Notifier *notifier, void *unused)
 {
     VFIOGroup *group;
@@ -4039,6 +4097,23 @@ static void vfio_pci_reset(DeviceState *dev)
 
     trace_vfio_pci_reset(vdev->vbasedev.name);
 
+    if (vdev->needs_bus_reset) {
+        vdev->needs_bus_reset = false;
+        if (vdev->vbasedev.needs_reset) {
+            int ret;
+
+            ret = vfio_pci_affect_devices_is_multi(vdev);
+            if (ret < 0) {
+                error_report("vfio: Cannot reset device %04x:%02x:%02x.%x, "
+                             "get hot reset info failed.", vdev->host.domain,
+                             vdev->host.bus, vdev->host.slot, vdev->host.function);
+            } else {
+                vfio_pci_hot_reset(vdev, ret ? true : false);
+            }
+        }
+        return;
+    }
+
     vfio_pci_pre_reset(vdev);
 
     if (vdev->resetfn && !vdev->resetfn(vdev)) {
-- 
1.9.3

  parent reply	other threads:[~2015-05-27  2:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27  2:46 [Qemu-devel] [RFC v8.1 00/13] vfio-pci: pass the aer error to guest Chen Fan
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 01/13] vfio: extract vfio_get_hot_reset_info as a single function Chen Fan
2015-05-27 21:31   ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 03/13] vfio: add pcie extanded capability support Chen Fan
2015-05-27 21:31   ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 04/13] aer: impove pcie_aer_init to support vfio device Chen Fan
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 05/13] vfio: add aer support for " Chen Fan
2015-05-27 21:32   ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 06/13] vfio: add check host bus reset is support or not Chen Fan
2015-05-27 21:32   ` Alex Williamson
2015-06-02  7:54     ` Chen Fan
2015-06-02 16:47       ` Alex Williamson
2015-06-03  0:52         ` Chen Fan
2015-06-04 15:59           ` Alex Williamson
2015-06-09  3:43             ` Chen Fan
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 07/13] vfio: add check for vfio devices which enable aer should support bus reset Chen Fan
2015-05-27 21:32   ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 08/13] pci: add bus reset_notifiers callbacks for host " Chen Fan
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 09/13] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Fan
2015-05-27 21:32   ` Alex Williamson
2015-05-27  2:46 ` Chen Fan [this message]
2015-05-27 21:33   ` [Qemu-devel] [RFC v8.1 10/13] vfio: do hot bus reset when do virtual secondary bus reset Alex Williamson
     [not found]     ` <557020F1.7070705@cn.fujitsu.com>
2015-06-04 16:06       ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 11/13] pcie_aer: expose pcie_aer_msg() interface Chen Fan
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 12/13] vfio-pci: pass the aer error to guest Chen Fan
2015-05-27 21:33   ` Alex Williamson
2015-05-27  2:46 ` [Qemu-devel] [RFC v8.1 13/13] vfio: add 'aer' property to expose aercap Chen Fan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=46619f0d035b8cb160694963cb8d4c249e744ee3.1432694455.git.chen.fan.fnst@cn.fujitsu.com \
    --to=chen.fan.fnst@cn.fujitsu.com \
    --cc=alex.williamson@redhat.com \
    --cc=izumi.taku@jp.fujitsu.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.