From 3f6f409e0c66e7f67d8830ffce9576ca306853ff Mon Sep 17 00:00:00 2001

From: Alex Williamson <alex.williamson@redhat.com>

Date: Tue, 5 Nov 2013 17:51:11 +0100

Subject: [PATCH 21/25] vfio-pci: Make use of new KVM-VFIO device

RH-Author: Alex Williamson <alex.williamson@redhat.com>

Message-id: <20131105175111.19705.95280.stgit@bling.home>

Patchwork-id: 55443

O-Subject: [RHEL7 qemu-kvm PATCH 2/2] vfio-pci: Make use of new KVM-VFIO device

Bugzilla: 1025474

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

Bugzilla: 1025474

Upstream: Posted - http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg00091.html

Add and remove groups from the KVM virtual VFIO device as we make

use of them.  This allows KVM to optimize for performance and

correctness based on properties of the group.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

---

 hw/misc/vfio.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 65 insertions(+)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/misc/vfio.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c

index 331ae5f..b7f213b 100644

--- a/hw/misc/vfio.c

+++ b/hw/misc/vfio.c

@@ -208,6 +208,15 @@ static QLIST_HEAD(, VFIOContainer)

 static QLIST_HEAD(, VFIOGroup)

     group_list = QLIST_HEAD_INITIALIZER(group_list);

+/*

+ * We have a single VFIO pseudo device per KVM VM.  Once created it lives

+ * for the life of the VM.  Closing the file descriptor only drops our

+ * reference to it and the device's reference to kvm.  Therefore once

+ * initialized, this file descriptor is only released on QEMU exit and

+ * we'll re-use it should another vfio device be attached before then.

+ */

+static int vfio_kvm_device_fd = -1;

+

 static void vfio_disable_interrupts(VFIODevice *vdev);

 static uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);

 static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,

@@ -3033,6 +3042,59 @@ static void vfio_pci_reset_handler(void *opaque)

     }

 }

+static void vfio_kvm_device_add_group(VFIOGroup *group)

+{

+#ifdef CONFIG_KVM

+    struct kvm_device_attr attr = {

+        .group = KVM_DEV_VFIO_GROUP,

+        .attr = KVM_DEV_VFIO_GROUP_ADD,

+        .addr = (uint64_t)(unsigned long)&group->fd,

+    };

+

+    if (!kvm_enabled()) {

+        return;

+    }

+

+    if (vfio_kvm_device_fd < 0) {

+        struct kvm_create_device cd = {

+            .type = KVM_DEV_TYPE_VFIO,

+        };

+

+        if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) {

+            DPRINTF("KVM_CREATE_DEVICE: %m\n");

+            return;

+        }

+

+        vfio_kvm_device_fd = cd.fd;

+    }

+

+    if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) {

+        error_report("Failed to add group %d to KVM VFIO device: %m",

+                     group->groupid);

+    }

+#endif

+}

+

+static void vfio_kvm_device_del_group(VFIOGroup *group)

+{

+#ifdef CONFIG_KVM

+    struct kvm_device_attr attr = {

+        .group = KVM_DEV_VFIO_GROUP,

+        .attr = KVM_DEV_VFIO_GROUP_DEL,

+        .addr = (uint64_t)(unsigned long)&group->fd,

+    };

+

+    if (vfio_kvm_device_fd < 0) {

+        return;

+    }

+

+    if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) {

+        error_report("Failed to remove group %d to KVM VFIO device: %m",

+                     group->groupid);

+    }

+#endif

+}

+

 static int vfio_connect_container(VFIOGroup *group)

 {

     VFIOContainer *container;

@@ -3181,6 +3243,8 @@ static VFIOGroup *vfio_get_group(int groupid)

     QLIST_INSERT_HEAD(&group_list, group, next);

+    vfio_kvm_device_add_group(group);

+

     return group;

 }

@@ -3190,6 +3254,7 @@ static void vfio_put_group(VFIOGroup *group)

         return;

     }

+    vfio_kvm_device_del_group(group);

     vfio_disconnect_container(group);

     QLIST_REMOVE(group, next);

     DPRINTF("vfio_put_group: close group->fd\n");

-- 

1.7.1