[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v8 40/44] accel: add double dispatch mechanism for class initializa
From: |
Claudio Fontana |
Subject: |
[RFC v8 40/44] accel: add double dispatch mechanism for class initialization |
Date: |
Tue, 16 Mar 2021 19:36:58 +0100 |
while on x86 all CPU classes can use the same set of TCGCPUOps,
on ARM the right accel behavior depends on the type of the CPU.
So we need a way to specialize the accel behavior according to
the CPU. Therefore, add a second initialization, after the
accel_cpu->cpu_class_init, that allows to do this.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
include/hw/core/cpu.h | 6 ++++++
accel/accel-common.c | 12 ++++++++++++
target/i386/tcg/tcg-cpu.c | 8 +++++++-
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index c68bc3ba8a..d45f78290e 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -192,6 +192,12 @@ struct CPUClass {
/* when TCG is not available, this pointer is NULL */
struct TCGCPUOps *tcg_ops;
+
+ /*
+ * if not NULL, this is called in order for the CPUClass to initialize
+ * class data that depends on the accelerator, see accel/accel-common.c.
+ */
+ void (*init_accel_cpu)(struct AccelCPUClass *accel_cpu, CPUClass *cc);
};
/*
diff --git a/accel/accel-common.c b/accel/accel-common.c
index d77c09d7b5..2103397d5e 100644
--- a/accel/accel-common.c
+++ b/accel/accel-common.c
@@ -54,10 +54,22 @@ static void accel_init_cpu_int_aux(ObjectClass *klass, void
*opaque)
CPUClass *cc = CPU_CLASS(klass);
AccelCPUClass *accel_cpu = opaque;
+ /*
+ * double dispatch. The first callback allows the accel cpu
+ * to run initializations for the CPU,
+ * the second one allows the CPU to customize the accel cpu
+ * behavior according to the CPU.
+ *
+ * The second is currently only used by TCG, to specialize the
+ * TCGCPUOps depending on the CPU type.
+ */
cc->accel_cpu = accel_cpu;
if (accel_cpu->cpu_class_init) {
accel_cpu->cpu_class_init(cc);
}
+ if (cc->init_accel_cpu) {
+ cc->init_accel_cpu(accel_cpu, cc);
+ }
}
/* initialize the arch-specific accel CpuClass interfaces */
diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c
index e311f52855..ba39531aa5 100644
--- a/target/i386/tcg/tcg-cpu.c
+++ b/target/i386/tcg/tcg-cpu.c
@@ -69,11 +69,17 @@ static struct TCGCPUOps x86_tcg_ops = {
#endif /* !CONFIG_USER_ONLY */
};
-static void tcg_cpu_class_init(CPUClass *cc)
+static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc)
{
+ /* for x86, all cpus use the same set of operations */
cc->tcg_ops = &x86_tcg_ops;
}
+static void tcg_cpu_class_init(CPUClass *cc)
+{
+ cc->init_accel_cpu = tcg_cpu_init_ops;
+}
+
/*
* TCG-specific defaults that override all CPU models when using TCG
*/
--
2.26.2
- [RFC v8 21/44] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, (continued)
- [RFC v8 21/44] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/16
- [RFC v8 23/44] target/arm: move sve_exception_el out of TCG helpers, Claudio Fontana, 2021/03/16
- [RFC v8 32/44] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/03/16
- [RFC v8 26/44] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Claudio Fontana, 2021/03/16
- [RFC v8 29/44] target/arm: cleanup cpu includes, Claudio Fontana, 2021/03/16
- [RFC v8 33/44] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/03/16
- [RFC v8 34/44] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/03/16
- [RFC v8 37/44] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/03/16
- [RFC v8 44/44] target/arm: cpu-sve: split TCG and KVM functionality, Claudio Fontana, 2021/03/16
- [RFC v8 27/44] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/03/16
- [RFC v8 40/44] accel: add double dispatch mechanism for class initialization,
Claudio Fontana <=
- [RFC v8 43/44] target/arm: cpu-sve: new module, Claudio Fontana, 2021/03/16
- [RFC v8 30/44] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/03/16
- [RFC v8 36/44] Revert "target/arm: Restrict v8M IDAU to TCG", Claudio Fontana, 2021/03/16
- [RFC v8 35/44] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/16
- [RFC v8 41/44] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/03/16
- [RFC v8 39/44] accel: move call to accel_init_interfaces, Claudio Fontana, 2021/03/16
- [RFC v8 42/44] target/arm: move TCG gt timer creation code in tcg/, Claudio Fontana, 2021/03/16
- [RFC v8 38/44] target/arm: move kvm cpu properties setting to kvm-cpu, Claudio Fontana, 2021/03/16