Skip to content

Commit b6bc164

Browse files
kimphillamdsean-jc
authored andcommitted
KVM: SEV: Configure "ALLOWED_SEV_FEATURES" VMCB Field
AMD EPYC 5th generation processors have introduced a feature that allows the hypervisor to control the SEV_FEATURES that are set for, or by, a guest [1]. ALLOWED_SEV_FEATURES can be used by the hypervisor to enforce that SEV-ES and SEV-SNP guests cannot enable features that the hypervisor does not want to be enabled. Always enable ALLOWED_SEV_FEATURES. A VMRUN will fail if any non-reserved bits are 1 in SEV_FEATURES but are 0 in ALLOWED_SEV_FEATURES. Some SEV_FEATURES - currently PmcVirtualization and SecureAvic (see Appendix B, Table B-4) - require an opt-in via ALLOWED_SEV_FEATURES, i.e. are off-by-default, whereas all other features are effectively on-by-default, but still honor ALLOWED_SEV_FEATURES. [1] Section 15.36.20 "Allowed SEV Features", AMD64 Architecture Programmer's Manual, Pub. 24593 Rev. 3.42 - March 2024: https://bugzilla.kernel.org/attachment.cgi?id=306250 Co-developed-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Kishon Vijay Abraham I <[email protected]> Reviewed-by: Pankaj Gupta <[email protected]> Signed-off-by: Kim Phillips <[email protected]> Reviewed-by: Tom Lendacky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent f9f27c4 commit b6bc164

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

arch/x86/include/asm/svm.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
159159
u64 avic_physical_id; /* Offset 0xf8 */
160160
u8 reserved_7[8];
161161
u64 vmsa_pa; /* Used for an SEV-ES guest */
162-
u8 reserved_8[720];
162+
u8 reserved_8[40];
163+
u64 allowed_sev_features; /* Offset 0x138 */
164+
u64 guest_sev_features; /* Offset 0x140 */
165+
u8 reserved_9[664];
163166
/*
164167
* Offset 0x3e0, 32 bytes reserved
165168
* for use by hypervisor/software.
@@ -291,6 +294,8 @@ static_assert((X2AVIC_MAX_PHYSICAL_ID & AVIC_PHYSICAL_MAX_INDEX_MASK) == X2AVIC_
291294
#define SVM_SEV_FEAT_ALTERNATE_INJECTION BIT(4)
292295
#define SVM_SEV_FEAT_DEBUG_SWAP BIT(5)
293296

297+
#define VMCB_ALLOWED_SEV_FEATURES_VALID BIT_ULL(63)
298+
294299
struct vmcb_seg {
295300
u16 selector;
296301
u16 attrib;

arch/x86/kvm/svm/sev.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4451,6 +4451,7 @@ void sev_vcpu_after_set_cpuid(struct vcpu_svm *svm)
44514451

44524452
static void sev_es_init_vmcb(struct vcpu_svm *svm)
44534453
{
4454+
struct kvm_sev_info *sev = to_kvm_sev_info(svm->vcpu.kvm);
44544455
struct vmcb *vmcb = svm->vmcb01.ptr;
44554456
struct kvm_vcpu *vcpu = &svm->vcpu;
44564457

@@ -4466,6 +4467,10 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
44664467
if (svm->sev_es.vmsa && !svm->sev_es.snp_has_guest_vmsa)
44674468
svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
44684469

4470+
if (cpu_feature_enabled(X86_FEATURE_ALLOWED_SEV_FEATURES))
4471+
svm->vmcb->control.allowed_sev_features = sev->vmsa_features |
4472+
VMCB_ALLOWED_SEV_FEATURES_VALID;
4473+
44694474
/* Can't intercept CR register access, HV can't modify CR registers */
44704475
svm_clr_intercept(svm, INTERCEPT_CR0_READ);
44714476
svm_clr_intercept(svm, INTERCEPT_CR4_READ);

arch/x86/kvm/svm/svm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,6 +3452,8 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)
34523452
pr_err("%-20s%016llx\n", "avic_logical_id:", control->avic_logical_id);
34533453
pr_err("%-20s%016llx\n", "avic_physical_id:", control->avic_physical_id);
34543454
pr_err("%-20s%016llx\n", "vmsa_pa:", control->vmsa_pa);
3455+
pr_err("%-20s%016llx\n", "allowed_sev_features:", control->allowed_sev_features);
3456+
pr_err("%-20s%016llx\n", "guest_sev_features:", control->guest_sev_features);
34553457

34563458
if (sev_es_guest(vcpu->kvm)) {
34573459
save = sev_decrypt_vmsa(vcpu);

0 commit comments

Comments
 (0)