Commit 84754cd8 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: cleanup FNAME(fetch)() functions 



Cleanup this function that we are already get the direct sp's access

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 9e7b0e7f

arch/x86/kvm/paging_tmpl.h

+8 −11
Original line number Diff line number Diff line
@@ -306,12 +306,18 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
	gfn_t table_gfn;

	int r;

	int level;

	bool dirty = is_dirty_gpte(gw->ptes[gw->level - 1]);

	unsigned direct_access;

	pt_element_t curr_pte;

	struct kvm_shadow_walk_iterator iterator;



	if (!is_present_gpte(gw->ptes[gw->level - 1]))

		return NULL;



	direct_access = gw->pt_access & gw->pte_access;

	if (!dirty)

		direct_access &= ~ACC_WRITE_MASK;



	for_each_shadow_entry(vcpu, addr, iterator) {

		level = iterator.level;

		sptep = iterator.sptep;
@@ -319,15 +325,13 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
			mmu_set_spte(vcpu, sptep, access,

				     gw->pte_access & access,

				     user_fault, write_fault,

				     is_dirty_gpte(gw->ptes[gw->level-1]),

				     ptwrite, level,

				     dirty, ptwrite, level,

				     gw->gfn, pfn, false, true);

			break;

		}



		if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep)) {

			struct kvm_mmu_page *child;

			unsigned direct_access;



			if (level != gw->level)

				continue;
@@ -339,10 +343,6 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
			 * so we should update the spte at this point to get

			 * a new sp with the correct access.

			 */

			direct_access = gw->pt_access & gw->pte_access;

			if (!is_dirty_gpte(gw->ptes[gw->level - 1]))

				direct_access &= ~ACC_WRITE_MASK;



			child = page_header(*sptep & PT64_BASE_ADDR_MASK);

			if (child->role.access == direct_access)

				continue;
@@ -359,11 +359,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		}



		if (level <= gw->level) {

			int delta = level - gw->level + 1;

			direct = 1;

			if (!is_dirty_gpte(gw->ptes[level - delta]))

				access &= ~ACC_WRITE_MASK;

			access &= gw->pte_access;

			access = direct_access;



			/*

			 * It is a large guest pages backed by small host pages,