@@ -95,6 +95,7 @@ struct KVMState
uint32_t *used_gsi_bitmap;
unsigned int gsi_count;
QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE];
+ bool direct_msi;
#endif
};
@@ -895,8 +896,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]);
+ if (!s->direct_msi) {
+ for (i = 0; i < KVM_MSI_HASHTAB_SIZE; i++) {
+ QTAILQ_INIT(&s->msi_hashtab[i]);
+ }
}
kvm_arch_init_irq_routing(s);
@@ -1035,7 +1038,7 @@ again:
return bit - 1 + i * 32;
}
- if (retry) {
+ if (!s->direct_msi && retry) {
retry = false;
kvm_flush_dynamic_msi_routes(s);
goto again;
@@ -1062,8 +1065,19 @@ static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, uint64_t addr,
int kvm_irqchip_send_msi(KVMState *s, uint64_t addr, uint32_t data)
{
+ struct kvm_msi msi;
KVMMSIRoute *route;
+ if (s->direct_msi) {
+ msi.address_lo = (uint32_t)addr;
+ msi.address_hi = addr >> 32;
+ msi.data = data;
+ msi.flags = 0;
+ memset(msi.pad, 0, sizeof(msi.pad));
+
+ return kvm_vm_ioctl(s, KVM_SIGNAL_MSI, &msi);
+ }
+
route = kvm_lookup_msi_route(s, addr, data);
if (!route) {
int gsi, ret;
@@ -1231,6 +1245,8 @@ int kvm_init(void)
s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
#endif
+ s->direct_msi = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0);
+
ret = kvm_arch_init(s);
if (ret < 0) {
goto err;