cpus: protect work list with work_mutex

Protect the list of queued work items with something other than
the BQL, as a preparation for running the work items outside it.

Reviewed-by: Peter Maydell <[email protected]>
Signed-off-by: KONRAD Frederic <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/cpus.c b/cpus.c
index 4f3374e201c8c72c8235763ddcf4ec62e869fb80..ea3ffdb90004919d418132322c62cb337b833218 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -819,6 +819,8 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)
     wi.func = func;
     wi.data = data;
     wi.free = false;
     wi.func = func;
     wi.data = data;
     wi.free = false;

+
+    qemu_mutex_lock(&cpu->work_mutex);

     if (cpu->queued_work_first == NULL) {
         cpu->queued_work_first = &wi;
     } else {
     if (cpu->queued_work_first == NULL) {
         cpu->queued_work_first = &wi;
     } else {


@@ -827,9 +829,10 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)
     cpu->queued_work_last = &wi;
     wi.next = NULL;
     wi.done = false;
     cpu->queued_work_last = &wi;
     wi.next = NULL;
     wi.done = false;

+    qemu_mutex_unlock(&cpu->work_mutex);

 
     qemu_cpu_kick(cpu);
 
     qemu_cpu_kick(cpu);

-    while (!wi.done) {
+    while (!atomic_mb_read(&wi.done)) {

         CPUState *self_cpu = current_cpu;
 
         qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex);
         CPUState *self_cpu = current_cpu;
 
         qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex);


@@ -850,6 +853,8 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)
     wi->func = func;
     wi->data = data;
     wi->free = true;
     wi->func = func;
     wi->data = data;
     wi->free = true;

+
+    qemu_mutex_lock(&cpu->work_mutex);

     if (cpu->queued_work_first == NULL) {
         cpu->queued_work_first = wi;
     } else {
     if (cpu->queued_work_first == NULL) {
         cpu->queued_work_first = wi;
     } else {


@@ -858,6 +863,7 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)
     cpu->queued_work_last = wi;
     wi->next = NULL;
     wi->done = false;
     cpu->queued_work_last = wi;
     wi->next = NULL;
     wi->done = false;

+    qemu_mutex_unlock(&cpu->work_mutex);

 
     qemu_cpu_kick(cpu);
 }
 
     qemu_cpu_kick(cpu);
 }


@@ -870,15 +876,23 @@ static void flush_queued_work(CPUState *cpu)
         return;
     }
 
         return;
     }
 

-    while ((wi = cpu->queued_work_first)) {
+    qemu_mutex_lock(&cpu->work_mutex);
+    while (cpu->queued_work_first != NULL) {
+        wi = cpu->queued_work_first;

         cpu->queued_work_first = wi->next;
         cpu->queued_work_first = wi->next;

+        if (!cpu->queued_work_first) {
+            cpu->queued_work_last = NULL;
+        }
+        qemu_mutex_unlock(&cpu->work_mutex);

         wi->func(wi->data);
         wi->func(wi->data);

-        wi->done = true;
+        qemu_mutex_lock(&cpu->work_mutex);

         if (wi->free) {
             g_free(wi);
         if (wi->free) {
             g_free(wi);

+        } else {
+            atomic_mb_set(&wi->done, true);

         }
     }
         }
     }

-    cpu->queued_work_last = NULL;
+    qemu_mutex_unlock(&cpu->work_mutex);

     qemu_cond_broadcast(&qemu_work_cond);
 }
 
     qemu_cond_broadcast(&qemu_work_cond);
 }
 

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 2b4936ad2ffe75dc315fb98f8c7a2ae5fe038b18..c3d610b98885ff91b9fcf60a170e5646bb7ad397 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -243,6 +243,8 @@ struct kvm_run;
  * @mem_io_pc: Host Program Counter at which the memory was accessed.
  * @mem_io_vaddr: Target virtual address at which the memory was accessed.
  * @kvm_fd: vCPU file descriptor for KVM.
  * @mem_io_pc: Host Program Counter at which the memory was accessed.
  * @mem_io_vaddr: Target virtual address at which the memory was accessed.
  * @kvm_fd: vCPU file descriptor for KVM.

+ * @work_mutex: Lock to prevent multiple access to queued_work_*.
+ * @queued_work_first: First asynchronous work pending.

  *
  * State of one CPU core or thread.
  */
  *
  * State of one CPU core or thread.
  */


@@ -263,7 +265,6 @@ struct CPUState {
     uint32_t host_tid;
     bool running;
     struct QemuCond *halt_cond;
     uint32_t host_tid;
     bool running;
     struct QemuCond *halt_cond;

-    struct qemu_work_item *queued_work_first, *queued_work_last;

     bool thread_kicked;
     bool created;
     bool stop;
     bool thread_kicked;
     bool created;
     bool stop;


@@ -274,6 +275,9 @@ struct CPUState {
     int64_t icount_extra;
     sigjmp_buf jmp_env;
 
     int64_t icount_extra;
     sigjmp_buf jmp_env;
 

+    QemuMutex work_mutex;
+    struct qemu_work_item *queued_work_first, *queued_work_last;
+

     AddressSpace *as;
     struct AddressSpaceDispatch *memory_dispatch;
     MemoryListener *tcg_as_listener;
     AddressSpace *as;
     struct AddressSpaceDispatch *memory_dispatch;
     MemoryListener *tcg_as_listener;

diff --git a/qom/cpu.c b/qom/cpu.c
index 02b56f7076d344b63130e0f31a66c68591658d51..3841f0de5b2e2c5a60259676e2c977959af8306e 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -316,6 +316,7 @@ static void cpu_common_initfn(Object *obj)
 
     cpu->cpu_index = -1;
     cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;
 
     cpu->cpu_index = -1;
     cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;

+    qemu_mutex_init(&cpu->work_mutex);

     QTAILQ_INIT(&cpu->breakpoints);
     QTAILQ_INIT(&cpu->watchpoints);
 }
     QTAILQ_INIT(&cpu->breakpoints);
     QTAILQ_INIT(&cpu->watchpoints);
 }