On Sun, 28 May 2023 21:20:33 -0700 isaku.yamahata@xxxxxxxxx wrote: > From: Isaku Yamahata <isaku.yamahata@xxxxxxxxx> > > Add a hook to setting CPUID for additional consistency check of > KVM_SET_CPUID2. > > Because intel TDX or AMD SNP has restriction on the value of cpuid. Some > value can't be changed after boot. Some can be only set at the VM > creation time and can't be changed later. Check if the new values are > consistent with the old values. > Thanks for addressing this from the discussion. The structure looks good to me. I was thinking if the patch should be separated into two parts. One is the common part so that AMD folks can include it in their patch series. Another one is TDX callback which builds on top of the common-part patch. > Suggested-by: Sean Christopherson <seanjc@xxxxxxxxxx> > Link: https://lore.kernel.org/lkml/ZDiGpCkXOcCm074O@xxxxxxxxxx/ > Signed-off-by: Isaku Yamahata <isaku.yamahata@xxxxxxxxx> > --- > arch/x86/include/asm/kvm-x86-ops.h | 1 + > arch/x86/include/asm/kvm_host.h | 1 + > arch/x86/kvm/cpuid.c | 10 ++++++ > arch/x86/kvm/cpuid.h | 2 ++ > arch/x86/kvm/vmx/main.c | 10 ++++++ > arch/x86/kvm/vmx/tdx.c | 57 ++++++++++++++++++++++++++++-- > arch/x86/kvm/vmx/tdx.h | 7 ++++ > arch/x86/kvm/vmx/x86_ops.h | 4 +++ > 8 files changed, 90 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h > index c1a4d29cf4fa..5faa13a31f59 100644 > --- a/arch/x86/include/asm/kvm-x86-ops.h > +++ b/arch/x86/include/asm/kvm-x86-ops.h > @@ -20,6 +20,7 @@ KVM_X86_OP(hardware_disable) > KVM_X86_OP(hardware_unsetup) > KVM_X86_OP_OPTIONAL_RET0(offline_cpu) > KVM_X86_OP(has_emulated_msr) > +KVM_X86_OP_OPTIONAL_RET0(vcpu_check_cpuid) > KVM_X86_OP(vcpu_after_set_cpuid) > KVM_X86_OP(is_vm_type_supported) > KVM_X86_OP_OPTIONAL(max_vcpus); > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 68ddb0da31e0..4efd9770963c 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1588,6 +1588,7 @@ struct kvm_x86_ops { > void (*hardware_unsetup)(void); > int (*offline_cpu)(void); > bool (*has_emulated_msr)(struct kvm *kvm, u32 index); > + int (*vcpu_check_cpuid)(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, int nent); > void (*vcpu_after_set_cpuid)(struct kvm_vcpu *vcpu); > > bool (*is_vm_type_supported)(unsigned long vm_type); > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 0142a73034c4..ef7c361883d7 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -414,6 +414,9 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, > } > > r = kvm_check_cpuid(vcpu, e2, nent); > + if (r) > + return r; > + r = static_call(kvm_x86_vcpu_check_cpuid)(vcpu, e2, nent); > if (r) > return r; It would be nice to move the static_call into the kvm_check_cpuid() as it is part of the process of checking cpuid. It is good enough for now as kvm_check_cpuid() only has one caller. Think if more caller of kvm_check_cpuid() shows up in the future, they need to move it into kvm_check_cpuid anyway. > > @@ -1364,6 +1367,13 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, > return r; > } > > +struct kvm_cpuid_entry2 *__kvm_find_cpuid_entry2( > + struct kvm_cpuid_entry2 *entries, int nent, u32 function, u64 index) > +{ > + return cpuid_entry2_find(entries, nent, function, index); > +} > +EXPORT_SYMBOL_GPL(__kvm_find_cpuid_entry2); > + If evetually, we have to open kvm_cpuid2 when searching the cpuid entries, I would suggest to open it in kvm_find_cpuid_entry2() instead of introducing a new __kvm_find_cpuid_entry2(). It would be nice to let kvm_find_cpuid_entry2 () to take entreis and nent in the previou patch. > struct kvm_cpuid_entry2 *kvm_find_cpuid_entry2( struct kvm_cpuid2 *cpuid, > u32 function, u32 index) > { > diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h > index a0e799297629..579675dcbbae 100644 > --- a/arch/x86/kvm/cpuid.h > +++ b/arch/x86/kvm/cpuid.h > @@ -13,6 +13,8 @@ void kvm_set_cpu_caps(void); > > void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu); > void kvm_update_pv_runtime(struct kvm_vcpu *vcpu); > +struct kvm_cpuid_entry2 *__kvm_find_cpuid_entry2(struct kvm_cpuid_entry2 *entries, > + int nent, u32 function, u64 index); > struct kvm_cpuid_entry2 *kvm_find_cpuid_entry2(struct kvm_cpuid2 *cpuid, > u32 function, u32 index); > struct kvm_cpuid_entry2 *kvm_find_cpuid_entry_index(struct kvm_vcpu *vcpu, > diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c > index de8d8c70605b..cfc7fa87a8fe 100644 > --- a/arch/x86/kvm/vmx/main.c > +++ b/arch/x86/kvm/vmx/main.c > @@ -443,6 +443,15 @@ static void vt_vcpu_deliver_init(struct kvm_vcpu *vcpu) > kvm_vcpu_deliver_init(vcpu); > } > > +static int vt_vcpu_check_cpuid(struct kvm_vcpu *vcpu, > + struct kvm_cpuid_entry2 *e2, int nent) > +{ > + if (is_td_vcpu(vcpu)) > + return tdx_vcpu_check_cpuid(vcpu, e2, nent); > + > + return 0; > +} > + > static void vt_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) > { > if (is_td_vcpu(vcpu)) > @@ -1087,6 +1096,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { > > .get_exit_info = vt_get_exit_info, > > + .vcpu_check_cpuid = vt_vcpu_check_cpuid, > .vcpu_after_set_cpuid = vt_vcpu_after_set_cpuid, > > .has_wbinvd_exit = cpu_has_vmx_wbinvd_exit, > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > index ede3b9f98243..12d6c9cacf6a 100644 > --- a/arch/x86/kvm/vmx/tdx.c > +++ b/arch/x86/kvm/vmx/tdx.c > @@ -491,6 +491,9 @@ void tdx_vm_free(struct kvm *kvm) > > free_page((unsigned long)__va(kvm_tdx->tdr_pa)); > kvm_tdx->tdr_pa = 0; > + > + kfree(kvm_tdx->cpuid); > + kvm_tdx->cpuid = NULL; > } > > static int tdx_do_tdh_mng_key_config(void *param) > @@ -608,6 +611,44 @@ int tdx_vcpu_create(struct kvm_vcpu *vcpu) > return 0; > } > > +int tdx_vcpu_check_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, int nent) > +{ > + struct kvm_tdx *kvm_tdx = to_kvm_tdx(vcpu->kvm); > + const struct tdsysinfo_struct *tdsysinfo; > + int i; > + > + tdsysinfo = tdx_get_sysinfo(); > + if (!tdsysinfo) > + return -ENOTSUPP; > + > + /* > + * Simple check that new cpuid is consistent with created one. > + * For simplicity, only trivial check. Don't try comprehensive checks > + * with the cpuid virtualization table in the TDX module spec. > + */ > + for (i = 0; i < tdsysinfo->num_cpuid_config; i++) { > + const struct tdx_cpuid_config *config = &tdsysinfo->cpuid_configs[i]; > + u32 index = config->sub_leaf == TDX_CPUID_NO_SUBLEAF ? 0: config->sub_leaf; > + const struct kvm_cpuid_entry2 *old = > + __kvm_find_cpuid_entry2(kvm_tdx->cpuid, kvm_tdx->cpuid_nent, > + config->leaf, index); > + const struct kvm_cpuid_entry2 *new = > + __kvm_find_cpuid_entry2(e2, nent, config->leaf, index); > + > + if (!!old != !!new) > + return -EINVAL; > + if (!old && !new) > + continue; > + > + if ((old->eax ^ new->eax) & config->eax || > + (old->ebx ^ new->ebx) & config->ebx || > + (old->ecx ^ new->ecx) & config->ecx || > + (old->edx ^ new->edx) & config->edx) > + return -EINVAL; > + } > + return 0; > +} Guess checkpatch.pl will complain about the length of lines above. > + > void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) > { > struct vcpu_tdx *tdx = to_tdx(vcpu); > @@ -2003,10 +2044,12 @@ static void setup_tdparams_eptp_controls(struct kvm_cpuid2 *cpuid, struct td_par > } > } > > -static void setup_tdparams_cpuids(const struct tdsysinfo_struct *tdsysinfo, > +static void setup_tdparams_cpuids(struct kvm *kvm, > + const struct tdsysinfo_struct *tdsysinfo, > struct kvm_cpuid2 *cpuid, > struct td_params *td_params) > { > + struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm); > int i; > > /* > @@ -2014,6 +2057,7 @@ static void setup_tdparams_cpuids(const struct tdsysinfo_struct *tdsysinfo, > * be same to the one of struct tdsysinfo.{num_cpuid_config, cpuid_configs} > * It's assumed that td_params was zeroed. > */ > + kvm_tdx->cpuid_nent = 0; > for (i = 0; i < tdsysinfo->num_cpuid_config; i++) { > const struct tdx_cpuid_config *config = &tdsysinfo->cpuid_configs[i]; > /* TDX_CPUID_NO_SUBLEAF in TDX CPUID_CONFIG means index = 0. */ > @@ -2035,6 +2079,10 @@ static void setup_tdparams_cpuids(const struct tdsysinfo_struct *tdsysinfo, > value->ebx = entry->ebx & config->ebx; > value->ecx = entry->ecx & config->ecx; > value->edx = entry->edx & config->edx; > + > + /* Remember the setting to check for KVM_SET_CPUID2. */ > + kvm_tdx->cpuid[kvm_tdx->cpuid_nent] = *entry; > + kvm_tdx->cpuid_nent++; > } > } > > @@ -2130,7 +2178,7 @@ static int setup_tdparams(struct kvm *kvm, struct td_params *td_params, > td_params->tsc_frequency = TDX_TSC_KHZ_TO_25MHZ(kvm->arch.default_tsc_khz); > > setup_tdparams_eptp_controls(cpuid, td_params); > - setup_tdparams_cpuids(tdsysinfo, cpuid, td_params); > + setup_tdparams_cpuids(kvm, tdsysinfo, cpuid, td_params); > ret = setup_tdparams_xfam(cpuid, td_params); > if (ret) > return ret; > @@ -2332,6 +2380,11 @@ static int tdx_td_init(struct kvm *kvm, struct kvm_tdx_cmd *cmd) > if (cmd->flags) > return -EINVAL; > > + kvm_tdx->cpuid = kzalloc(sizeof(init_vm->cpuid.entries[0]) * KVM_MAX_CPUID_ENTRIES, > + GFP_KERNEL); > + if (!kvm_tdx->cpuid) > + return -ENOMEM; > + > init_vm = kzalloc(sizeof(*init_vm) + > sizeof(init_vm->cpuid.entries[0]) * KVM_MAX_CPUID_ENTRIES, > GFP_KERNEL); kfree(kvm_tdx->cpuid) is required in the error handling path of tdx_td_init(). > diff --git a/arch/x86/kvm/vmx/tdx.h b/arch/x86/kvm/vmx/tdx.h > index ff35cd8409d9..846700a9c698 100644 > --- a/arch/x86/kvm/vmx/tdx.h > +++ b/arch/x86/kvm/vmx/tdx.h > @@ -32,6 +32,13 @@ struct kvm_tdx { > atomic_t tdh_mem_track; > > u64 tsc_offset; > + > + /* > + * For KVM_SET_CPUID to check consistency. Remember the one passed to > + * TDH.MNG_INIT > + */ > + int cpuid_nent; > + struct kvm_cpuid_entry2 *cpuid; > }; > > union tdx_exit_reason { > diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h > index b339be6b5300..e2f44f754609 100644 > --- a/arch/x86/kvm/vmx/x86_ops.h > +++ b/arch/x86/kvm/vmx/x86_ops.h > @@ -163,6 +163,8 @@ u8 tdx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio); > > void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode, > int trig_mode, int vector); > +int tdx_vcpu_check_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, > + int nent); > void tdx_inject_nmi(struct kvm_vcpu *vcpu); > void tdx_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason, > u64 *info1, u64 *info2, u32 *intr_info, u32 *error_code); > @@ -211,6 +213,8 @@ static inline u8 tdx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) > > static inline void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode, > int trig_mode, int vector) {} > +static inline int tdx_vcpu_check_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, > + int nent) { return -EOPNOTSUPP; } > static inline void tdx_inject_nmi(struct kvm_vcpu *vcpu) {} > static inline void tdx_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason, u64 *info1, > u64 *info2, u32 *intr_info, u32 *error_code) {}
