Commit 007a369f authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Drop unused CMPXCHG macro from paging_tmpl.h 



Drop the CMPXCHG macro from paging_tmpl.h, it's no longer used now that
KVM uses a common uaccess helper to do 8-byte CMPXCHG.

Fixes: f122dfe4 ("KVM: x86: Use __try_cmpxchg_user() to update guest PTE A/D bits")
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220613225723.2734132-2-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 78c7d900

arch/x86/kvm/mmu/paging_tmpl.h

+0 −6
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
	#define PT_HAVE_ACCESSED_DIRTY(mmu) true

	#ifdef CONFIG_X86_64

	#define PT_MAX_FULL_LEVELS PT64_ROOT_MAX_LEVEL

	#define CMPXCHG "cmpxchgq"

	#else

	#define PT_MAX_FULL_LEVELS 2

	#endif
@@ -51,7 +50,6 @@ 
	#define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT

	#define PT_GUEST_ACCESSED_SHIFT PT_ACCESSED_SHIFT

	#define PT_HAVE_ACCESSED_DIRTY(mmu) true

	#define CMPXCHG "cmpxchgl"

#elif PTTYPE == PTTYPE_EPT

	#define pt_element_t u64

	#define guest_walker guest_walkerEPT
@@ -64,9 +62,6 @@ 
	#define PT_GUEST_DIRTY_SHIFT 9

	#define PT_GUEST_ACCESSED_SHIFT 8

	#define PT_HAVE_ACCESSED_DIRTY(mmu) (!(mmu)->cpu_role.base.ad_disabled)

	#ifdef CONFIG_X86_64

	#define CMPXCHG "cmpxchgq"

	#endif

	#define PT_MAX_FULL_LEVELS PT64_ROOT_MAX_LEVEL

#else

	#error Invalid PTTYPE value
@@ -1100,7 +1095,6 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) 
#undef PT_MAX_FULL_LEVELS

#undef gpte_to_gfn

#undef gpte_to_gfn_lvl

#undef CMPXCHG

#undef PT_GUEST_ACCESSED_MASK

#undef PT_GUEST_DIRTY_MASK

#undef PT_GUEST_DIRTY_SHIFT