kvm/svm: Setup MCG_CAP on AMD properly (74f16909) · Commits · 戴 / test

MCG_CAP[63:9] bits are reserved on AMD. However, on an AMD guest, this MSR returns 0x100010a. More specifically, bit 24 is set, which is simply wrong. That bit is MCG_SER_P and is present only on Intel. Thus, clean up the reserved bits in order not to confuse guests. Signed-off-by:

Borislav Petkov <bp@suse.de> Cc: Joerg Roedel <joro@8bytes.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/svm.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -5256,6 +5256,12 @@ static inline void avic_post_state_restore(struct kvm_vcpu *vcpu)
		avic_handle_ldr_update(vcpu);
		}

		static void svm_setup_mce(struct kvm_vcpu *vcpu)
		{
		/* [63:9] are reserved. */
		vcpu->arch.mcg_cap &= 0x1ff;
		}

		static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
		.cpu_has_kvm_support = has_svm,
		.disabled_by_bios = is_disabled,
		@@ -5367,6 +5373,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
		.pmu_ops = &amd_pmu_ops,
		.deliver_posted_interrupt = svm_deliver_avic_intr,
		.update_pi_irte = svm_update_pi_irte,
		.setup_mce = svm_setup_mce,
		};

		static int __init svm_init(void)

Admin message