qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
	kvm@vger.kernel.org, "Marcelo Tosatti" <mtosatti@redhat.com>,
	"Roman Kagan" <rkagan@virtuozzo.com>,
	"Andrey Smetanin" <asmetanin@virtuozzo.com>,
	"Denis V. Lunev" <den@openvz.org>,
	"Andreas Färber" <afaerber@suse.de>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 15/45] target-i386/hyperv: Hyper-V SynIC SINT routing and vcpu exit
Date: Thu, 17 Dec 2015 18:46:11 +0100	[thread overview]
Message-ID: <1450374401-31352-16-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1450374401-31352-1-git-send-email-pbonzini@redhat.com>

From: Andrey Smetanin <asmetanin@virtuozzo.com>

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>
---
 target-i386/Makefile.objs |   2 +-
 target-i386/hyperv.c      | 127 ++++++++++++++++++++++++++++++++++++++++++++++
 target-i386/hyperv.h      |  42 +++++++++++++++
 target-i386/kvm.c         |   6 +++
 4 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 target-i386/hyperv.c
 create mode 100644 target-i386/hyperv.h

diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs
index 437d997..2255f46 100644
--- a/target-i386/Makefile.objs
+++ b/target-i386/Makefile.objs
@@ -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 += gdbstub.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
diff --git a/target-i386/hyperv.c b/target-i386/hyperv.c
new file mode 100644
index 0000000..e79b173
--- /dev/null
+++ b/target-i386/hyperv.c
@@ -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);
+}
diff --git a/target-i386/hyperv.h b/target-i386/hyperv.h
new file mode 100644
index 0000000..b26201f
--- /dev/null
+++ b/target-i386/hyperv.h
@@ -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
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index ca0708a..d1c2c81 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -25,6 +25,8 @@
 #include "sysemu/kvm_int.h"
 #include "kvm_i386.h"
 #include "cpu.h"
+#include "hyperv.h"
+
 #include "exec/gdbstub.h"
 #include "qemu/host-utils.h"
 #include "qemu/config-file.h"
@@ -33,6 +35,7 @@
 #include "hw/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/i386/apic-msidef.h"
+
 #include "exec/ioport.h"
 #include "standard-headers/asm-x86/hyperv.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);
         qemu_mutex_unlock_iothread();
         break;
+    case KVM_EXIT_HYPERV:
+        ret = kvm_hv_handle_exit(cpu, &run->hyperv);
+        break;
     default:
         fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
         ret = -1;
-- 
2.5.0

  parent reply	other threads:[~2015-12-17 17:47 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17 17:45 [Qemu-devel] [PULL 00/45] KVM, memory, SCSI, qemu_log, Coverity patches for 2015-12-17 Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 01/45] exec: Eliminate qemu_ram_free_from_ptr() Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 02/45] memory: Eliminate memory_region_destructor_ram_from_ptr() Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 04/45] kvm-all: PAGE_SIZE should be real host page size Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 05/45] memory: emulate ioeventfd Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 06/45] vmw_pvscsi: Set device subsystem and revision Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 07/45] vmw_pvscsi: Change offset of msi pci capability Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 08/45] vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property Paolo Bonzini
2015-12-17 18:08   ` Eric Blake
2015-12-18  6:21     ` Shmulik Ladkani
2015-12-17 17:46 ` [Qemu-devel] [PULL 09/45] vmw_pvscsi: coding: Introduce PVSCSIClass Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 10/45] vmw_pvscsi: The pvscsi device is a PCIE endpoint Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 11/45] vmw_pvscsi: Introduce 'x-disable-pcie' backword compatability property Paolo Bonzini
2015-12-17 18:09   ` Eric Blake
2015-12-17 17:46 ` [Qemu-devel] [PULL 12/45] linux-headers: update from kvm/next Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 13/45] target-i386/kvm: Hyper-V SynIC MSR's support Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 14/45] kvm: Hyper-V SynIC irq routing support Paolo Bonzini
2015-12-17 17:46 ` Paolo Bonzini [this message]
2015-12-17 17:46 ` [Qemu-devel] [PULL 16/45] hw/misc: Hyper-V test device 'hyperv-testdev' Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 17/45] target-i386/kvm: Hyper-V SynIC timers MSR's support Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 18/45] kvm: add support for -machine kernel_irqchip=split Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 19/45] kvm: x86: add support for KVM_CAP_SPLIT_IRQCHIP Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 20/45] qemu-char: append opt to stop truncation of serial file Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 21/45] qemu-log: introduce qemu_log_separate Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 22/45] alpha: convert "naked" qemu_log to tracepoint Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 23/45] cris: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 24/45] microblaze: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 25/45] s390x: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 26/45] ppc: cleanup logging Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 27/45] tricore: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 28/45] xtensa: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 29/45] user: introduce "-d page" Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 30/45] linux-user: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 31/45] linux-user: convert DEBUG_SIGNAL logging to tracepoints Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 32/45] exec: always call qemu_get_ram_ptr within rcu_read_lock Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 33/45] exec: make qemu_ram_ptr_length more similar to qemu_get_ram_ptr Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 34/45] memory: reorder MemoryRegion fields Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 35/45] memory: avoid unnecessary object_ref/unref Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 36/45] memory: split address_space_read and address_space_write Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 37/45] memory: extract first iteration of " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 38/45] memory: inline a few small accessors Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 39/45] memory: try to inline constant-length reads Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 40/45] rcu: optimize rcu_read_lock Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 41/45] target-i386: kvm: clear unusable segments' flags in migration Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 42/45] scsi: use scsi_req_cancel_async when purging requests Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 43/45] scsi: always call notifier on async cancellation Paolo Bonzini
2015-12-18  0:57   ` Fam Zheng
2015-12-18  6:05     ` Paolo Bonzini
2015-12-18  7:51       ` Fam Zheng
2015-12-17 17:46 ` [Qemu-devel] [PULL 44/45] coverity: Model g_poll() Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 45/45] coverity: Model g_memdup() Paolo Bonzini
2015-12-17 19:55 ` [Qemu-devel] [PULL 00/45] KVM, memory, SCSI, qemu_log, Coverity patches for 2015-12-17 Peter Maydell

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=1450374401-31352-16-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=afaerber@suse.de \
    --cc=asmetanin@virtuozzo.com \
    --cc=den@openvz.org \
    --cc=ehabkost@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rkagan@virtuozzo.com \
    --cc=rth@twiddle.net \
    /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).