Commit 7a8f7c1f authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: x86: nSVM: always intercept x2apic msrs 



As a preparation for x2avic, this patch ensures that x2apic msrs
are always intercepted for the nested guest.

Reviewed-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Tested-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20220519102709.24125-11-suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 05c4fe8c

arch/x86/kvm/svm/nested.c

+5 −0
Original line number Diff line number Diff line
@@ -230,6 +230,11 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) 
			break;



		p      = msrpm_offsets[i];



		/* x2apic msrs are intercepted always for the nested guest */

		if (is_x2apic_msrpm_offset(p))

			continue;



		offset = svm->nested.ctl.msrpm_base_pa + (p * 4);



		if (kvm_vcpu_read_guest(&svm->vcpu, offset, &value, 4))

arch/x86/kvm/svm/svm.h

+9 −0
Original line number Diff line number Diff line
@@ -521,6 +521,15 @@ static inline bool nested_npt_enabled(struct vcpu_svm *svm) 
	return svm->nested.ctl.nested_ctl & SVM_NESTED_CTL_NP_ENABLE;

}



static inline bool is_x2apic_msrpm_offset(u32 offset)

{

	/* 4 msrs per u8, and 4 u8 in u32 */

	u32 msr = offset * 16;



	return (msr >= APIC_BASE_MSR) &&

	       (msr < (APIC_BASE_MSR + 0x100));

}



/* svm.c */

#define MSR_INVALID				0xffffffffU