Commit c306aec8 authored by David Matlack's avatar David Matlack Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Consolidate shadow page allocation and initialization 



Consolidate kvm_mmu_alloc_page() and kvm_mmu_alloc_shadow_page() under
the latter so that all shadow page allocation and initialization happens
in one place.

No functional change intended.

Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20220516232138.1783324-8-dmatlack@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 94c81364

arch/x86/kvm/mmu/mmu.c

+17 −22
Original line number Diff line number Diff line
@@ -1664,27 +1664,6 @@ static void drop_parent_pte(struct kvm_mmu_page *sp, 
	mmu_spte_clear_no_track(parent_pte);

}



static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, bool direct)

{

	struct kvm_mmu_page *sp;



	sp = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_page_header_cache);

	sp->spt = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_shadow_page_cache);

	if (!direct)

		sp->gfns = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_gfn_array_cache);

	set_page_private(virt_to_page(sp->spt), (unsigned long)sp);



	/*

	 * active_mmu_pages must be a FIFO list, as kvm_zap_obsolete_pages()

	 * depends on valid pages being added to the head of the list.  See

	 * comments in kvm_zap_obsolete_pages().

	 */

	sp->mmu_valid_gen = vcpu->kvm->arch.mmu_valid_gen;

	list_add(&sp->link, &vcpu->kvm->arch.active_mmu_pages);

	kvm_mod_used_mmu_pages(vcpu->kvm, +1);

	return sp;

}



static void mark_unsync(u64 *spte);

static void kvm_mmu_mark_parents_unsync(struct kvm_mmu_page *sp)

{
@@ -2072,7 +2051,23 @@ static struct kvm_mmu_page *kvm_mmu_alloc_shadow_page(struct kvm_vcpu *vcpu, 
						      struct hlist_head *sp_list,

						      union kvm_mmu_page_role role)

{

	struct kvm_mmu_page *sp = kvm_mmu_alloc_page(vcpu, role.direct);

	struct kvm_mmu_page *sp;



	sp = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_page_header_cache);

	sp->spt = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_shadow_page_cache);

	if (!role.direct)

		sp->gfns = kvm_mmu_memory_cache_alloc(&vcpu->arch.mmu_gfn_array_cache);



	set_page_private(virt_to_page(sp->spt), (unsigned long)sp);



	/*

	 * active_mmu_pages must be a FIFO list, as kvm_zap_obsolete_pages()

	 * depends on valid pages being added to the head of the list.  See

	 * comments in kvm_zap_obsolete_pages().

	 */

	sp->mmu_valid_gen = vcpu->kvm->arch.mmu_valid_gen;

	list_add(&sp->link, &vcpu->kvm->arch.active_mmu_pages);

	kvm_mod_used_mmu_pages(vcpu->kvm, +1);



	sp->gfn = gfn;

	sp->role = role;