Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 776e6633 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: MMU: introduce is_last_spte helper 



Hiding some of the last largepage / level interaction (which is useful
for gbpages and for zero based levels).

Also merge the PT_PAGE_TABLE_LEVEL clearing loop in unlink_children.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3f5d18a9

arch/x86/kvm/mmu.c

+13 −13
Original line number Diff line number Diff line
@@ -250,6 +250,15 @@ static int is_rmap_spte(u64 pte) 
	return is_shadow_present_pte(pte);

}



static int is_last_spte(u64 pte, int level)

{

	if (level == PT_PAGE_TABLE_LEVEL)

		return 1;

	if (level == PT_DIRECTORY_LEVEL && is_large_pte(pte))

		return 1;

	return 0;

}



static pfn_t spte_to_pfn(u64 pte)

{

	return (pte & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT;
@@ -1313,24 +1322,16 @@ static void kvm_mmu_page_unlink_children(struct kvm *kvm, 


	pt = sp->spt;



	if (sp->role.level == PT_PAGE_TABLE_LEVEL) {

		for (i = 0; i < PT64_ENT_PER_PAGE; ++i) {

			if (is_shadow_present_pte(pt[i]))

				rmap_remove(kvm, &pt[i]);

			pt[i] = shadow_trap_nonpresent_pte;

		}

		return;

	}



	for (i = 0; i < PT64_ENT_PER_PAGE; ++i) {

		ent = pt[i];



		if (is_shadow_present_pte(ent)) {

			if (!is_large_pte(ent)) {

			if (!is_last_spte(ent, sp->role.level)) {

				ent &= PT64_BASE_ADDR_MASK;

				mmu_page_remove_parent_pte(page_header(ent),

							   &pt[i]);

			} else {

				if (is_large_pte(ent))

					--kvm->stat.lpages;

				rmap_remove(kvm, &pt[i]);

			}
@@ -2381,8 +2382,7 @@ static void mmu_pte_write_zap_pte(struct kvm_vcpu *vcpu, 


	pte = *spte;

	if (is_shadow_present_pte(pte)) {

		if (sp->role.level == PT_PAGE_TABLE_LEVEL ||

		    is_large_pte(pte))

		if (is_last_spte(pte, sp->role.level))

			rmap_remove(vcpu->kvm, spte);

		else {

			child = page_header(pte & PT64_BASE_ADDR_MASK);