[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] cpus: Remove the mutex parameter from do_run_on_cpu()
From: |
Peter Xu |
Subject: |
[PATCH 5/8] cpus: Remove the mutex parameter from do_run_on_cpu() |
Date: |
Tue, 21 Apr 2020 12:21:05 -0400 |
We must use the BQL for do_run_on_cpu() without much choice, it means the
parameter is helpless. Remove it. Meanwhile use the newly introduced
qemu_cond_wait_iothread() in do_run_on_cpu().
Signed-off-by: Peter Xu <address@hidden>
---
cpus-common.c | 5 ++---
cpus.c | 2 +-
include/hw/core/cpu.h | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/cpus-common.c b/cpus-common.c
index eaf590cb38..4fc11b4e1c 100644
--- a/cpus-common.c
+++ b/cpus-common.c
@@ -121,8 +121,7 @@ static void queue_work_on_cpu(CPUState *cpu, struct
qemu_work_item *wi)
qemu_cpu_kick(cpu);
}
-void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data,
- QemuMutex *mutex)
+void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data)
{
struct qemu_work_item wi;
@@ -141,7 +140,7 @@ void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func,
run_on_cpu_data data,
while (!atomic_mb_read(&wi.done)) {
CPUState *self_cpu = current_cpu;
- qemu_cond_wait(&qemu_work_cond, mutex);
+ qemu_cond_wait_iothread(&qemu_work_cond);
current_cpu = self_cpu;
}
}
diff --git a/cpus.c b/cpus.c
index 263eddc8b0..5cbc3f30de 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1140,7 +1140,7 @@ void qemu_init_cpu_loop(void)
void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data)
{
- do_run_on_cpu(cpu, func, data, &qemu_global_mutex);
+ do_run_on_cpu(cpu, func, data);
}
static void qemu_kvm_destroy_vcpu(CPUState *cpu)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 5bf94d28cf..b26fdb5ab8 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -734,12 +734,10 @@ bool cpu_is_stopped(CPUState *cpu);
* @cpu: The vCPU to run on.
* @func: The function to be executed.
* @data: Data to pass to the function.
- * @mutex: Mutex to release while waiting for @func to run.
*
* Used internally in the implementation of run_on_cpu.
*/
-void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data,
- QemuMutex *mutex);
+void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data);
/**
* run_on_cpu:
--
2.24.1
- [PATCH 0/8] memory: Sanity checks memory transaction when releasing BQL, Peter Xu, 2020/04/21
- [PATCH 1/8] memory: Introduce memory_region_transaction_{push|pop}(), Peter Xu, 2020/04/21
- [PATCH 2/8] memory: Don't do topology update in memory finalize(), Peter Xu, 2020/04/21
- [PATCH 4/8] cpus: Introduce qemu_cond_timedwait_iothread(), Peter Xu, 2020/04/21
- [PATCH 3/8] cpus: Use qemu_cond_wait_iothread() where proper, Peter Xu, 2020/04/21
- [PATCH 5/8] cpus: Remove the mutex parameter from do_run_on_cpu(),
Peter Xu <=
- [PATCH 6/8] cpus: Introduce qemu_mutex_unlock_iothread_prepare(), Peter Xu, 2020/04/21
- [PATCH 7/8] memory: Assert on no ongoing memory transaction before release BQL, Peter Xu, 2020/04/21
- [PATCH 8/8] memory: Delay the transaction pop() until commit completed, Peter Xu, 2020/04/21