[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 73/74] cpu: add async_run_on_cpu_no_bql
From: |
Robert Foley |
Subject: |
[PATCH v9 73/74] cpu: add async_run_on_cpu_no_bql |
Date: |
Thu, 21 May 2020 12:40:10 -0400 |
From: "Emilio G. Cota" <address@hidden>
Some async jobs do not need the BQL.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Robert Foley <address@hidden>
---
cpus-common.c | 39 ++++++++++++++++++++++++++++++++++-----
include/hw/core/cpu.h | 14 ++++++++++++++
2 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/cpus-common.c b/cpus-common.c
index 7ccc7df876..651f9b31cc 100644
--- a/cpus-common.c
+++ b/cpus-common.c
@@ -99,6 +99,7 @@ struct qemu_work_item {
run_on_cpu_func func;
run_on_cpu_data data;
bool free, exclusive, done;
+ bool bql;
};
/* Called with the CPU's lock held */
@@ -145,6 +146,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func,
run_on_cpu_data data)
wi.done = false;
wi.free = false;
wi.exclusive = false;
+ wi.bql = true;
cpu_mutex_lock(cpu);
queue_work_on_cpu_locked(cpu, &wi);
@@ -169,6 +171,21 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func,
run_on_cpu_data data)
wi->func = func;
wi->data = data;
wi->free = true;
+ wi->bql = true;
+
+ queue_work_on_cpu(cpu, wi);
+}
+
+void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func,
+ run_on_cpu_data data)
+{
+ struct qemu_work_item *wi;
+
+ wi = g_malloc0(sizeof(struct qemu_work_item));
+ wi->func = func;
+ wi->data = data;
+ wi->free = true;
+ /* wi->bql initialized to false */
queue_work_on_cpu(cpu, wi);
}
@@ -315,6 +332,7 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func
func,
wi->data = data;
wi->free = true;
wi->exclusive = true;
+ /* wi->bql initialized to false */
queue_work_on_cpu(cpu, wi);
}
@@ -339,6 +357,7 @@ static void process_queued_cpu_work_locked(CPUState *cpu)
* BQL, so it goes to sleep; start_exclusive() is sleeping too, so
* neither CPU can proceed.
*/
+ g_assert(!wi->bql);
if (has_bql) {
qemu_mutex_unlock_iothread();
}
@@ -349,12 +368,22 @@ static void process_queued_cpu_work_locked(CPUState *cpu)
qemu_mutex_lock_iothread();
}
} else {
- if (has_bql) {
- wi->func(cpu, wi->data);
+ if (wi->bql) {
+ if (has_bql) {
+ wi->func(cpu, wi->data);
+ } else {
+ qemu_mutex_lock_iothread();
+ wi->func(cpu, wi->data);
+ qemu_mutex_unlock_iothread();
+ }
} else {
- qemu_mutex_lock_iothread();
- wi->func(cpu, wi->data);
- qemu_mutex_unlock_iothread();
+ if (has_bql) {
+ qemu_mutex_unlock_iothread();
+ wi->func(cpu, wi->data);
+ qemu_mutex_lock_iothread();
+ } else {
+ wi->func(cpu, wi->data);
+ }
}
}
cpu_mutex_lock(cpu);
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 8478628fdb..b061618666 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -889,9 +889,23 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func,
run_on_cpu_data data);
* @data: Data to pass to the function.
*
* Schedules the function @func for execution on the vCPU @cpu asynchronously.
+ * See also: async_run_on_cpu_no_bql()
*/
void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data
data);
+/**
+ * async_run_on_cpu_no_bql:
+ * @cpu: The vCPU to run on.
+ * @func: The function to be executed.
+ * @data: Data to pass to the function.
+ *
+ * Schedules the function @func for execution on the vCPU @cpu asynchronously.
+ * This function is run outside the BQL.
+ * See also: async_run_on_cpu()
+ */
+void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func,
+ run_on_cpu_data data);
+
/**
* async_safe_run_on_cpu:
* @cpu: The vCPU to run on.
--
2.17.1
- [PATCH v9 63/74] cpu: introduce cpu_has_work_with_iothread_lock, (continued)
- [PATCH v9 63/74] cpu: introduce cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 64/74] ppc: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 65/74] mips: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 67/74] riscv: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 66/74] s390x: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 68/74] sparc: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 69/74] xtensa: convert to cpu_has_work_with_iothread_lock, Robert Foley, 2020/05/21
- [PATCH v9 70/74] cpu: rename all_cpu_threads_idle to qemu_tcg_rr_all_cpu_threads_idle, Robert Foley, 2020/05/21
- [PATCH v9 71/74] cpu: protect CPU state with cpu->lock instead of the BQL, Robert Foley, 2020/05/21
- [PATCH v9 72/74] cpus-common: release BQL earlier in run_on_cpu, Robert Foley, 2020/05/21
- [PATCH v9 73/74] cpu: add async_run_on_cpu_no_bql,
Robert Foley <=
- [PATCH v9 74/74] cputlb: queue async flush jobs without the BQL, Robert Foley, 2020/05/21