Commit 24db2734 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Marcelo Tosatti
Browse files

KVM: MMU: cleanup __direct_map 



Use link_shadow_page to link the sp to the spte in __direct_map

Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f7616203

arch/x86/kvm/mmu.c

+4 −8
Original line number Diff line number Diff line
@@ -1947,9 +1947,9 @@ static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp) 
{

	u64 spte;



	spte = __pa(sp->spt)

		| PT_PRESENT_MASK | PT_ACCESSED_MASK

		| PT_WRITABLE_MASK | PT_USER_MASK;

	spte = __pa(sp->spt) | PT_PRESENT_MASK | PT_WRITABLE_MASK |

	       shadow_user_mask | shadow_x_mask | shadow_accessed_mask;



	mmu_spte_set(sptep, spte);

}
@@ -2592,11 +2592,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write, 
					      iterator.level - 1,

					      1, ACC_ALL, iterator.sptep);



			mmu_spte_set(iterator.sptep,

				     __pa(sp->spt)

				     | PT_PRESENT_MASK | PT_WRITABLE_MASK

				     | shadow_user_mask | shadow_x_mask

				     | shadow_accessed_mask);

			link_shadow_page(iterator.sptep, sp);

		}

	}

	return emulate;