Commit bf03d4f9 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: introduce is_pae_paging 



Checking for 32-bit PAE is quite common around code that fiddles with
the PDPTRs.  Add a function to compress all checks into a single
invocation.

Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c27e5b0d

arch/x86/kvm/vmx/nested.c

+1 −2
Original line number Diff line number Diff line
@@ -961,8 +961,7 @@ static int nested_vmx_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool ne 
		 * If PAE paging and EPT are both on, CR3 is not used by the CPU and

		 * must not be dereferenced.

		 */

		if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu) &&

		    !nested_ept) {

		if (is_pae_paging(vcpu) && !nested_ept) {

			if (!load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3)) {

				*entry_failure_code = ENTRY_FAIL_PDPTE;

				return -EINVAL;

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2767,7 +2767,7 @@ static void ept_load_pdptrs(struct kvm_vcpu *vcpu) 
		      (unsigned long *)&vcpu->arch.regs_dirty))

		return;



	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {

	if (is_pae_paging(vcpu)) {

		vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]);

		vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]);

		vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]);
@@ -2779,7 +2779,7 @@ void ept_save_pdptrs(struct kvm_vcpu *vcpu) 
{

	struct kvm_mmu *mmu = vcpu->arch.walk_mmu;



	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {

	if (is_pae_paging(vcpu)) {

		mmu->pdptrs[0] = vmcs_read64(GUEST_PDPTR0);

		mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1);

		mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2);

arch/x86/kvm/x86.c

+4 −4
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu) 
	gfn_t gfn;

	int r;



	if (is_long_mode(vcpu) || !is_pae(vcpu) || !is_paging(vcpu))

	if (!is_pae_paging(vcpu))

		return false;



	if (!test_bit(VCPU_EXREG_PDPTR,
@@ -962,7 +962,7 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) 
	if (is_long_mode(vcpu) &&

	    (cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)))

		return 1;

	else if (is_pae(vcpu) && is_paging(vcpu) &&

	else if (is_pae_paging(vcpu) &&

		 !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))

		return 1;
@@ -8596,7 +8596,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) 
		kvm_update_cpuid(vcpu);



	idx = srcu_read_lock(&vcpu->kvm->srcu);

	if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu)) {

	if (is_pae_paging(vcpu)) {

		load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu));

		mmu_reset_needed = 1;

	}

arch/x86/kvm/x86.h

+5 −0
Original line number Diff line number Diff line
@@ -139,6 +139,11 @@ static inline int is_paging(struct kvm_vcpu *vcpu) 
	return likely(kvm_read_cr0_bits(vcpu, X86_CR0_PG));

}



static inline bool is_pae_paging(struct kvm_vcpu *vcpu)

{

	return !is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu);

}



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);