From patchwork Tue Jun 2 15:45:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Haskins X-Patchwork-Id: 27526 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n52FjdmJ014751 for ; Tue, 2 Jun 2009 15:45:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755366AbZFBPp3 (ORCPT ); Tue, 2 Jun 2009 11:45:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755171AbZFBPp3 (ORCPT ); Tue, 2 Jun 2009 11:45:29 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:56344 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754861AbZFBPp3 (ORCPT ); Tue, 2 Jun 2009 11:45:29 -0400 Received: from dev.haskins.net (prv-ext-foundry1.gns.novell.com [137.65.251.240]) by victor.provo.novell.com with ESMTP (TLS encrypted); Tue, 02 Jun 2009 09:45:26 -0600 Received: from dev.haskins.net (localhost [127.0.0.1]) by dev.haskins.net (Postfix) with ESMTP id E027F464244; Tue, 2 Jun 2009 11:45:24 -0400 (EDT) From: Gregory Haskins Subject: [PATCH v8] qemu-kvm: add irqfd support To: kvm@vger.kernel.org Cc: avi@redhat.com Date: Tue, 02 Jun 2009 11:45:24 -0400 Message-ID: <20090602154233.30489.81627.stgit@dev.haskins.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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. [note: this is meant to work in conjunction with the POLLHUP version of irqfd, which has not yet been accepted into kvm.git] [ Changelog: v8: *) removed deassign() verb in favor of POLLHUP support on close() *) only include sys/eventfd.h if CAP_IRQFD is defined to properly support older kernels *) s/ENOENT/ENOSYS ] Signed-off-by: Gregory Haskins --- kvm/libkvm/libkvm.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ kvm/libkvm/libkvm.h | 14 ++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kvm/libkvm/libkvm.c b/kvm/libkvm/libkvm.c index ba0a5d1..10cb2ac 100644 --- a/kvm/libkvm/libkvm.c +++ b/kvm/libkvm/libkvm.c @@ -1444,3 +1444,52 @@ int kvm_assign_set_msix_entry(kvm_context_t kvm, return ret; } #endif + +#ifdef KVM_CAP_IRQFD + +#include + +static int _kvm_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_IRQFD, &data); + if (r == -1) + r = -errno; + return r; +} + +int kvm_irqfd(kvm_context_t kvm, int gsi, int flags) +{ + int r; + int fd; + + if (!kvm_check_extension(kvm, KVM_CAP_IRQFD)) + return -ENOENT; + + fd = eventfd(0, 0); + if (fd < 0) + return -errno; + + r = _kvm_irqfd(kvm, fd, gsi, 0); + if (r < 0) { + close(fd); + return -errno; + } + + return fd; +} + +#else /* KVM_CAP_IRQFD */ + +int kvm_irqfd(kvm_context_t kvm, int gsi, int flags) +{ + return -ENOSYS; +} + +#endif /* KVM_CAP_IRQFD */ diff --git a/kvm/libkvm/libkvm.h b/kvm/libkvm/libkvm.h index 4821a1e..aca8ed6 100644 --- a/kvm/libkvm/libkvm.h +++ b/kvm/libkvm/libkvm.h @@ -856,6 +856,20 @@ 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_irqfd(kvm_context_t kvm, int gsi, int flags); + #ifdef KVM_CAP_DEVICE_MSIX int kvm_assign_set_msix_nr(kvm_context_t kvm, struct kvm_assigned_msix_nr *msix_nr);