188 lines
5.4 KiB
Diff
188 lines
5.4 KiB
Diff
From cb4a0164407562ac307b9ccc0031455cf1065bdb Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:45 +0200
|
|
Subject: [PATCH 036/115] kvm: Introduce kvm_arch_pre_create_vcpu()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [36/115] 1c3f6170a844694bc1d4b5d48860330d5961d26d (bonzini/rhel-qemu-kvm)
|
|
|
|
Introduce kvm_arch_pre_create_vcpu(), to perform arch-dependent
|
|
work prior to create any vcpu. This is for i386 TDX because it needs
|
|
call TDX_INIT_VM before creating any vcpu.
|
|
|
|
The specific implementation for i386 will be added in the future patch.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250508150002.689633-8-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit a668268dc08f7f4d30cecd513054bb38ce48c0d6)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
Conflicts: different context in loongarch
|
|
---
|
|
accel/kvm/kvm-all.c | 5 +++++
|
|
include/sysemu/kvm.h | 1 +
|
|
target/arm/kvm.c | 5 +++++
|
|
target/i386/kvm/kvm.c | 5 +++++
|
|
target/loongarch/kvm/kvm.c | 5 +++++
|
|
target/mips/kvm.c | 5 +++++
|
|
target/ppc/kvm.c | 5 +++++
|
|
target/riscv/kvm/kvm-cpu.c | 5 +++++
|
|
target/s390x/kvm/kvm.c | 5 +++++
|
|
9 files changed, 41 insertions(+)
|
|
|
|
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
|
|
index 49dedda47e..65952d7f4e 100644
|
|
--- a/accel/kvm/kvm-all.c
|
|
+++ b/accel/kvm/kvm-all.c
|
|
@@ -530,6 +530,11 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp)
|
|
|
|
trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu));
|
|
|
|
+ ret = kvm_arch_pre_create_vcpu(cpu, errp);
|
|
+ if (ret < 0) {
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
ret = kvm_create_vcpu(cpu);
|
|
if (ret < 0) {
|
|
error_setg_errno(errp, -ret,
|
|
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
|
|
index d9ad723f78..0e6b29b331 100644
|
|
--- a/include/sysemu/kvm.h
|
|
+++ b/include/sysemu/kvm.h
|
|
@@ -374,6 +374,7 @@ int kvm_arch_get_default_type(MachineState *ms);
|
|
|
|
int kvm_arch_init(MachineState *ms, KVMState *s);
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp);
|
|
int kvm_arch_init_vcpu(CPUState *cpu);
|
|
int kvm_arch_destroy_vcpu(CPUState *cpu);
|
|
|
|
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
|
|
index f1f1b5b375..e0469e7831 100644
|
|
--- a/target/arm/kvm.c
|
|
+++ b/target/arm/kvm.c
|
|
@@ -1860,6 +1860,11 @@ static int kvm_arm_sve_set_vls(ARMCPU *cpu)
|
|
|
|
#define ARM_CPU_ID_MPIDR 3, 0, 0, 0, 5
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
int ret;
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index bf4493dd84..1fddec6b9c 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -2039,6 +2039,11 @@ full:
|
|
abort();
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
struct {
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index 9204d4295d..f6e20dbc61 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -663,6 +663,11 @@ static void kvm_loongarch_vm_stage_change(void *opaque, bool running,
|
|
}
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
uint64_t val;
|
|
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
|
|
index a98798c669..75058f8938 100644
|
|
--- a/target/mips/kvm.c
|
|
+++ b/target/mips/kvm.c
|
|
@@ -61,6 +61,11 @@ int kvm_arch_irqchip_create(KVMState *s)
|
|
return 0;
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
CPUMIPSState *env = cpu_env(cs);
|
|
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
|
|
index 7daa097164..7a86d09802 100644
|
|
--- a/target/ppc/kvm.c
|
|
+++ b/target/ppc/kvm.c
|
|
@@ -479,6 +479,11 @@ static void kvmppc_hw_debug_points_init(CPUPPCState *cenv)
|
|
}
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
|
|
index 2bfb112be0..18ab470549 100644
|
|
--- a/target/riscv/kvm/kvm-cpu.c
|
|
+++ b/target/riscv/kvm/kvm-cpu.c
|
|
@@ -1355,6 +1355,11 @@ static int kvm_vcpu_enable_sbi_dbcn(RISCVCPU *cpu, CPUState *cs)
|
|
return kvm_set_one_reg(cs, kvm_sbi_dbcn.kvm_reg_id, ®);
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
int ret = 0;
|
|
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
|
|
index afc8d570c9..3273beff18 100644
|
|
--- a/target/s390x/kvm/kvm.c
|
|
+++ b/target/s390x/kvm/kvm.c
|
|
@@ -408,6 +408,11 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu)
|
|
return cpu->cpu_index;
|
|
}
|
|
|
|
+int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int kvm_arch_init_vcpu(CPUState *cs)
|
|
{
|
|
unsigned int max_cpus = MACHINE(qdev_get_machine())->smp.max_cpus;
|
|
--
|
|
2.50.1
|
|
|