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

KVM: x86/mmu: Rename TDP MMU functions that handle shadow pages 



Rename 3 functions in tdp_mmu.c that handle shadow pages:

  alloc_tdp_mmu_page()  -> tdp_mmu_alloc_sp()
  tdp_mmu_link_page()   -> tdp_mmu_link_sp()
  tdp_mmu_unlink_page() -> tdp_mmu_unlink_sp()

These changed make tdp_mmu a consistent prefix before the verb in the
function name, and make it more clear that these functions deal with
kvm_mmu_page structs rather than struct pages.

One could argue that "shadow page" is the wrong term for a page table in
the TDP MMU since it never actually shadows a guest page table.
However, "shadow page" (or "sp" for short) has evolved to become the
standard term in KVM when referring to a kvm_mmu_page struct, and its
associated page table and other metadata, regardless of whether the page
table shadows a guest page table. So this commit just makes the TDP MMU
more consistent with the rest of KVM.

No functional change intended.

Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20220119230739.2234394-6-dmatlack@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3e72c791

arch/x86/kvm/mmu/tdp_mmu.c

+14 −14
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static union kvm_mmu_page_role page_role_for_level(struct kvm_vcpu *vcpu, 
	return role;

}



static struct kvm_mmu_page *alloc_tdp_mmu_page(struct kvm_vcpu *vcpu, gfn_t gfn,

static struct kvm_mmu_page *tdp_mmu_alloc_sp(struct kvm_vcpu *vcpu, gfn_t gfn,

					     int level)

{

	struct kvm_mmu_page *sp;
@@ -224,7 +224,7 @@ hpa_t kvm_tdp_mmu_get_vcpu_root_hpa(struct kvm_vcpu *vcpu) 
			goto out;

	}



	root = alloc_tdp_mmu_page(vcpu, 0, vcpu->arch.mmu->shadow_root_level);

	root = tdp_mmu_alloc_sp(vcpu, 0, vcpu->arch.mmu->shadow_root_level);

	refcount_set(&root->tdp_mmu_root_count, 1);



	spin_lock(&kvm->arch.tdp_mmu_pages_lock);
@@ -269,14 +269,14 @@ static void handle_changed_spte_dirty_log(struct kvm *kvm, int as_id, gfn_t gfn, 
}



/**

 * tdp_mmu_link_page - Add a new page to the list of pages used by the TDP MMU

 * tdp_mmu_link_sp() - Add a new shadow page to the list of used pages

 *

 * @kvm: kvm instance

 * @sp: the new page

 * @account_nx: This page replaces a NX large page and should be marked for

 *		eventual reclaim.

 */

static void tdp_mmu_link_page(struct kvm *kvm, struct kvm_mmu_page *sp,

static void tdp_mmu_link_sp(struct kvm *kvm, struct kvm_mmu_page *sp,

			    bool account_nx)

{

	spin_lock(&kvm->arch.tdp_mmu_pages_lock);
@@ -287,7 +287,7 @@ static void tdp_mmu_link_page(struct kvm *kvm, struct kvm_mmu_page *sp, 
}



/**

 * tdp_mmu_unlink_page - Remove page from the list of pages used by the TDP MMU

 * tdp_mmu_unlink_sp() - Remove a shadow page from the list of used pages

 *

 * @kvm: kvm instance

 * @sp: the page to be removed
@@ -295,7 +295,7 @@ static void tdp_mmu_link_page(struct kvm *kvm, struct kvm_mmu_page *sp, 
 *	    the MMU lock and the operation must synchronize with other

 *	    threads that might be adding or removing pages.

 */

static void tdp_mmu_unlink_page(struct kvm *kvm, struct kvm_mmu_page *sp,

static void tdp_mmu_unlink_sp(struct kvm *kvm, struct kvm_mmu_page *sp,

			      bool shared)

{

	if (shared)
@@ -338,7 +338,7 @@ static void handle_removed_tdp_mmu_page(struct kvm *kvm, tdp_ptep_t pt, 


	trace_kvm_mmu_prepare_zap_page(sp);



	tdp_mmu_unlink_page(kvm, sp, shared);

	tdp_mmu_unlink_sp(kvm, sp, shared);



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

		u64 *sptep = rcu_dereference(pt) + i;
@@ -1034,14 +1034,14 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) 
			if (is_removed_spte(iter.old_spte))

				break;



			sp = alloc_tdp_mmu_page(vcpu, iter.gfn, iter.level - 1);

			sp = tdp_mmu_alloc_sp(vcpu, iter.gfn, iter.level - 1);

			child_pt = sp->spt;



			new_spte = make_nonleaf_spte(child_pt,

						     !shadow_accessed_mask);



			if (!tdp_mmu_set_spte_atomic(vcpu->kvm, &iter, new_spte)) {

				tdp_mmu_link_page(vcpu->kvm, sp,

				tdp_mmu_link_sp(vcpu->kvm, sp,

						fault->huge_page_disallowed &&

						fault->req_level >= iter.level);