[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [patch 11/11] qemu: basic kvm iothread support
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [patch 11/11] qemu: basic kvm iothread support |
Date: |
Thu, 02 Apr 2009 20:33:01 -0300 |
User-agent: |
quilt/0.46-1 |
Allow the iothread to run while vcpu is in guest mode.
Signed-off-by: Marcelo Tosatti <address@hidden>
Index: trunk/kvm-all.c
===================================================================
--- trunk.orig/kvm-all.c
+++ trunk/kvm-all.c
@@ -451,6 +451,7 @@ int kvm_cpu_exec(CPUState *env)
do {
kvm_arch_pre_run(env, run);
+ kvm_pre_run(env);
if (env->exit_request) {
dprintf("interrupt exit requested\n");
@@ -459,6 +460,7 @@ int kvm_cpu_exec(CPUState *env)
}
ret = kvm_vcpu_ioctl(env, KVM_RUN, 0);
+ kvm_post_run(env);
kvm_arch_post_run(env, run);
if (ret == -EINTR || ret == -EAGAIN) {
Index: trunk/kvm.h
===================================================================
--- trunk.orig/kvm.h
+++ trunk/kvm.h
@@ -27,6 +27,10 @@ extern int kvm_allowed;
struct kvm_run;
+/* main loop interface, vl.c */
+void kvm_pre_run(CPUState *env);
+void kvm_post_run(CPUState *env);
+
/* external API */
int kvm_init(int smp_cpus);
Index: trunk/target-i386/helper.c
===================================================================
--- trunk.orig/target-i386/helper.c
+++ trunk/target-i386/helper.c
@@ -1668,9 +1668,6 @@ CPUX86State *cpu_x86_init(const char *cp
#ifdef USE_KQEMU
kqemu_init(env);
#endif
- if (kvm_enabled())
- kvm_init_vcpu(env);
-
qemu_init_vcpu(env);
return env;
Index: trunk/target-ppc/helper.c
===================================================================
--- trunk.orig/target-ppc/helper.c
+++ trunk/target-ppc/helper.c
@@ -2831,8 +2831,6 @@ CPUPPCState *cpu_ppc_init (const char *c
cpu_ppc_register_internal(env, def);
cpu_ppc_reset(env);
- if (kvm_enabled())
- kvm_init_vcpu(env);
qemu_init_vcpu(env);
return env;
Index: trunk/vl.c
===================================================================
--- trunk.orig/vl.c
+++ trunk/vl.c
@@ -3791,6 +3791,8 @@ void qemu_cpu_kick(void *_env)
{
CPUState *env = _env;
qemu_cond_broadcast(env->halt_cond);
+ if (kvm_enabled())
+ qemu_thread_signal(env->thread, SIGUSR1);
}
int qemu_cpu_self(void *env)
@@ -3851,6 +3853,16 @@ static void qemu_signal_lock(unsigned in
qemu_mutex_unlock(&qemu_fair_mutex);
}
+static void qemu_mutex_lock_iothread(void)
+{
+ if (kvm_enabled()) {
+ qemu_mutex_lock(&qemu_fair_mutex);
+ qemu_mutex_lock(&qemu_global_mutex);
+ qemu_mutex_unlock(&qemu_fair_mutex);
+ } else
+ qemu_signal_lock(100);
+}
+
static int all_vcpus_paused(void)
{
CPUState *penv = first_cpu;
@@ -3900,7 +3912,7 @@ static void resume_all_vcpus(void)
static void *cpu_thread(void *arg);
-void qemu_init_vcpu(void *_env)
+static void tcg_init_vcpu(void *_env)
{
CPUState *env = _env;
/* share a single thread for all cpus with TCG */
@@ -3919,6 +3931,39 @@ void qemu_init_vcpu(void *_env)
}
}
+static void kvm_start_vcpu(CPUState *env)
+{
+ kvm_init_vcpu(env);
+ env->thread = qemu_mallocz(sizeof(QemuThread));
+ env->halt_cond = qemu_mallocz(sizeof(QemuCond));
+ qemu_cond_init(env->halt_cond);
+ qemu_thread_create(env->thread, cpu_thread, env);
+ while (env->created == 0)
+ qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100);
+}
+
+void kvm_pre_run(CPUState *env)
+{
+ cpu_single_env = NULL;
+ qemu_mutex_unlock(&qemu_global_mutex);
+}
+
+void kvm_post_run(CPUState *env)
+{
+ qemu_mutex_lock(&qemu_global_mutex);
+ cpu_single_env = env;
+}
+
+void qemu_init_vcpu(void *_env)
+{
+ CPUState *env = _env;
+
+ if (kvm_enabled())
+ kvm_start_vcpu(env);
+ else
+ tcg_init_vcpu(env);
+}
+
static void qemu_init_state(void)
{
qemu_cond_init(&qemu_pause_cond);
@@ -3985,6 +4030,7 @@ static void setup_iothread_fd(void)
#define qemu_mutex_unlock(a) do { } while(0)
#define pre_main_loop() do { } while(0)
#define qemu_init_state() do { } while(0)
+#define qemu_mutex_lock_iothread() do { } while(0)
void pause_all_vcpus(void)
{
@@ -4027,6 +4073,16 @@ int qemu_cpu_self(void *env)
{
return 1;
}
+
+void kvm_pre_run(CPUState *env)
+{
+ return;
+}
+
+void kvm_post_run(CPUState *env)
+{
+ return;
+}
#endif
#ifdef _WIN32
@@ -4128,7 +4184,7 @@ void main_loop_wait(int timeout)
*/
qemu_mutex_unlock(&qemu_global_mutex);
ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
- qemu_signal_lock(100);
+ qemu_mutex_lock_iothread();
if (ret > 0) {
IOHandlerRecord **pioh;
--
- Re: [Qemu-devel] [patch 02/11] qemu: mutex/thread/cond wrappers, (continued)
[Qemu-devel] [patch 03/11] qemu: per-arch cpu_has_work, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 07/11] qemu: handle reset/poweroff/shutdown in iothread, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 05/11] qemu: separate thread for io, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 06/11] qemu: per-cpu thread information, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 04/11] qemu: introduce main_loop_break, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 09/11] qemu: handle vmstop from cpu context, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 08/11] qemu: pause and resume cpu threads, Marcelo Tosatti, 2009/04/02
[Qemu-devel] [patch 11/11] qemu: basic kvm iothread support,
Marcelo Tosatti <=
[Qemu-devel] [patch 10/11] qemu: make iothread selectable at compile time, Marcelo Tosatti, 2009/04/02