On Wed, Apr 24, 2024 at 01:21:49PM -0700, Sean Christopherson wrote: > On Sun, Apr 21, 2024, Michael Roth wrote: > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > > index 6e31cb408dd8..1d2264e93afe 100644 > > --- a/arch/x86/kvm/svm/sev.c > > +++ b/arch/x86/kvm/svm/sev.c > > @@ -33,9 +33,11 @@ > > #include "cpuid.h" > > #include "trace.h" > > > > -#define GHCB_VERSION_MAX 1ULL > > +#define GHCB_VERSION_MAX 2ULL > > #define GHCB_VERSION_MIN 1ULL > > This needs a userspace control. Being unable to limit the GHCB version advertised > to the guest is going to break live migration of SEV-ES VMs, e.g. if a pool of > hosts has some kernels running this flavor of KVM, and some hosts running an > older KVM that doesn't support v2. > The requirements for implementing the non-SNP aspects of the GHCB version 2 protocol are fairly minimal, and KVM_SEV_INIT2 is already migration incompatible with older kernels running KVM_SEV_ES_INIT (e.g. migrate to newer host, shutdown, start -> measurement failure). There are QEMU patches here that allow for controlling this via QEMU versioned machine types to handle this [1] So I think it makes sense to go ahead move to GHCB version 2 as the base version for all SEV-ES/SNP guests created via KVM_SEV_INIT2, and leave KVM_SEV_ES_INIT restricted to GHCB version 1. This could be done in a pretty self-contained way for SEV-ES by applying the following patches from this series which are the version 2 protocol interfaces also applicable to SEV-ES: KVM: SEV: Add GHCB handling for Hypervisor Feature Support requests KVM: SEV: Add support to handle AP reset MSR protocol KVM: SEV: Add support for GHCB-based termination requests And then applying the below patch on top to set GHCB version 1 or 2 accordingly for SEV-ES. (and relocating the GHCB_VERSION_MAX bump to the below patch as well, although it's not really used at that point so could also just be dropped completely). Then in the future we can extend KVM_SEV_INIT2 to allow specifying specific/newer versions of the GHCB protocol when that becomes needed. If that sounds appropriate I can submit as a separate standalone patchset for SEV-ES and then make that a prereq for the remaining SNP-specific bits. -Mike [1] https://lore.kernel.org/kvm/20240409230743.962513-1-michael.roth@xxxxxxx/ commit 114da695c065595f74fe8aa0e9203f3c65175a95 Author: Michael Roth <michael.roth@xxxxxxx> Date: Thu Apr 25 14:42:17 2024 -0500 KVM: SEV: Allow per-instance tracking of GHCB protocol version The GHCB protocol version may be different from one guest to the next. Add a field to track it and initialize it accordingly when KVM_SEV_INIT, KVM_SEV_ES_INIT, and KVM_SEV_INIT2 are called. Signed-off-by: Michael Roth <michael.roth@xxxxxxx> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 1137a7f4136b..5c16abc47541 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -310,7 +310,7 @@ static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) static int __sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp, struct kvm_sev_init *data, - unsigned long vm_type) + unsigned long vm_type, u16 ghcb_version) { struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; struct sev_platform_init_args init_args = {0}; @@ -333,6 +333,7 @@ static int __sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp, sev->active = true; sev->es_active = es_active; sev->vmsa_features = data->vmsa_features; + sev->ghcb_version = ghcb_version; if (vm_type == KVM_X86_SNP_VM) sev->vmsa_features |= SVM_SEV_FEAT_SNP_ACTIVE; @@ -376,7 +377,13 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) return -EINVAL; vm_type = (argp->id == KVM_SEV_INIT ? KVM_X86_SEV_VM : KVM_X86_SEV_ES_VM); - return __sev_guest_init(kvm, argp, &data, vm_type); + + /* + * KVM_SEV_ES_INIT has been deprecated by KVM_SEV_INIT2, so it will + * continue to only ever support the minimal GHCB protocol version. + */ + return __sev_guest_init(kvm, argp, &data, vm_type, + vm_type == KVM_X86_SEV_ES_VM ? GHCB_VERSION_MIN : 0); } static int sev_guest_init2(struct kvm *kvm, struct kvm_sev_cmd *argp) @@ -395,7 +402,15 @@ static int sev_guest_init2(struct kvm *kvm, struct kvm_sev_cmd *argp) if (copy_from_user(&data, u64_to_user_ptr(argp->data), sizeof(data))) return -EFAULT; - return __sev_guest_init(kvm, argp, &data, kvm->arch.vm_type); + /* + * Currently KVM supports the full range of mandatory features defined by + * version 2 of the GHCB protocol, so default to that for SEV/SNP guests + * created via KVM_SEV_INIT2. Care should be taken that support for future + * versions of the GHCB protocol are configurable via KVM_SEV_INIT2 to + * allow limiting the guests to a particular version to support things + * like live migration. + */ + return __sev_guest_init(kvm, argp, &data, kvm->arch.vm_type, 2); } static int sev_bind_asid(struct kvm *kvm, unsigned int handle, int *error) @@ -3906,6 +3921,7 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm) { struct vmcb_control_area *control = &svm->vmcb->control; struct kvm_vcpu *vcpu = &svm->vcpu; + struct kvm_sev_info *sev = &to_kvm_svm(vcpu->kvm)->sev_info; u64 ghcb_info; int ret = 1; @@ -3916,7 +3932,7 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm) switch (ghcb_info) { case GHCB_MSR_SEV_INFO_REQ: - set_ghcb_msr(svm, GHCB_MSR_SEV_INFO(GHCB_VERSION_MAX, + set_ghcb_msr(svm, GHCB_MSR_SEV_INFO(sev->ghcb_version, GHCB_VERSION_MIN, sev_enc_bit)); break; @@ -4341,11 +4357,14 @@ void sev_init_vmcb(struct vcpu_svm *svm) void sev_es_vcpu_reset(struct vcpu_svm *svm) { + struct kvm_vcpu *vcpu = &svm->vcpu; + struct kvm_sev_info *sev = &to_kvm_svm(vcpu->kvm)->sev_info; + /* * Set the GHCB MSR value as per the GHCB specification when emulating * vCPU RESET for an SEV-ES guest. */ - set_ghcb_msr(svm, GHCB_MSR_SEV_INFO(GHCB_VERSION_MAX, + set_ghcb_msr(svm, GHCB_MSR_SEV_INFO(sev->ghcb_version, GHCB_VERSION_MIN, sev_enc_bit)); diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 28140bc8af27..229cb630b540 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -87,6 +87,7 @@ struct kvm_sev_info { struct list_head regions_list; /* List of registered regions */ u64 ap_jump_table; /* SEV-ES AP Jump Table address */ u64 vmsa_features; + u64 ghcb_version; /* Highest guest GHCB protocol version allowed */ struct kvm *enc_context_owner; /* Owner of copied encryption context */ struct list_head mirror_vms; /* List of VMs mirroring */ struct list_head mirror_entry; /* Use as a list entry of mirrors */
