Commit dc46515c authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move illegal GPA helper out of the MMU code 



Rename kvm_mmu_is_illegal_gpa() to kvm_vcpu_is_illegal_gpa() and move it
to cpuid.h so that's it's colocated with cpuid_maxphyaddr().  The helper
is not MMU specific and will gain a user that is completely unrelated to
the MMU in a future patch.

No functional change intended.

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200924194250.19137-5-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1cc6cbc3

arch/x86/kvm/cpuid.h

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ static inline int cpuid_maxphyaddr(struct kvm_vcpu *vcpu) 
	return vcpu->arch.maxphyaddr;

}



static inline bool kvm_vcpu_is_illegal_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)

{

	return (gpa >= BIT_ULL(cpuid_maxphyaddr(vcpu)));

}



struct cpuid_reg {

	u32 function;

	u32 index;

arch/x86/kvm/mmu.h

+0 −5
Original line number Diff line number Diff line
@@ -155,11 +155,6 @@ static inline bool is_write_protection(struct kvm_vcpu *vcpu) 
	return kvm_read_cr0_bits(vcpu, X86_CR0_WP);

}



static inline bool kvm_mmu_is_illegal_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)

{

        return (gpa >= BIT_ULL(cpuid_maxphyaddr(vcpu)));

}



/*

 * Check if a given access (described through the I/D, W/R and U/S bits of a

 * page fault error code pfec) causes a permission fault with the given PTE

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access, 
                                  struct x86_exception *exception)

{

	/* Check if guest physical address doesn't exceed guest maximum */

	if (kvm_mmu_is_illegal_gpa(vcpu, gpa)) {

	if (kvm_vcpu_is_illegal_gpa(vcpu, gpa)) {

		exception->error_code |= PFERR_RSVD_MASK;

		return UNMAPPED_GVA;

	}

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -5314,7 +5314,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) 
	 * would also use advanced VM-exit information for EPT violations to

	 * reconstruct the page fault error code.

	 */

	if (unlikely(kvm_mmu_is_illegal_gpa(vcpu, gpa)))

	if (unlikely(kvm_vcpu_is_illegal_gpa(vcpu, gpa)))

		return kvm_emulate_instruction(vcpu, 0);



	return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE