From patchwork Thu Mar 12 13:36:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 11364 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 n2CDc9Ax026123 for ; Thu, 12 Mar 2009 13:38:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756710AbZCLNhO (ORCPT ); Thu, 12 Mar 2009 09:37:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756460AbZCLNhO (ORCPT ); Thu, 12 Mar 2009 09:37:14 -0400 Received: from mga02.intel.com ([134.134.136.20]:36451 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756487AbZCLNhF (ORCPT ); Thu, 12 Mar 2009 09:37:05 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 12 Mar 2009 06:31:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,350,1233561600"; d="scan'208";a="393900983" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.189]) by orsmga002.jf.intel.com with ESMTP; 12 Mar 2009 06:45:33 -0700 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1Lhl5o-0007ti-9f; Thu, 12 Mar 2009 21:37:00 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , Anthony Liguori Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 07/16] kvm: user interface for MSI type irq routing Date: Thu, 12 Mar 2009 21:36:50 +0800 Message-Id: <1236865019-30321-8-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> References: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Sheng Yang --- libkvm/libkvm.c | 98 ++++++++++++++++++++++++++++++++++++++++++++----------- libkvm/libkvm.h | 22 ++++++++++++ 2 files changed, 101 insertions(+), 19 deletions(-) diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index 80a0481..e9bae23 100644 --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -1265,11 +1265,12 @@ int kvm_clear_gsi_routes(kvm_context_t kvm) #endif } -int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) +int kvm_add_routing_entry(kvm_context_t kvm, + struct kvm_irq_routing_entry* entry) { #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *z; - struct kvm_irq_routing_entry *e; + struct kvm_irq_routing_entry *new; int n, size; if (kvm->irq_routes->nr == kvm->nr_allocated_irq_routes) { @@ -1277,7 +1278,7 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) if (n < 64) n = 64; size = sizeof(struct kvm_irq_routing); - size += n * sizeof(*e); + size += n * sizeof(*new); z = realloc(kvm->irq_routes, size); if (!z) return -ENOMEM; @@ -1285,34 +1286,77 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) kvm->irq_routes = z; } n = kvm->irq_routes->nr++; - e = &kvm->irq_routes->entries[n]; - memset(e, 0, sizeof(*e)); - e->gsi = gsi; - e->type = KVM_IRQ_ROUTING_IRQCHIP; - e->flags = 0; - e->u.irqchip.irqchip = irqchip; - e->u.irqchip.pin = pin; + new = &kvm->irq_routes->entries[n]; + memset(new, 0, sizeof(*new)); + new->gsi = entry->gsi; + new->type = entry->type; + new->flags = entry->flags; + new->u = entry->u; return 0; #else return -ENOSYS; #endif } -int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) +int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) +{ +#ifdef KVM_CAP_IRQ_ROUTING + struct kvm_irq_routing_entry e; + + e.gsi = gsi; + e.type = KVM_IRQ_ROUTING_IRQCHIP; + e.flags = 0; + e.u.irqchip.irqchip = irqchip; + e.u.irqchip.pin = pin; + return kvm_add_routing_entry(kvm, &e); +#else + return -ENOSYS; +#endif +} + +int kvm_del_routing_entry(kvm_context_t kvm, + struct kvm_irq_routing_entry* entry) { #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing_entry *e, *p; - int i; + int i, found = 0; for (i = 0; i < kvm->irq_routes->nr; ++i) { e = &kvm->irq_routes->entries[i]; - if (e->type == KVM_IRQ_ROUTING_IRQCHIP - && e->gsi == gsi - && e->u.irqchip.irqchip == irqchip - && e->u.irqchip.pin == pin) { - p = &kvm->irq_routes->entries[--kvm->irq_routes->nr]; - *e = *p; - return 0; + if (e->type == entry->type + && e->gsi == entry->gsi) { + switch (e->type) + { + case KVM_IRQ_ROUTING_IRQCHIP: { + if (e->u.irqchip.irqchip == + entry->u.irqchip.irqchip + && e->u.irqchip.pin == + entry->u.irqchip.pin) { + p = &kvm->irq_routes-> + entries[--kvm->irq_routes->nr]; + *e = *p; + found = 1; + } + break; + } + case KVM_IRQ_ROUTING_MSI: { + if (e->u.msi.address_lo == + entry->u.msi.address_lo + && e->u.msi.address_hi == + entry->u.msi.address_hi + && e->u.msi.data == entry->u.msi.data) { + p = &kvm->irq_routes-> + entries[--kvm->irq_routes->nr]; + *e = *p; + found = 1; + } + break; + } + default: + break; + } + if (found) + return 0; } } return -ESRCH; @@ -1321,6 +1365,22 @@ int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) #endif } +int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) +{ +#ifdef KVM_CAP_IRQ_ROUTING + struct kvm_irq_routing_entry e; + + e.gsi = gsi; + e.type = KVM_IRQ_ROUTING_IRQCHIP; + e.flags = 0; + e.u.irqchip.irqchip = irqchip; + e.u.irqchip.pin = pin; + return kvm_del_routing_entry(kvm, &e); +#else + return -ENOSYS; +#endif +} + int kvm_commit_irq_routes(kvm_context_t kvm) { #ifdef KVM_CAP_IRQ_ROUTING diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h index 3e5efe0..51f4d08 100644 --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -816,6 +816,28 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin); int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin); /*! + * \brief Adds a routing entry to the temporary irq routing table + * + * Adds a filled routing entry to the temporary irq routing table. Nothing is + * committed to the running VM. + * + * \param kvm Pointer to the current kvm_context + */ +int kvm_add_routing_entry(kvm_context_t kvm, + struct kvm_irq_routing_entry* entry); + +/*! + * \brief Removes a routing from the temporary irq routing table + * + * Remove a routing to the temporary irq routing table. Nothing is + * committed to the running VM. + * + * \param kvm Pointer to the current kvm_context + */ +int kvm_del_routing_entry(kvm_context_t kvm, + struct kvm_irq_routing_entry* entry); + +/*! * \brief Commit the temporary irq routing table * * Commit the temporary irq routing table to the running VM.