From: Avi Kivity <avi@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH 03/19] kvm: Introduce basic MSI support for in-kernel irqchips
Date: Mon, 21 May 2012 19:37:31 +0300 [thread overview]
Message-ID: <1337618267-16669-4-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1337618267-16669-1-git-send-email-avi@redhat.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
This patch basically adds kvm_irqchip_send_msi, a service for sending
arbitrary MSI messages to KVM's in-kernel irqchip models.
As the original KVM API requires us to establish a static route from a
pseudo GSI to the target MSI message and inject the MSI via toggling
that virtual IRQ, we need to play some tricks to make this interface
transparent. We create those routes on demand and keep them in a hash
table. Succeeding messages can then search for an existing route in the
table first and reuse it whenever possible. If we should run out of
limited GSIs, we simply flush the table and rebuild it as messages are
sent.
This approach is rather simple and could be optimized further. However,
latest kernels contains a more efficient MSI injection interface that
will obsolete the GSI-based dynamic injection.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
kvm-all.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
kvm.h | 1 +
2 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/kvm-all.c b/kvm-all.c
index 2d82d54..ff0534b 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -24,6 +24,7 @@
#include "qemu-barrier.h"
#include "sysemu.h"
#include "hw/hw.h"
+#include "hw/msi.h"
#include "gdbstub.h"
#include "kvm.h"
#include "bswap.h"
@@ -48,6 +49,8 @@
do { } while (0)
#endif
+#define KVM_MSI_HASHTAB_SIZE 256
+
typedef struct KVMSlot
{
target_phys_addr_t start_addr;
@@ -59,6 +62,11 @@
typedef struct kvm_dirty_log KVMDirtyLog;
+typedef struct KVMMSIRoute {
+ struct kvm_irq_routing_entry kroute;
+ QTAILQ_ENTRY(KVMMSIRoute) entry;
+} KVMMSIRoute;
+
struct KVMState
{
KVMSlot slots[32];
@@ -87,6 +95,7 @@ struct KVMState
int nr_allocated_irq_routes;
uint32_t *used_gsi_bitmap;
unsigned int gsi_count;
+ QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE];
#endif
};
@@ -862,9 +871,14 @@ static void set_gsi(KVMState *s, unsigned int gsi)
s->used_gsi_bitmap[gsi / 32] |= 1U << (gsi % 32);
}
+static void clear_gsi(KVMState *s, unsigned int gsi)
+{
+ s->used_gsi_bitmap[gsi / 32] &= ~(1U << (gsi % 32));
+}
+
static void kvm_init_irq_routing(KVMState *s)
{
- int gsi_count;
+ int gsi_count, i;
gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING);
if (gsi_count > 0) {
@@ -884,6 +898,10 @@ static void kvm_init_irq_routing(KVMState *s)
s->irq_routes = g_malloc0(sizeof(*s->irq_routes));
s->nr_allocated_irq_routes = 0;
+ for (i = 0; i < KVM_MSI_HASHTAB_SIZE; i++) {
+ QTAILQ_INIT(&s->msi_hashtab[i]);
+ }
+
kvm_arch_init_irq_routing(s);
}
@@ -934,11 +952,130 @@ int kvm_irqchip_commit_routes(KVMState *s)
return kvm_vm_ioctl(s, KVM_SET_GSI_ROUTING, s->irq_routes);
}
+static void kvm_irqchip_release_virq(KVMState *s, int virq)
+{
+ struct kvm_irq_routing_entry *e;
+ int i;
+
+ for (i = 0; i < s->irq_routes->nr; i++) {
+ e = &s->irq_routes->entries[i];
+ if (e->gsi == virq) {
+ s->irq_routes->nr--;
+ *e = s->irq_routes->entries[s->irq_routes->nr];
+ }
+ }
+ clear_gsi(s, virq);
+}
+
+static unsigned int kvm_hash_msi(uint32_t data)
+{
+ /* This is optimized for IA32 MSI layout. However, no other arch shall
+ * repeat the mistake of not providing a direct MSI injection API. */
+ return data & 0xff;
+}
+
+static void kvm_flush_dynamic_msi_routes(KVMState *s)
+{
+ KVMMSIRoute *route, *next;
+ unsigned int hash;
+
+ for (hash = 0; hash < KVM_MSI_HASHTAB_SIZE; hash++) {
+ QTAILQ_FOREACH_SAFE(route, &s->msi_hashtab[hash], entry, next) {
+ kvm_irqchip_release_virq(s, route->kroute.gsi);
+ QTAILQ_REMOVE(&s->msi_hashtab[hash], route, entry);
+ g_free(route);
+ }
+ }
+}
+
+static int kvm_irqchip_get_virq(KVMState *s)
+{
+ uint32_t *word = s->used_gsi_bitmap;
+ int max_words = ALIGN(s->gsi_count, 32) / 32;
+ int i, bit;
+ bool retry = true;
+
+again:
+ /* Return the lowest unused GSI in the bitmap */
+ for (i = 0; i < max_words; i++) {
+ bit = ffs(~word[i]);
+ if (!bit) {
+ continue;
+ }
+
+ return bit - 1 + i * 32;
+ }
+ if (retry) {
+ retry = false;
+ kvm_flush_dynamic_msi_routes(s);
+ goto again;
+ }
+ return -ENOSPC;
+
+}
+
+static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, MSIMessage msg)
+{
+ unsigned int hash = kvm_hash_msi(msg.data);
+ KVMMSIRoute *route;
+
+ QTAILQ_FOREACH(route, &s->msi_hashtab[hash], entry) {
+ if (route->kroute.u.msi.address_lo == (uint32_t)msg.address &&
+ route->kroute.u.msi.address_hi == (msg.address >> 32) &&
+ route->kroute.u.msi.data == msg.data) {
+ return route;
+ }
+ }
+ return NULL;
+}
+
+int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
+{
+ KVMMSIRoute *route;
+
+ route = kvm_lookup_msi_route(s, msg);
+ if (!route) {
+ int virq, ret;
+
+ virq = kvm_irqchip_get_virq(s);
+ if (virq < 0) {
+ return virq;
+ }
+
+ route = g_malloc(sizeof(KVMMSIRoute));
+ route->kroute.gsi = virq;
+ route->kroute.type = KVM_IRQ_ROUTING_MSI;
+ route->kroute.flags = 0;
+ route->kroute.u.msi.address_lo = (uint32_t)msg.address;
+ route->kroute.u.msi.address_hi = msg.address >> 32;
+ route->kroute.u.msi.data = msg.data;
+
+ kvm_add_routing_entry(s, &route->kroute);
+
+ QTAILQ_INSERT_TAIL(&s->msi_hashtab[kvm_hash_msi(msg.data)], route,
+ entry);
+
+ ret = kvm_irqchip_commit_routes(s);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
+ assert(route->kroute.type == KVM_IRQ_ROUTING_MSI);
+
+ return kvm_irqchip_set_irq(s, route->kroute.gsi, 1);
+}
+
#else /* !KVM_CAP_IRQ_ROUTING */
static void kvm_init_irq_routing(KVMState *s)
{
}
+
+int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
+{
+ abort();
+}
#endif /* !KVM_CAP_IRQ_ROUTING */
static int kvm_irqchip_create(KVMState *s)
diff --git a/kvm.h b/kvm.h
index 4ccae8c..7857dbf 100644
--- a/kvm.h
+++ b/kvm.h
@@ -132,6 +132,7 @@ int kvm_arch_on_sigbus(int code, void *addr);
void kvm_arch_init_irq_routing(KVMState *s);
int kvm_irqchip_set_irq(KVMState *s, int irq, int level);
+int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
void kvm_irqchip_add_route(KVMState *s, int gsi, int irqchip, int pin);
int kvm_irqchip_commit_routes(KVMState *s);
--
1.7.10.1
next prev parent reply other threads:[~2012-05-21 18:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 16:37 [Qemu-devel] [PULL 00/20 1.2] kvm updates Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 01/19] kvm: Refactor KVMState::max_gsi to gsi_count Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 02/19] Introduce MSIMessage structure Avi Kivity
2012-05-21 16:37 ` Avi Kivity [this message]
2012-05-21 16:37 ` [Qemu-devel] [PATCH 04/19] pc: Enable MSI support at APIC level Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 05/19] kvm: x86: Wire up MSI support for in-kernel irqchip Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 06/19] kvm: Update kernel headers Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 08/19] kvm: Enable in-kernel irqchip support by default Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 09/19] msix: Factor out msix_get_message Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 10/19] msix: Invoke msix_handle_mask_update on msix_mask_all Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 11/19] msix: Introduce vector notifiers Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 13/19] kvm: Introduce kvm_irqchip_add_msi_route Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 14/19] kvm: Publicize kvm_irqchip_release_virq Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 15/19] kvm: Make kvm_irqchip_commit_routes an internal service Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 17/19] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 18/19] msix: Add msix_nr_vectors_allocated Avi Kivity
2012-05-21 16:37 ` [Qemu-devel] [PATCH 19/19] virtio/vhost: Add support for KVM in-kernel MSI injection Avi Kivity
2012-06-04 5:46 ` [Qemu-devel] [PULL 00/20 1.2] kvm updates Anthony Liguori
2012-06-05 0:52 ` Andreas Färber
2012-06-05 1:58 ` Anthony Liguori
2012-06-05 2:26 ` Andreas Färber
2012-06-05 7:42 ` Avi Kivity
2012-06-05 8:10 ` Alexander Graf
2012-06-05 8:32 ` Jan Kiszka
2012-06-05 9:02 ` Anthony Liguori
2012-06-05 9:11 ` Avi Kivity
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=1337618267-16669-4-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=jan.kiszka@siemens.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).