Commit 62105564 authored by Vipin Sharma's avatar Vipin Sharma Committed by Sean Christopherson
Browse files

KVM: x86/mmu: Rename kvm_tdp_mmu_zap_sp() to better indicate its purpose 



kvm_tdp_mmu_zap_sp() is only used for NX huge page recovery, so rename
it to kvm_tdp_mmu_zap_possible_nx_huge_page(). In a future commit, this
function will be changed to include logic specific to NX huge page
recovery.

Signed-off-by: default avatarVipin Sharma <vipinsh@google.com>
Signed-off-by: default avatarJames Houghton <jthoughton@google.com>
https://lore.kernel.org/r/20250707224720.4016504-3-jthoughton@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 67778856

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -7673,7 +7673,7 @@ static void kvm_recover_nx_huge_pages(struct kvm *kvm, 
		if (slot && kvm_slot_dirty_track_enabled(slot))

			unaccount_nx_huge_page(kvm, sp);

		else if (is_tdp_mmu)

			flush |= kvm_tdp_mmu_zap_sp(kvm, sp);

			flush |= kvm_tdp_mmu_zap_possible_nx_huge_page(kvm, sp);

		else

			kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list);

		WARN_ON_ONCE(sp->nx_huge_page_disallowed);

arch/x86/kvm/mmu/tdp_mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -925,7 +925,8 @@ static void tdp_mmu_zap_root(struct kvm *kvm, struct kvm_mmu_page *root, 
	rcu_read_unlock();

}



bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp)

bool kvm_tdp_mmu_zap_possible_nx_huge_page(struct kvm *kvm,

					   struct kvm_mmu_page *sp)

{

	u64 old_spte;

arch/x86/kvm/mmu/tdp_mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static inline struct kvm_mmu_page *tdp_mmu_get_root(struct kvm_vcpu *vcpu, 
}



bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, gfn_t start, gfn_t end, bool flush);

bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp);

bool kvm_tdp_mmu_zap_possible_nx_huge_page(struct kvm *kvm,

					   struct kvm_mmu_page *sp);

void kvm_tdp_mmu_zap_all(struct kvm *kvm);

void kvm_tdp_mmu_invalidate_roots(struct kvm *kvm,

				  enum kvm_tdp_mmu_root_types root_types);