target-i386/hyperv: Hyper-V SynIC SINT routing and vcpu exit
Hyper-V SynIC(synthetic interrupt controller) helpers for Hyper-V SynIC irq routing setup, irq injection, irq ack notifications event/message pages changes tracking for future use. Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> Signed-off-by: Denis V. Lunev <den@openvz.org> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Richard Henderson <rth@twiddle.net> CC: Eduardo Habkost <ehabkost@redhat.com> CC: "Andreas Färber" <afaerber@suse.de> CC: Marcelo Tosatti <mtosatti@redhat.com> CC: Roman Kagan <rkagan@virtuozzo.com> CC: Denis V. Lunev <den@openvz.org> CC: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
977a8d9c0d
commit
50efe82c3c
@ -3,5 +3,5 @@ obj-y += excp_helper.o fpu_helper.o cc_helper.o int_helper.o svm_helper.o
|
|||||||
obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o
|
obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o
|
||||||
obj-y += gdbstub.o
|
obj-y += gdbstub.o
|
||||||
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o
|
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o
|
obj-$(CONFIG_KVM) += kvm.o hyperv.o
|
||||||
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||||
|
127
target-i386/hyperv.c
Normal file
127
target-i386/hyperv.c
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
/*
|
||||||
|
* QEMU KVM Hyper-V support
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Andrey Smetanin <asmetanin@virtuozzo.com>
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Andrey Smetanin <asmetanin@virtuozzo.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "hyperv.h"
|
||||||
|
#include "standard-headers/asm-x86/hyperv.h"
|
||||||
|
|
||||||
|
int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit)
|
||||||
|
{
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
|
||||||
|
switch (exit->type) {
|
||||||
|
case KVM_EXIT_HYPERV_SYNIC:
|
||||||
|
if (!cpu->hyperv_synic) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For now just track changes in SynIC control and msg/evt pages msr's.
|
||||||
|
* When SynIC messaging/events processing will be added in future
|
||||||
|
* here we will do messages queues flushing and pages remapping.
|
||||||
|
*/
|
||||||
|
switch (exit->u.synic.msr) {
|
||||||
|
case HV_X64_MSR_SCONTROL:
|
||||||
|
env->msr_hv_synic_control = exit->u.synic.control;
|
||||||
|
break;
|
||||||
|
case HV_X64_MSR_SIMP:
|
||||||
|
env->msr_hv_synic_msg_page = exit->u.synic.msg_page;
|
||||||
|
break;
|
||||||
|
case HV_X64_MSR_SIEFP:
|
||||||
|
env->msr_hv_synic_evt_page = exit->u.synic.evt_page;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
default:
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void kvm_hv_sint_ack_handler(EventNotifier *notifier)
|
||||||
|
{
|
||||||
|
HvSintRoute *sint_route = container_of(notifier, HvSintRoute,
|
||||||
|
sint_ack_notifier);
|
||||||
|
event_notifier_test_and_clear(notifier);
|
||||||
|
if (sint_route->sint_ack_clb) {
|
||||||
|
sint_route->sint_ack_clb(sint_route);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HvSintRoute *kvm_hv_sint_route_create(uint32_t vcpu_id, uint32_t sint,
|
||||||
|
HvSintAckClb sint_ack_clb)
|
||||||
|
{
|
||||||
|
HvSintRoute *sint_route;
|
||||||
|
int r, gsi;
|
||||||
|
|
||||||
|
sint_route = g_malloc0(sizeof(*sint_route));
|
||||||
|
r = event_notifier_init(&sint_route->sint_set_notifier, false);
|
||||||
|
if (r) {
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = event_notifier_init(&sint_route->sint_ack_notifier, false);
|
||||||
|
if (r) {
|
||||||
|
goto err_sint_set_notifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
event_notifier_set_handler(&sint_route->sint_ack_notifier,
|
||||||
|
kvm_hv_sint_ack_handler);
|
||||||
|
|
||||||
|
gsi = kvm_irqchip_add_hv_sint_route(kvm_state, vcpu_id, sint);
|
||||||
|
if (gsi < 0) {
|
||||||
|
goto err_gsi;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = kvm_irqchip_add_irqfd_notifier_gsi(kvm_state,
|
||||||
|
&sint_route->sint_set_notifier,
|
||||||
|
&sint_route->sint_ack_notifier, gsi);
|
||||||
|
if (r) {
|
||||||
|
goto err_irqfd;
|
||||||
|
}
|
||||||
|
sint_route->gsi = gsi;
|
||||||
|
sint_route->sint_ack_clb = sint_ack_clb;
|
||||||
|
sint_route->vcpu_id = vcpu_id;
|
||||||
|
sint_route->sint = sint;
|
||||||
|
|
||||||
|
return sint_route;
|
||||||
|
|
||||||
|
err_irqfd:
|
||||||
|
kvm_irqchip_release_virq(kvm_state, gsi);
|
||||||
|
err_gsi:
|
||||||
|
event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL);
|
||||||
|
event_notifier_cleanup(&sint_route->sint_ack_notifier);
|
||||||
|
err_sint_set_notifier:
|
||||||
|
event_notifier_cleanup(&sint_route->sint_set_notifier);
|
||||||
|
err:
|
||||||
|
g_free(sint_route);
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void kvm_hv_sint_route_destroy(HvSintRoute *sint_route)
|
||||||
|
{
|
||||||
|
kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state,
|
||||||
|
&sint_route->sint_set_notifier,
|
||||||
|
sint_route->gsi);
|
||||||
|
kvm_irqchip_release_virq(kvm_state, sint_route->gsi);
|
||||||
|
event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL);
|
||||||
|
event_notifier_cleanup(&sint_route->sint_ack_notifier);
|
||||||
|
event_notifier_cleanup(&sint_route->sint_set_notifier);
|
||||||
|
g_free(sint_route);
|
||||||
|
}
|
||||||
|
|
||||||
|
int kvm_hv_sint_route_set_sint(HvSintRoute *sint_route)
|
||||||
|
{
|
||||||
|
return event_notifier_set(&sint_route->sint_set_notifier);
|
||||||
|
}
|
42
target-i386/hyperv.h
Normal file
42
target-i386/hyperv.h
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* QEMU KVM Hyper-V support
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Andrey Smetanin <asmetanin@virtuozzo.com>
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Andrey Smetanin <asmetanin@virtuozzo.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef HYPERV_I386_H
|
||||||
|
#define HYPERV_I386_H
|
||||||
|
|
||||||
|
#include "cpu.h"
|
||||||
|
#include "sysemu/kvm.h"
|
||||||
|
#include "qemu/event_notifier.h"
|
||||||
|
|
||||||
|
typedef struct HvSintRoute HvSintRoute;
|
||||||
|
typedef void (*HvSintAckClb)(HvSintRoute *sint_route);
|
||||||
|
|
||||||
|
struct HvSintRoute {
|
||||||
|
uint32_t sint;
|
||||||
|
uint32_t vcpu_id;
|
||||||
|
int gsi;
|
||||||
|
EventNotifier sint_set_notifier;
|
||||||
|
EventNotifier sint_ack_notifier;
|
||||||
|
HvSintAckClb sint_ack_clb;
|
||||||
|
};
|
||||||
|
|
||||||
|
int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit);
|
||||||
|
|
||||||
|
HvSintRoute *kvm_hv_sint_route_create(uint32_t vcpu_id, uint32_t sint,
|
||||||
|
HvSintAckClb sint_ack_clb);
|
||||||
|
|
||||||
|
void kvm_hv_sint_route_destroy(HvSintRoute *sint_route);
|
||||||
|
|
||||||
|
int kvm_hv_sint_route_set_sint(HvSintRoute *sint_route);
|
||||||
|
|
||||||
|
#endif
|
@ -25,6 +25,8 @@
|
|||||||
#include "sysemu/kvm_int.h"
|
#include "sysemu/kvm_int.h"
|
||||||
#include "kvm_i386.h"
|
#include "kvm_i386.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "hyperv.h"
|
||||||
|
|
||||||
#include "exec/gdbstub.h"
|
#include "exec/gdbstub.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
#include "qemu/config-file.h"
|
#include "qemu/config-file.h"
|
||||||
@ -33,6 +35,7 @@
|
|||||||
#include "hw/i386/apic.h"
|
#include "hw/i386/apic.h"
|
||||||
#include "hw/i386/apic_internal.h"
|
#include "hw/i386/apic_internal.h"
|
||||||
#include "hw/i386/apic-msidef.h"
|
#include "hw/i386/apic-msidef.h"
|
||||||
|
|
||||||
#include "exec/ioport.h"
|
#include "exec/ioport.h"
|
||||||
#include "standard-headers/asm-x86/hyperv.h"
|
#include "standard-headers/asm-x86/hyperv.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
@ -2963,6 +2966,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
|
|||||||
ret = kvm_handle_debug(cpu, &run->debug.arch);
|
ret = kvm_handle_debug(cpu, &run->debug.arch);
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
break;
|
break;
|
||||||
|
case KVM_EXIT_HYPERV:
|
||||||
|
ret = kvm_hv_handle_exit(cpu, &run->hyperv);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
|
fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user