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

KVM: Convert KVM_ARCH_WANT_MMU_NOTIFIER to CONFIG_KVM_GENERIC_MMU_NOTIFIER 



Convert KVM_ARCH_WANT_MMU_NOTIFIER into a Kconfig and select it where
appropriate to effectively maintain existing behavior.  Using a proper
Kconfig will simplify building more functionality on top of KVM's
mmu_notifier infrastructure.

Add a forward declaration of kvm_gfn_range to kvm_types.h so that
including arch/powerpc/include/asm/kvm_ppc.h's with CONFIG_KVM=n doesn't
generate warnings due to kvm_gfn_range being undeclared.  PPC defines
hooks for PR vs. HV without guarding them via #ifdeffery, e.g.

  bool (*unmap_gfn_range)(struct kvm *kvm, struct kvm_gfn_range *range);
  bool (*age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);
  bool (*test_age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);
  bool (*set_spte_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);

Alternatively, PPC could forward declare kvm_gfn_range, but there's no
good reason not to define it in common KVM.

Acked-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Message-Id: <20231027182217.3615211-8-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4a2e993f

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -954,8 +954,6 @@ int __kvm_arm_vcpu_get_events(struct kvm_vcpu *vcpu, 
int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu,

			      struct kvm_vcpu_events *events);



#define KVM_ARCH_WANT_MMU_NOTIFIER



void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

arch/arm64/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ menuconfig KVM 
	bool "Kernel-based Virtual Machine (KVM) support"

	depends on HAVE_KVM

	select KVM_GENERIC_HARDWARE_ENABLING

	select MMU_NOTIFIER

	select KVM_GENERIC_MMU_NOTIFIER

	select PREEMPT_NOTIFIERS

	select HAVE_KVM_CPU_RELAX_INTERCEPT

	select KVM_MMIO

arch/loongarch/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ void kvm_flush_tlb_all(void); 
void kvm_flush_tlb_gpa(struct kvm_vcpu *vcpu, unsigned long gpa);

int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long badv, bool write);



#define KVM_ARCH_WANT_MMU_NOTIFIER

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

int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end, bool blockable);

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

arch/loongarch/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ config KVM 
	select HAVE_KVM_VCPU_ASYNC_IOCTL

	select KVM_GENERIC_DIRTYLOG_READ_PROTECT

	select KVM_GENERIC_HARDWARE_ENABLING

	select KVM_GENERIC_MMU_NOTIFIER

	select KVM_MMIO

	select KVM_XFER_TO_GUEST_WORK

	select MMU_NOTIFIER

	select PREEMPT_NOTIFIERS

	help

	  Support hosting virtualized guest machines using

arch/mips/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -810,8 +810,6 @@ int kvm_mips_mkclean_gpa_pt(struct kvm *kvm, gfn_t start_gfn, gfn_t end_gfn); 
pgd_t *kvm_pgd_alloc(void);

void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);



#define KVM_ARCH_WANT_MMU_NOTIFIER



/* Emulation */

enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause);

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