Commit d64a85a0 authored by Sean Christopherson's avatar Sean Christopherson Committed by Yu Zhang
Browse files

KVM: x86/mmu: Open code leaf invalidation from mmu_notifier 

mainline inclusion
from mainline-v6.5-rc6
commit 50107e8b
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=50107e8b2a8a59d8cec7e8454e27c1f8e365acdb



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

The mmu_notifier path is a bit of a special snowflake, e.g. it zaps only a
single address space (because it's per-slot), and can't always yield.
Because of this, it calls kvm_tdp_mmu_zap_leafs() in ways that no one
else does.

Iterate manually over the leafs in response to an mmu_notifier
invalidation, instead of invoking kvm_tdp_mmu_zap_leafs().  Drop the
@can_yield param from kvm_tdp_mmu_zap_leafs() as its sole remaining
caller unconditionally passes "true".

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20230916003916.2545000-2-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent 2cc5d890

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -6113,7 +6113,7 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t 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, true, flush);

						      gfn_end, flush);

	}



	if (flush)

arch/x86/kvm/mmu/tdp_mmu.c

+9 −4
Original line number Diff line number Diff line
@@ -885,12 +885,12 @@ static bool tdp_mmu_zap_leafs(struct kvm *kvm, struct kvm_mmu_page *root, 
 * 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 can_yield, bool flush)

			   bool flush)

{

	struct kvm_mmu_page *root;



	for_each_tdp_mmu_root_yield_safe(kvm, root, as_id)

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

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



	return flush;

}
@@ -1159,8 +1159,13 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) 
bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range,

				 bool flush)

{

	return kvm_tdp_mmu_zap_leafs(kvm, range->slot->as_id, range->start,

				     range->end, range->may_block, flush);

	struct kvm_mmu_page *root;



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

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

					  range->may_block, flush);



	return flush;

}



typedef bool (*tdp_handler_t)(struct kvm *kvm, struct tdp_iter *iter,

arch/x86/kvm/mmu/tdp_mmu.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ __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 can_yield, bool flush);

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