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

KVM: Kill off the old hva-based MMU notifier callbacks 



Yank out the hva-based MMU notifier APIs now that all architectures that
use the notifiers have moved to the gfn-based APIs.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210402005658.3024832-7-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b1c5356e

arch/arm64/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -586,7 +586,6 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
			      struct kvm_vcpu_events *events);



#define KVM_ARCH_WANT_MMU_NOTIFIER

#define KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS



void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

arch/mips/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, 
						   bool write);



#define KVM_ARCH_WANT_MMU_NOTIFIER

#define KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS



/* Emulation */

int kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
#include <linux/mmu_notifier.h>



#define KVM_ARCH_WANT_MMU_NOTIFIER

#define KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS



#define HPTEG_CACHE_NUM			(1 << 15)

#define HPTEG_HASH_BITS_PTE		13

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1727,7 +1727,6 @@ asmlinkage void kvm_spurious_fault(void); 
	_ASM_EXTABLE(666b, 667b)



#define KVM_ARCH_WANT_MMU_NOTIFIER

#define KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS



int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v);

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);

include/linux/kvm_host.h

+0 −8
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); 
#endif



#ifdef KVM_ARCH_WANT_MMU_NOTIFIER

#ifdef KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS

struct kvm_gfn_range {

	struct kvm_memory_slot *slot;

	gfn_t start;
@@ -231,13 +230,6 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range); 
bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range);

bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range);

bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range);

#else

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end, unsigned flags);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

#endif /* KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS */

#endif



enum {