Commit 8ff3c9bd authored by Vipin Sharma's avatar Vipin Sharma Committed by Yu Zhang
Browse files

KVM: x86/mmu: Merge all handle_changed_pte*() functions 

mainline inclusion
from mainline-v6.4-rc1
commit 40fa907e
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9HH9U
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=40fa907e5a69edbae503a4937f8f487ed1ca92ea



-------------------------------------

Merge __handle_changed_pte() and handle_changed_spte_acc_track() into a
single function, handle_changed_pte(), as the two are always used
together.  Remove the existing handle_changed_pte(), as it's just a
wrapper that calls __handle_changed_pte() and
handle_changed_spte_acc_track().

Signed-off-by: default avatarVipin Sharma <vipinsh@google.com>
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
Reviewed-by: default avatarDavid Matlack <dmatlack@google.com>
[sean: massage changelog]
Link: https://lore.kernel.org/r/20230321220021.2119033-14-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent 88c056c1

arch/x86/kvm/mmu/tdp_mmu.c

+11 −29
Original line number Diff line number Diff line
@@ -333,17 +333,6 @@ static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn, 
				u64 old_spte, u64 new_spte, int level,

				bool shared);



static void handle_changed_spte_acc_track(u64 old_spte, u64 new_spte, int level)

{

	if (!is_shadow_present_pte(old_spte) || !is_last_spte(old_spte, level))

		return;



	if (is_accessed_spte(old_spte) &&

	    (!is_shadow_present_pte(new_spte) || !is_accessed_spte(new_spte) ||

	     spte_to_pfn(old_spte) != spte_to_pfn(new_spte)))

		kvm_set_pfn_accessed(spte_to_pfn(old_spte));

}



static void tdp_account_mmu_page(struct kvm *kvm, struct kvm_mmu_page *sp)

{

	atomic64_inc(&kvm->arch.tdp_mmu_pages);
@@ -499,7 +488,7 @@ static void handle_removed_pt(struct kvm *kvm, tdp_ptep_t pt, bool shared) 
 * dirty logging updates are handled in common code, not here (see make_spte()

 * and fast_pf_fix_direct_spte()).

 */

static void __handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,

static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,

				u64 old_spte, u64 new_spte, int level,

				bool shared)

{
@@ -585,15 +574,10 @@ static void __handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn, 
	if (was_present && !was_leaf &&

	    (is_leaf || !is_present || WARN_ON_ONCE(pfn_changed)))

		handle_removed_pt(kvm, spte_to_child_pt(old_spte, level), shared);

}



static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,

				u64 old_spte, u64 new_spte, int level,

				bool shared)

{

	__handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level,

			      shared);

	handle_changed_spte_acc_track(old_spte, new_spte, level);

	if (was_leaf && is_accessed_spte(old_spte) &&

	    (!is_present || !is_accessed_spte(new_spte) || pfn_changed))

		kvm_set_pfn_accessed(spte_to_pfn(old_spte));

}



/*
@@ -646,9 +630,8 @@ static inline int tdp_mmu_set_spte_atomic(struct kvm *kvm, 
		return -EBUSY;

	}



	__handle_changed_spte(kvm, iter->as_id, iter->gfn, iter->old_spte,

	handle_changed_spte(kvm, iter->as_id, iter->gfn, iter->old_spte,

			    new_spte, iter->level, true);

	handle_changed_spte_acc_track(iter->old_spte, new_spte, iter->level);



	return 0;

}
@@ -712,8 +695,7 @@ static u64 tdp_mmu_set_spte(struct kvm *kvm, int as_id, tdp_ptep_t sptep, 


	old_spte = kvm_tdp_mmu_write_spte(sptep, old_spte, new_spte, level);



	__handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level, false);

	handle_changed_spte_acc_track(old_spte, new_spte, level);

	handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level, false);

	return old_spte;

}
@@ -1288,7 +1270,7 @@ static bool set_spte_gfn(struct kvm *kvm, struct tdp_iter *iter, 
	 * Note, when changing a read-only SPTE, it's not strictly necessary to

	 * zero the SPTE before setting the new PFN, but doing so preserves the

	 * invariant that the PFN of a present * leaf SPTE can never change.

	 * See __handle_changed_spte().

	 * See handle_changed_spte().

	 */

	tdp_mmu_iter_set_spte(kvm, iter, 0);
@@ -1313,7 +1295,7 @@ bool kvm_tdp_mmu_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) 
	/*

	 * No need to handle the remote TLB flush under RCU protection, the

	 * target SPTE _must_ be a leaf SPTE, i.e. cannot result in freeing a

	 * shadow page.  See the WARN on pfn_changed in __handle_changed_spte().

	 * shadow page. See the WARN on pfn_changed in handle_changed_spte().

	 */

	return kvm_tdp_mmu_handle_gfn(kvm, range, set_spte_gfn);

}