Commit 24e85ab6 authored Aug 14, 2023 by Ben Gardon Committed by Yu Zhang Nov 21, 2023

KVM: x86/mmu: Add lockdep when setting a TDP MMU SPTE

mainline inclusion
from mainline-v5.12-rc1
commit 3a9a4aa5
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I7S3VQ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3a9a4aa5657471a02ffb7f9b7f3b7a468b3f257b



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

Add lockdep to __tdp_mmu_set_spte to ensure that SPTEs are only modified
under the MMU lock.

No functional change intended.

Reviewed-by: Peter Feiner <pfeiner@google.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Ben Gardon <bgardon@google.com>
Message-Id: <20210202185734.1680553-4-bgardon@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com>

parent 76e1be83

arch/x86/kvm/mmu/tdp_mmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,8 @@ static inline void __tdp_mmu_set_spte(struct kvm kvm, struct tdp_iter iter,
		struct kvm_mmu_page *root = sptep_to_sp(root_pt);
		int as_id = kvm_mmu_page_as_id(root);

		lockdep_assert_held(&kvm->mmu_lock);

		WRITE_ONCE(*iter->sptep, new_spte);

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