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

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

KVM: MMU: split kvm_mmu_free_page 



Split kvm_mmu_free_page to kvm_mmu_isolate_page and
kvm_mmu_free_page

One is used to remove the page from cache under mmu lock and the other is
used to free page table out of mmu lock

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent aa6bd187

arch/x86/kvm/mmu.c

+18 −3
Original line number Original line Diff line number Diff line
@@ -1039,14 +1039,28 @@ static inline void kvm_mod_used_mmu_pages(struct kvm *kvm, int nr) 
	percpu_counter_add(&kvm_total_used_mmu_pages, nr);

	percpu_counter_add(&kvm_total_used_mmu_pages, nr);

}

}





static void kvm_mmu_free_page(struct kvm_mmu_page *sp)

/*

 * Remove the sp from shadow page cache, after call it,

 * we can not find this sp from the cache, and the shadow

 * page table is still valid.

 * It should be under the protection of mmu lock.

 */

static void kvm_mmu_isolate_page(struct kvm_mmu_page *sp)

{

{

	ASSERT(is_empty_shadow_page(sp->spt));

	ASSERT(is_empty_shadow_page(sp->spt));

	hlist_del(&sp->hash_link);

	hlist_del(&sp->hash_link);

	list_del(&sp->link);

	free_page((unsigned long)sp->spt);

	if (!sp->role.direct)

	if (!sp->role.direct)

		free_page((unsigned long)sp->gfns);

		free_page((unsigned long)sp->gfns);

}



/*

 * Free the shadow page table and the sp, we can do it

 * out of the protection of mmu lock.

 */

static void kvm_mmu_free_page(struct kvm_mmu_page *sp)

{

	list_del(&sp->link);

	free_page((unsigned long)sp->spt);

	kmem_cache_free(mmu_page_header_cache, sp);

	kmem_cache_free(mmu_page_header_cache, sp);

}

}
@@ -1678,6 +1692,7 @@ static void kvm_mmu_commit_zap_page(struct kvm *kvm, 
	do {

	do {

		sp = list_first_entry(invalid_list, struct kvm_mmu_page, link);

		sp = list_first_entry(invalid_list, struct kvm_mmu_page, link);

		WARN_ON(!sp->role.invalid || sp->root_count);

		WARN_ON(!sp->role.invalid || sp->root_count);

		kvm_mmu_isolate_page(sp);

		kvm_mmu_free_page(sp);

		kvm_mmu_free_page(sp);

	} while (!list_empty(invalid_list));

	} while (!list_empty(invalid_list));