Commit fdfe7cbd authored by Will Deacon's avatar Will Deacon Committed by Paolo Bonzini
Browse files

KVM: Pass MMU notifier range flags to kvm_unmap_hva_range() 



The 'flags' field of 'struct mmu_notifier_range' is used to indicate
whether invalidate_range_{start,end}() are permitted to block. In the
case of kvm_mmu_notifier_invalidate_range_start(), this field is not
forwarded on to the architecture-specific implementation of
kvm_unmap_hva_range() and therefore the backend cannot sensibly decide
whether or not to block.

Add an extra 'flags' parameter to kvm_unmap_hva_range() so that
architectures are aware as to whether or not they are permitted to block.

Cc: <stable@vger.kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Message-Id: <20200811102725.7121-2-will@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cb957adb

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 


#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

			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);

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *dat 
}



int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end)

			unsigned long start, unsigned long end, unsigned flags)

{

	if (!kvm->arch.mmu.pgd)

		return 0;

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, 


#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

			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);

arch/mips/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, 
	return 1;

}



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

int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,

			unsigned flags)

{

	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);

arch/powerpc/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ 
#define KVM_ARCH_WANT_MMU_NOTIFIER



extern int kvm_unmap_hva_range(struct kvm *kvm,

			       unsigned long start, unsigned long end);

			       unsigned long start, unsigned long end,

			       unsigned flags);

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE