Commit 20c466b5 authored by Dong, Eddie's avatar Dong, Eddie Committed by Avi Kivity
Browse files

KVM: Use rsvd_bits_mask in load_pdptrs() 



Also remove bit 5-6 from rsvd_bits_mask per latest SDM.

Signed-off-by: default avatarEddie Dong <Eddie.Dong@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 93ba03c2

arch/x86/kvm/mmu.c

+3 −5
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ static int is_nx(struct kvm_vcpu *vcpu) 
	return vcpu->arch.shadow_efer & EFER_NX;

}



static int is_present_pte(unsigned long pte)

{

	return pte & PT_PRESENT_MASK;

}



static int is_shadow_present_pte(u64 pte)

{

	return pte != shadow_trap_nonpresent_pte
@@ -2195,6 +2190,9 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		context->rsvd_bits_mask[1][0] = ~0ull;

		break;

	case PT32E_ROOT_LEVEL:

		context->rsvd_bits_mask[0][2] =

			rsvd_bits(maxphyaddr, 63) |

			rsvd_bits(7, 8) | rsvd_bits(1, 2);	/* PDPTE */

		context->rsvd_bits_mask[0][1] = exb_bit_rsvd |

			rsvd_bits(maxphyaddr, 62);		/* PDE */

		context->rsvd_bits_mask[0][0] = exb_bit_rsvd |

arch/x86/kvm/mmu.h

+5 −0
Original line number Diff line number Diff line
@@ -75,4 +75,9 @@ static inline int is_paging(struct kvm_vcpu *vcpu) 
	return vcpu->arch.cr0 & X86_CR0_PG;

}



static inline int is_present_pte(unsigned long pte)

{

	return pte & PT_PRESENT_MASK;

}



#endif

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -234,7 +234,8 @@ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3) 
		goto out;

	}

	for (i = 0; i < ARRAY_SIZE(pdpte); ++i) {

		if ((pdpte[i] & 1) && (pdpte[i] & 0xfffffff0000001e6ull)) {

		if (is_present_pte(pdpte[i]) &&

		    (pdpte[i] & vcpu->arch.mmu.rsvd_bits_mask[0][2])) {

			ret = 0;

			goto out;

		}