Commit a303def0 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paolo Bonzini
Browse files

kvm: Remove the unused macro KVM_MMU_READ_{,UN}LOCK() 



No code is using KVM_MMU_READ_LOCK() or KVM_MMU_READ_UNLOCK().  They
used to be in virt/kvm/pfncache.c:

                KVM_MMU_READ_LOCK(kvm);
                retry = mmu_notifier_retry_hva(kvm, mmu_seq, uhva);
                KVM_MMU_READ_UNLOCK(kvm);

However, since 58cd407c ("KVM: Fix multiple races in gfn=>pfn cache
refresh", 2022-05-25) the code is only relying on the MMU notifier's
invalidation count and sequence number.

Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Message-Id: <20221207120617.9409-1-jiangshanlai@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e0a78525

virt/kvm/kvm_mm.h

+0 −4
Original line number Diff line number Diff line
@@ -14,14 +14,10 @@ 
#define KVM_MMU_LOCK_INIT(kvm)		rwlock_init(&(kvm)->mmu_lock)

#define KVM_MMU_LOCK(kvm)		write_lock(&(kvm)->mmu_lock)

#define KVM_MMU_UNLOCK(kvm)		write_unlock(&(kvm)->mmu_lock)

#define KVM_MMU_READ_LOCK(kvm)		read_lock(&(kvm)->mmu_lock)

#define KVM_MMU_READ_UNLOCK(kvm)	read_unlock(&(kvm)->mmu_lock)

#else

#define KVM_MMU_LOCK_INIT(kvm)		spin_lock_init(&(kvm)->mmu_lock)

#define KVM_MMU_LOCK(kvm)		spin_lock(&(kvm)->mmu_lock)

#define KVM_MMU_UNLOCK(kvm)		spin_unlock(&(kvm)->mmu_lock)

#define KVM_MMU_READ_LOCK(kvm)		spin_lock(&(kvm)->mmu_lock)

#define KVM_MMU_READ_UNLOCK(kvm)	spin_unlock(&(kvm)->mmu_lock)

#endif /* KVM_HAVE_MMU_RWLOCK */



kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool interruptible,