Skip to content

Commit a26b7cd

Browse files
mdrothbonzini
authored andcommitted
KVM: SEV: Do not intercept accesses to MSR_IA32_XSS for SEV-ES guests
When intercepts are enabled for MSR_IA32_XSS, the host will swap in/out the guest-defined values while context-switching to/from guest mode. However, in the case of SEV-ES, vcpu->arch.guest_state_protected is set, so the guest-defined value is effectively ignored when switching to guest mode with the understanding that the VMSA will handle swapping in/out this register state. However, SVM is still configured to intercept these accesses for SEV-ES guests, so the values in the initial MSR_IA32_XSS are effectively read-only, and a guest will experience undefined behavior if it actually tries to write to this MSR. Fortunately, only CET/shadowstack makes use of this register on SEV-ES-capable systems currently, which isn't yet widely used, but this may become more of an issue in the future. Additionally, enabling intercepts of MSR_IA32_XSS results in #VC exceptions in the guest in certain paths that can lead to unexpected #VC nesting levels. One example is SEV-SNP guests when handling #VC exceptions for CPUID instructions involving leaf 0xD, subleaf 0x1, since they will access MSR_IA32_XSS as part of servicing the CPUID #VC, then generate another #VC when accessing MSR_IA32_XSS, which can lead to guest crashes if an NMI occurs at that point in time. Running perf on a guest while it is issuing such a sequence is one example where these can be problematic. Address this by disabling intercepts of MSR_IA32_XSS for SEV-ES guests if the host/guest configuration allows it. If the host/guest configuration doesn't allow for MSR_IA32_XSS, leave it intercepted so that it can be caught by the existing checks in kvm_{set,get}_msr_common() if the guest still attempts to access it. Fixes: 376c6d2 ("KVM: SVM: Provide support for SEV-ES vCPU creation/loading") Cc: Alexey Kardashevskiy <aik@amd.com> Suggested-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Michael Roth <michael.roth@amd.com> Message-Id: <20231016132819.1002933-4-michael.roth@amd.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent e39120a commit a26b7cd

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

arch/x86/kvm/svm/sev.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,6 +2972,25 @@ static void sev_es_vcpu_after_set_cpuid(struct vcpu_svm *svm)
29722972

29732973
set_msr_interception(vcpu, svm->msrpm, MSR_TSC_AUX, v_tsc_aux, v_tsc_aux);
29742974
}
2975+
2976+
/*
2977+
* For SEV-ES, accesses to MSR_IA32_XSS should not be intercepted if
2978+
* the host/guest supports its use.
2979+
*
2980+
* guest_can_use() checks a number of requirements on the host/guest to
2981+
* ensure that MSR_IA32_XSS is available, but it might report true even
2982+
* if X86_FEATURE_XSAVES isn't configured in the guest to ensure host
2983+
* MSR_IA32_XSS is always properly restored. For SEV-ES, it is better
2984+
* to further check that the guest CPUID actually supports
2985+
* X86_FEATURE_XSAVES so that accesses to MSR_IA32_XSS by misbehaved
2986+
* guests will still get intercepted and caught in the normal
2987+
* kvm_emulate_rdmsr()/kvm_emulated_wrmsr() paths.
2988+
*/
2989+
if (guest_can_use(vcpu, X86_FEATURE_XSAVES) &&
2990+
guest_cpuid_has(vcpu, X86_FEATURE_XSAVES))
2991+
set_msr_interception(vcpu, svm->msrpm, MSR_IA32_XSS, 1, 1);
2992+
else
2993+
set_msr_interception(vcpu, svm->msrpm, MSR_IA32_XSS, 0, 0);
29752994
}
29762995

29772996
void sev_vcpu_after_set_cpuid(struct vcpu_svm *svm)

arch/x86/kvm/svm/svm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ static const struct svm_direct_access_msrs {
103103
{ .index = MSR_IA32_LASTBRANCHTOIP, .always = false },
104104
{ .index = MSR_IA32_LASTINTFROMIP, .always = false },
105105
{ .index = MSR_IA32_LASTINTTOIP, .always = false },
106+
{ .index = MSR_IA32_XSS, .always = false },
106107
{ .index = MSR_EFER, .always = false },
107108
{ .index = MSR_IA32_CR_PAT, .always = false },
108109
{ .index = MSR_AMD64_SEV_ES_GHCB, .always = true },

arch/x86/kvm/svm/svm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define IOPM_SIZE PAGE_SIZE * 3
3131
#define MSRPM_SIZE PAGE_SIZE * 2
3232

33-
#define MAX_DIRECT_ACCESS_MSRS 46
33+
#define MAX_DIRECT_ACCESS_MSRS 47
3434
#define MSRPM_OFFSETS 32
3535
extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly;
3636
extern bool npt_enabled;

0 commit comments

Comments
 (0)