KVM: SVM: Update cr3_lm_rsvd_bits for AMD SEV guests (96308b06) · Commits · 戴 / test

For AMD SEV guests, update the cr3_lm_rsvd_bits to mask the memory encryption bit in reserved bits. Signed-off-by:

Babu Moger <babu.moger@amd.com> Message-Id: <160521948301.32054.5783800787423231162.stgit@bmoger-ubuntu> Signed-off-by:

arch/x86/kvm/svm/svm.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -3741,6 +3741,7 @@ static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)
		static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
		{
		struct vcpu_svm *svm = to_svm(vcpu);
		struct kvm_cpuid_entry2 *best;

		vcpu->arch.xsaves_enabled = guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
		boot_cpu_has(X86_FEATURE_XSAVE) &&
		@@ -3753,6 +3754,13 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
		/* Check again if INVPCID interception if required */
		svm_check_invpcid(svm);

		/* For sev guests, the memory encryption bit is not reserved in CR3. */
		if (sev_guest(vcpu->kvm)) {
		best = kvm_find_cpuid_entry(vcpu, 0x8000001F, 0);
		if (best)
		vcpu->arch.cr3_lm_rsvd_bits &= ~(1UL << (best->ebx & 0x3f));
		}

		if (!kvm_vcpu_apicv_active(vcpu))
		return;