Commit 3c8c652a authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: MMU: Introduce is_last_gpte() to clean up walk_addr_generic() 



Suggested by Ingo and Avi.

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 92c1c1e8

arch/x86/kvm/paging_tmpl.h

+19 −7
Original line number Diff line number Diff line
@@ -113,6 +113,24 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte) 
	return access;

}



static bool FNAME(is_last_gpte)(struct guest_walker *walker,

				struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,

				pt_element_t gpte)

{

	if (walker->level == PT_PAGE_TABLE_LEVEL)

		return true;



	if ((walker->level == PT_DIRECTORY_LEVEL) && is_large_pte(gpte) &&

	    (PTTYPE == 64 || is_pse(vcpu)))

		return true;



	if ((walker->level == PT_PDPE_LEVEL) && is_large_pte(gpte) &&

	    (mmu->root_level == PT64_ROOT_LEVEL))

		return true;



	return false;

}



/*

 * Fetch a guest pte for a guest virtual address

 */
@@ -221,13 +239,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 


		walker->ptes[walker->level - 1] = pte;



		if ((walker->level == PT_PAGE_TABLE_LEVEL) ||

		    ((walker->level == PT_DIRECTORY_LEVEL) &&

				is_large_pte(pte) &&

				(PTTYPE == 64 || is_pse(vcpu))) ||

		    ((walker->level == PT_PDPE_LEVEL) &&

				is_large_pte(pte) &&

				mmu->root_level == PT64_ROOT_LEVEL)) {

		if (FNAME(is_last_gpte)(walker, vcpu, mmu, pte)) {

			int lvl = walker->level;

			gpa_t real_gpa;

			gfn_t gfn;