diff options
| author | Sean Christopherson <seanjc@google.com> | 2025-06-11 01:57:16 +0300 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2025-06-20 23:07:24 +0300 |
| commit | f21ff2c8c997e5f209e7165456f447293907a9a8 (patch) | |
| tree | 9c1029244d376474643071392efb1f547a38e6b4 | |
| parent | 9b72c3d59f4245dd2d3fa19025e2789e85ce0f47 (diff) | |
| download | linux-f21ff2c8c997e5f209e7165456f447293907a9a8.tar.xz | |
KVM: nSVM: Omit SEV-ES specific passthrough MSRs from L0+L1 bitmap merge
Don't merge bitmaps on nested VMRUN for MSRs that KVM passes through only
for SEV-ES guests. KVM doesn't support nested virtualization for SEV-ES,
and likely never will.
Link: https://lore.kernel.org/r/20250610225737.156318-12-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
| -rw-r--r-- | arch/x86/kvm/svm/nested.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 666469e11602..360dbd80a728 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -194,7 +194,7 @@ void recalc_intercepts(struct vcpu_svm *svm) * Hardcode the capacity of the array based on the maximum number of _offsets_. * MSRs are batched together, so there are fewer offsets than MSRs. */ -static int nested_svm_msrpm_merge_offsets[9] __ro_after_init; +static int nested_svm_msrpm_merge_offsets[6] __ro_after_init; static int nested_svm_nr_msrpm_merge_offsets __ro_after_init; int __init nested_svm_init_msrpm_merge_offsets(void) @@ -219,13 +219,6 @@ int __init nested_svm_init_msrpm_merge_offsets(void) MSR_IA32_LASTBRANCHTOIP, MSR_IA32_LASTINTFROMIP, MSR_IA32_LASTINTTOIP, - - MSR_IA32_DEBUGCTLMSR, - MSR_IA32_XSS, - MSR_EFER, - MSR_IA32_CR_PAT, - MSR_AMD64_SEV_ES_GHCB, - MSR_TSC_AUX, }; int i, j; |