| Message ID | 20220317135913.2166202-10-xiaoyao.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | TDX QEMU support | expand |
On Thu, Mar 17, 2022 at 09:58:46PM +0800, Xiaoyao Li <xiaoyao.li@intel.com> wrote: > 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. > > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > accel/kvm/kvm-all.c | 7 +++++++ > include/sysemu/kvm.h | 1 + > target/arm/kvm64.c | 5 +++++ > target/i386/kvm/kvm.c | 5 +++++ > target/mips/kvm.c | 5 +++++ > target/ppc/kvm.c | 5 +++++ > target/s390x/kvm/kvm.c | 5 +++++ > 7 files changed, 33 insertions(+) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 27864dfaeaaa..a4bb449737a6 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -465,6 +465,13 @@ 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); > + if (ret < 0) { > + error_setg_errno(errp, -ret, > + "kvm_init_vcpu: kvm_arch_pre_create_vcpu() failed"); > + goto err; > + } > + > ret = kvm_get_vcpu(s, kvm_arch_vcpu_id(cpu)); > if (ret < 0) { > error_setg_errno(errp, -ret, "kvm_init_vcpu: kvm_get_vcpu failed (%lu)", > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index a783c7886811..0e94031ab7c7 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -373,6 +373,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level); > > int kvm_arch_init(MachineState *ms, KVMState *s); > > +int kvm_arch_pre_create_vcpu(CPUState *cpu); > int kvm_arch_init_vcpu(CPUState *cpu); > int kvm_arch_destroy_vcpu(CPUState *cpu); > > diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c > index ccadfbbe72be..ae7336851c62 100644 > --- a/target/arm/kvm64.c > +++ b/target/arm/kvm64.c > @@ -935,6 +935,11 @@ int kvm_arch_init_vcpu(CPUState *cs) > return kvm_arm_init_cpreg_list(cpu); > } > > +int kvm_arch_pre_create_vcpu(CPUState *cpu) > +{ > + return 0; > +} > + Weak symbol can be used to avoid update all the arch. Thanks,
On 3/19/2022 12:56 AM, Isaku Yamahata wrote: > On Thu, Mar 17, 2022 at 09:58:46PM +0800, > Xiaoyao Li <xiaoyao.li@intel.com> wrote: > >> 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. >> >> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> >> --- >> accel/kvm/kvm-all.c | 7 +++++++ >> include/sysemu/kvm.h | 1 + >> target/arm/kvm64.c | 5 +++++ >> target/i386/kvm/kvm.c | 5 +++++ >> target/mips/kvm.c | 5 +++++ >> target/ppc/kvm.c | 5 +++++ >> target/s390x/kvm/kvm.c | 5 +++++ >> 7 files changed, 33 insertions(+) >> >> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c >> index 27864dfaeaaa..a4bb449737a6 100644 >> --- a/accel/kvm/kvm-all.c >> +++ b/accel/kvm/kvm-all.c >> @@ -465,6 +465,13 @@ 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); >> + if (ret < 0) { >> + error_setg_errno(errp, -ret, >> + "kvm_init_vcpu: kvm_arch_pre_create_vcpu() failed"); >> + goto err; >> + } >> + >> ret = kvm_get_vcpu(s, kvm_arch_vcpu_id(cpu)); >> if (ret < 0) { >> error_setg_errno(errp, -ret, "kvm_init_vcpu: kvm_get_vcpu failed (%lu)", >> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h >> index a783c7886811..0e94031ab7c7 100644 >> --- a/include/sysemu/kvm.h >> +++ b/include/sysemu/kvm.h >> @@ -373,6 +373,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level); >> >> int kvm_arch_init(MachineState *ms, KVMState *s); >> >> +int kvm_arch_pre_create_vcpu(CPUState *cpu); >> int kvm_arch_init_vcpu(CPUState *cpu); >> int kvm_arch_destroy_vcpu(CPUState *cpu); >> >> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c >> index ccadfbbe72be..ae7336851c62 100644 >> --- a/target/arm/kvm64.c >> +++ b/target/arm/kvm64.c >> @@ -935,6 +935,11 @@ int kvm_arch_init_vcpu(CPUState *cs) >> return kvm_arm_init_cpreg_list(cpu); >> } >> >> +int kvm_arch_pre_create_vcpu(CPUState *cpu) >> +{ >> + return 0; >> +} >> + > > Weak symbol can be used to avoid update all the arch. OK. will use __attribute__ ((weak)) > Thanks,
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 27864dfaeaaa..a4bb449737a6 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -465,6 +465,13 @@ 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); + if (ret < 0) { + error_setg_errno(errp, -ret, + "kvm_init_vcpu: kvm_arch_pre_create_vcpu() failed"); + goto err; + } + ret = kvm_get_vcpu(s, kvm_arch_vcpu_id(cpu)); if (ret < 0) { error_setg_errno(errp, -ret, "kvm_init_vcpu: kvm_get_vcpu failed (%lu)", diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a783c7886811..0e94031ab7c7 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -373,6 +373,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level); int kvm_arch_init(MachineState *ms, KVMState *s); +int kvm_arch_pre_create_vcpu(CPUState *cpu); int kvm_arch_init_vcpu(CPUState *cpu); int kvm_arch_destroy_vcpu(CPUState *cpu); diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ccadfbbe72be..ae7336851c62 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -935,6 +935,11 @@ int kvm_arch_init_vcpu(CPUState *cs) return kvm_arm_init_cpreg_list(cpu); } +int kvm_arch_pre_create_vcpu(CPUState *cpu) +{ + return 0; +} + int kvm_arch_destroy_vcpu(CPUState *cs) { return 0; diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index ddbe8f64fadb..7bd5589e1e6c 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2102,6 +2102,11 @@ int kvm_arch_init_vcpu(CPUState *cs) return r; } +int kvm_arch_pre_create_vcpu(CPUState *cpu) +{ + return 0; +} + int kvm_arch_destroy_vcpu(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 086debd9f013..0647fe7c654a 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -92,6 +92,11 @@ int kvm_arch_init_vcpu(CPUState *cs) return ret; } +int kvm_arch_pre_create_vcpu(CPUState *cpu) +{ + return 0; +} + int kvm_arch_destroy_vcpu(CPUState *cs) { return 0; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index dc93b99189ea..c14a20b80f12 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -507,6 +507,11 @@ int kvm_arch_init_vcpu(CPUState *cs) return ret; } +int kvm_arch_pre_create_vcpu(CPUState *cpu) +{ + return 0; +} + int kvm_arch_destroy_vcpu(CPUState *cs) { return 0; diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 6acf14d5ecb4..8170c5fad0b8 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -405,6 +405,11 @@ int kvm_arch_init_vcpu(CPUState *cs) return 0; } +int kvm_arch_pre_create_vcpu(CPUState *cpu) +{ + return 0; +} + int kvm_arch_destroy_vcpu(CPUState *cs) { S390CPU *cpu = S390_CPU(cs);
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. Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- accel/kvm/kvm-all.c | 7 +++++++ include/sysemu/kvm.h | 1 + target/arm/kvm64.c | 5 +++++ target/i386/kvm/kvm.c | 5 +++++ target/mips/kvm.c | 5 +++++ target/ppc/kvm.c | 5 +++++ target/s390x/kvm/kvm.c | 5 +++++ 7 files changed, 33 insertions(+)