Commit d4329543 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Yu Zhang
Browse files

KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe() 

mainline inclusion
from mainline-v6.5-rc6
commit 441a5dfc
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=441a5dfcd96854cbcb625709e2694a9c60adfaab



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

All callers except the MMU notifier want to process all address spaces.
Remove the address space ID argument of for_each_tdp_mmu_root_yield_safe()
and switch the MMU notifier to use __for_each_tdp_mmu_root_yield_safe().

Extracted out of a patch by Sean Christopherson <seanjc@google.com>

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent d64a85a0

arch/x86/kvm/mmu/mmu.c

+2 −6
Original line number Diff line number Diff line
@@ -6102,7 +6102,6 @@ static bool kvm_rmap_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_e 
void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end)

{

	bool flush;

	int i;



	write_lock(&kvm->mmu_lock);
@@ -6110,11 +6109,8 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) 


	flush = kvm_rmap_zap_gfn_range(kvm, gfn_start, gfn_end);



	if (tdp_mmu_enabled) {

		for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++)

			flush = kvm_tdp_mmu_zap_leafs(kvm, i, gfn_start,

						      gfn_end, flush);

	}

	if (tdp_mmu_enabled)

		flush = kvm_tdp_mmu_zap_leafs(kvm, gfn_start, gfn_end, flush);



	if (flush)

		kvm_flush_remote_tlbs_range(kvm, gfn_start, gfn_end - gfn_start);

arch/x86/kvm/mmu/tdp_mmu.c

+11 −11
Original line number Diff line number Diff line
@@ -210,8 +210,12 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm, 
#define for_each_valid_tdp_mmu_root_yield_safe(_kvm, _root, _as_id, _shared)	\

	__for_each_tdp_mmu_root_yield_safe(_kvm, _root, _as_id, _shared, true)



#define for_each_tdp_mmu_root_yield_safe(_kvm, _root, _as_id)			\

	__for_each_tdp_mmu_root_yield_safe(_kvm, _root, _as_id, false, false)

#define for_each_tdp_mmu_root_yield_safe(_kvm, _root)			\

	for (_root = tdp_mmu_next_root(_kvm, NULL, false, false);		\

	     _root;								\

	     _root = tdp_mmu_next_root(_kvm, _root, false, false))		\

		if (!kvm_lockdep_assert_mmu_lock_held(_kvm, false)) {		\

		} else



/*

 * Iterate over all TDP MMU roots.  Requires that mmu_lock be held for write,
@@ -884,12 +888,11 @@ static bool tdp_mmu_zap_leafs(struct kvm *kvm, struct kvm_mmu_page *root, 
 * true if a TLB flush is needed before releasing the MMU lock, i.e. if one or

 * more SPTEs were zapped since the MMU lock was last acquired.

 */

bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, int as_id, gfn_t start, gfn_t end,

			   bool flush)

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

{

	struct kvm_mmu_page *root;



	for_each_tdp_mmu_root_yield_safe(kvm, root, as_id)

	for_each_tdp_mmu_root_yield_safe(kvm, root)

		flush = tdp_mmu_zap_leafs(kvm, root, start, end, true, flush);



	return flush;
@@ -898,7 +901,6 @@ bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, int as_id, gfn_t start, gfn_t end, 
void kvm_tdp_mmu_zap_all(struct kvm *kvm)

{

	struct kvm_mmu_page *root;

	int i;



	/*

	 * Zap all roots, including invalid roots, as all SPTEs must be dropped
@@ -912,11 +914,9 @@ void kvm_tdp_mmu_zap_all(struct kvm *kvm) 
	 * is being destroyed or the userspace VMM has exited.  In both cases,

	 * KVM_RUN is unreachable, i.e. no vCPUs will ever service the request.

	 */

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

		for_each_tdp_mmu_root_yield_safe(kvm, root, i)

	for_each_tdp_mmu_root_yield_safe(kvm, root)

		tdp_mmu_zap_root(kvm, root, false);

}

}



/*

 * Zap all invalidated roots to ensure all SPTEs are dropped before the "fast
@@ -1161,7 +1161,7 @@ bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range, 
{

	struct kvm_mmu_page *root;



	for_each_tdp_mmu_root_yield_safe(kvm, root, range->slot->as_id)

	__for_each_tdp_mmu_root_yield_safe(kvm, root, range->slot->as_id, false, false)

		flush = tdp_mmu_zap_leafs(kvm, root, range->start, range->end,

					  range->may_block, flush);

arch/x86/kvm/mmu/tdp_mmu.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ __must_check static inline bool kvm_tdp_mmu_get_root(struct kvm_mmu_page *root) 
void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root,

			  bool shared);



bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, int as_id, gfn_t start, gfn_t end,

			   bool flush);

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);

void kvm_tdp_mmu_zap_all(struct kvm *kvm);

void kvm_tdp_mmu_invalidate_all_roots(struct kvm *kvm);