* [PATCH v7 1/2] qemu-kvm: add irqfd support
2009-05-12 18:32 [PATCH v7 0/2] eventfd support for KVM userspace Gregory Haskins
@ 2009-05-12 18:32 ` Gregory Haskins
2009-05-31 12:29 ` Avi Kivity
2009-05-12 18:32 ` [PATCH v7 2/2] qemu-kvm: add iofd support Gregory Haskins
1 sibling, 1 reply; 5+ messages in thread
From: Gregory Haskins @ 2009-05-12 18:32 UTC (permalink / raw)
To: kvm; +Cc: avi
irqfd lets you create an eventfd based file-desriptor to inject interrupts
to a kvm guest. We associate one gsi per fd for fine-grained routing.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
---
kvm/libkvm/libkvm.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
kvm/libkvm/libkvm.h | 25 +++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/kvm/libkvm/libkvm.c b/kvm/libkvm/libkvm.c
index ba0a5d1..74a21a2 100644
--- a/kvm/libkvm/libkvm.c
+++ b/kvm/libkvm/libkvm.c
@@ -34,6 +34,7 @@
#include <string.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <sys/eventfd.h>
#include <inttypes.h>
#include "libkvm.h"
@@ -1444,3 +1445,68 @@ int kvm_assign_set_msix_entry(kvm_context_t kvm,
return ret;
}
#endif
+
+#ifdef KVM_CAP_EVENTFD
+static int _assign_irqfd(kvm_context_t kvm, int fd, int gsi, int flags)
+{
+ int r;
+ struct kvm_irqfd data = {
+ .fd = fd,
+ .gsi = gsi,
+ .flags = flags,
+ };
+
+ r = ioctl(kvm->vm_fd, KVM_ASSIGN_IRQFD, &data);
+ if (r == -1)
+ r = -errno;
+ return r;
+}
+
+int kvm_create_irqfd(kvm_context_t kvm, int gsi, int flags)
+{
+ int r;
+ int fd;
+
+ if (!kvm_check_extension(kvm, KVM_CAP_EVENTFD))
+ return -ENOENT;
+
+ fd = eventfd(0, 0);
+ if (fd < 0)
+ return -errno;
+
+ r = _assign_irqfd(kvm, fd, gsi, flags);
+ if (r < 0) {
+ close(fd);
+ return -errno;
+ }
+
+ return fd;
+}
+
+int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags)
+{
+ int r;
+ __u32 data = fd;
+
+ r = ioctl(kvm->vm_fd, KVM_DEASSIGN_IRQFD, &data);
+ if (r == -1)
+ r = -errno;
+
+ close(fd);
+
+ return r;
+}
+
+#else /* KVM_CAP_EVENTFD */
+
+int kvm_create_irqfd(kvm_context_t kvm, int gsi, int flags)
+{
+ return -ENOENT;
+}
+
+int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags)
+{
+ return -ENOENT;
+}
+
+#endif /* KVM_CAP_EVENTFD */
diff --git a/kvm/libkvm/libkvm.h b/kvm/libkvm/libkvm.h
index 4821a1e..322b4cd 100644
--- a/kvm/libkvm/libkvm.h
+++ b/kvm/libkvm/libkvm.h
@@ -856,6 +856,31 @@ int kvm_commit_irq_routes(kvm_context_t kvm);
*/
int kvm_get_irq_route_gsi(kvm_context_t kvm);
+/*!
+ * \brief Create a file descriptor for injecting interrupts
+ *
+ * Creates an eventfd based file-descriptor that maps to a specific GSI
+ * in the guest. eventfd compliant signaling (write() from userspace, or
+ * eventfd_signal() from kernelspace) will cause the GSI to inject
+ * itself into the guest at the next available window.
+ *
+ * \param kvm Pointer to the current kvm_context
+ * \param gsi GSI to assign to this fd
+ * \param flags reserved, must be zero
+ */
+int kvm_create_irqfd(kvm_context_t kvm, int gsi, int flags);
+
+/*!
+ * \brief Destroy an irqfd file descriptor
+ *
+ * Destroys a file descriptor previously opened with kvm_create_irqfd()
+ *
+ * \param kvm Pointer to the current kvm_context
+ * \param fd fd to close
+ * \param flags reserved, must be zero
+ */
+int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags);
+
#ifdef KVM_CAP_DEVICE_MSIX
int kvm_assign_set_msix_nr(kvm_context_t kvm,
struct kvm_assigned_msix_nr *msix_nr);
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v7 2/2] qemu-kvm: add iofd support
2009-05-12 18:32 [PATCH v7 0/2] eventfd support for KVM userspace Gregory Haskins
2009-05-12 18:32 ` [PATCH v7 1/2] qemu-kvm: add irqfd support Gregory Haskins
@ 2009-05-12 18:32 ` Gregory Haskins
1 sibling, 0 replies; 5+ messages in thread
From: Gregory Haskins @ 2009-05-12 18:32 UTC (permalink / raw)
To: kvm; +Cc: avi
An iofd allows an eventfd to attach to a specific PIO/MMIO region in the
guest. Any guest-writes to that region will trigger an eventfd signal.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
---
kvm/libkvm/libkvm.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
kvm/libkvm/libkvm.h | 31 ++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 0 deletions(-)
diff --git a/kvm/libkvm/libkvm.c b/kvm/libkvm/libkvm.c
index 74a21a2..0139abd 100644
--- a/kvm/libkvm/libkvm.c
+++ b/kvm/libkvm/libkvm.c
@@ -1497,6 +1497,45 @@ int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags)
return r;
}
+int kvm_assign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int fd, int type, int flags)
+{
+ int r;
+ struct kvm_iofd data = {
+ .addr = addr,
+ .len = len,
+ .fd = fd,
+ .flags = type ? KVM_IOFD_FLAG_PIO : 0,
+ };
+
+ if (!kvm_check_extension(kvm, KVM_CAP_EVENTFD))
+ return -ENOENT;
+
+ r = ioctl(kvm->vm_fd, KVM_IOFD, &data);
+ if (r == -1)
+ r = -errno;
+ return r;
+}
+
+int kvm_deassign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int type, int flags)
+{
+ int r;
+ struct kvm_iofd data = {
+ .addr = addr,
+ .len = len,
+ .flags = KVM_IOFD_FLAG_DEASSIGN | (type ? KVM_IOFD_FLAG_PIO : 0),
+ };
+
+ if (!kvm_check_extension(kvm, KVM_CAP_EVENTFD))
+ return -ENOENT;
+
+ r = ioctl(kvm->vm_fd, KVM_IOFD, &data);
+ if (r == -1)
+ r = -errno;
+ return r;
+}
+
#else /* KVM_CAP_EVENTFD */
int kvm_create_irqfd(kvm_context_t kvm, int gsi, int flags)
@@ -1509,4 +1548,17 @@ int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags)
return -ENOENT;
}
+int kvm_assign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int fd, int type, int flags)
+{
+ return -ENOENT;
+}
+
+int kvm_deassign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int type, int flags)
+{
+ return -ENOENT;
+}
+
#endif /* KVM_CAP_EVENTFD */
+
diff --git a/kvm/libkvm/libkvm.h b/kvm/libkvm/libkvm.h
index 322b4cd..89c558a 100644
--- a/kvm/libkvm/libkvm.h
+++ b/kvm/libkvm/libkvm.h
@@ -881,6 +881,37 @@ int kvm_create_irqfd(kvm_context_t kvm, int gsi, int flags);
*/
int kvm_destroy_irqfd(kvm_context_t kvm, int fd, int flags);
+/*!
+ * \brief Assign an eventfd to an IO port (PIO or MMIO)
+ *
+ * Assigns an eventfd based file-descriptor to a specific PIO or MMIO
+ * address range. Any guest writes to the specified range will generate
+ * an eventfd signal.
+ *
+ * \param kvm Pointer to the current kvm_context
+ * \param addr The IO address
+ * \param len The length of the IO region at the address
+ * \param fd The eventfd file-descriptor
+ * \param type MMIO=0, PIO=1
+ * \param flags reserved, must be zero
+ */
+int kvm_assign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int fd, int type, int flags);
+
+/*!
+ * \brief Deassign an iofd from a previously registered IO port
+ *
+ * Deassigns an iofd previously registered with kvm_assign_iofd()
+ *
+ * \param kvm Pointer to the current kvm_context
+ * \param addr The IO address
+ * \param len The length of the IO region at the address
+ * \param type MMIO=0, PIO=1
+ * \param flags reserved, must be zero
+ */
+int kvm_deassign_iofd(kvm_context_t kvm, unsigned long addr, size_t len,
+ int type, int flags);
+
#ifdef KVM_CAP_DEVICE_MSIX
int kvm_assign_set_msix_nr(kvm_context_t kvm,
struct kvm_assigned_msix_nr *msix_nr);
^ permalink raw reply related [flat|nested] 5+ messages in thread