[PATCH 1/2] don't start cpu main loop while there is still init work to do.

[Glauber Costa <glommer@xxxxxxxxxx>]

As soon as we call kvm_init_vcpu(), we start the vcpu thread.
However, there is still things that has to be done, as soon
as the new CPUState is created. Examples include initializing the
apic, halting the cpu, etc.

Without this patch, it is possible that the cpu may want to start
using those things, before initializing them, leading to segfaults.
We introduce another state variable, "initialized", meaning that
the cpu is already created, but not totally initialized,
to serialize it.

Before this patch:
(qemu) cpu_set X online => segfaults ~ 80 % of the time
After this patch:
(qemu) cpu_set X online => works.

Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx>
---
 qemu/cpu-defs.h |    1 +
 qemu/hw/pc.c    |    1 +
 qemu/qemu-kvm.c |   11 +++++++++++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/qemu/cpu-defs.h b/qemu/cpu-defs.h
index f439ac0..83bddad 100644
--- a/qemu/cpu-defs.h
+++ b/qemu/cpu-defs.h
@@ -170,6 +170,7 @@ struct KVMCPUState {
     int stop;
     int stopped;
     int created;
+    int initialized;
     struct qemu_work_item *queued_work_first, *queued_work_last;
 };
 
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 19d75b9..64e6ca5 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -800,6 +800,7 @@ CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled)
         if (pci_enabled) {
             apic_init(env);
         }
+    kvm_signal_vcpu_creation(env);
 	return env;
 }
 
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index ed76367..c032618 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -37,6 +37,7 @@ kvm_context_t kvm_context;
 
 pthread_mutex_t qemu_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t qemu_vcpu_cond = PTHREAD_COND_INITIALIZER;
+pthread_cond_t qemu_vcpu_init_cond = PTHREAD_COND_INITIALIZER;
 pthread_cond_t qemu_system_cond = PTHREAD_COND_INITIALIZER;
 pthread_cond_t qemu_pause_cond = PTHREAD_COND_INITIALIZER;
 pthread_cond_t qemu_work_cond = PTHREAD_COND_INITIALIZER;
@@ -439,12 +440,22 @@ static void *ap_main_loop(void *_env)
     /* and wait for machine initialization */
     while (!qemu_system_ready)
 	qemu_cond_wait(&qemu_system_cond);
+
+    while (!env->kvm_cpu_state.initialized)
+	qemu_cond_wait(&qemu_vcpu_init_cond);
+
     pthread_mutex_unlock(&qemu_mutex);
 
     kvm_main_loop_cpu(env);
     return NULL;
 }
 
+void kvm_signal_vcpu_creation(CPUState *env)
+{
+    env->kvm_cpu_state.initialized = 1;
+    pthread_cond_signal(&qemu_vcpu_init_cond);
+}
+
 void kvm_init_vcpu(CPUState *env)
 {
     pthread_create(&env->kvm_cpu_state.thread, NULL, ap_main_loop, env);
-- 
1.5.6.6

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html