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.

Will Deacon committed 6 years ago

Commit fdfe7cb1 parent cb957ad10 files · +17 −10Browse files

Unified · Split

10 files

arch/arm64/include/asm/kvm_host.h +1 −1
arch/arm64/kvm/mmu.c +1 −1
arch/mips/include/asm/kvm_host.h +1 −1
arch/mips/kvm/mmu.c +2 −1
arch/powerpc/include/asm/kvm_host.h +2 −1
arch/powerpc/kvm/book3s.c +2 −1
arch/powerpc/kvm/e500_mmu_host.c +2 −1
arch/x86/include/asm/kvm_host.h +2 −1
arch/x86/kvm/mmu/mmu.c +2 −1
virt/kvm/kvm_main.c +2 −1

arch/arm64/include/asm/kvm_host.h+1−1

@@ -473,7 +473,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, · 472 unmodified lines
473		473
474	#define KVM_ARCH_WANT_MMU_NOTIFIER	474	#define KVM_ARCH_WANT_MMU_NOTIFIER
475	int kvm_unmap_hva_range(struct kvm *kvm,	475	int kvm_unmap_hva_range(struct kvm *kvm,
476	unsigned long start, unsigned long end);	476	unsigned long start, unsigned long end, unsigned flags);
477	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);	477	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
478	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);	478	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
479	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);	479	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/arm64/kvm/mmu.c+1−1

@@ -2213,7 +2213,7 @@ static int kvm_unmap_hva_handler(struct kvm kvm, gpa_t gpa, u64 size, void dat · 2212 unmodified lines
2213	}	2213	}
2214		2214
2215	int kvm_unmap_hva_range(struct kvm *kvm,	2215	int kvm_unmap_hva_range(struct kvm *kvm,
2216	unsigned long start, unsigned long end)	2216	unsigned long start, unsigned long end, unsigned flags)
2217	{	2217	{
2218	if (!kvm->arch.mmu.pgd)	2218	if (!kvm->arch.mmu.pgd)
2219	return 0;	2219	return 0;

arch/mips/include/asm/kvm_host.h+1−1

@@ -969,7 +969,7 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, · 968 unmodified lines
969		969
970	#define KVM_ARCH_WANT_MMU_NOTIFIER	970	#define KVM_ARCH_WANT_MMU_NOTIFIER
971	int kvm_unmap_hva_range(struct kvm *kvm,	971	int kvm_unmap_hva_range(struct kvm *kvm,
972	unsigned long start, unsigned long end);	972	unsigned long start, unsigned long end, unsigned flags);
973	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);	973	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
974	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);	974	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
975	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);	975	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/mips/kvm/mmu.c+2−1

@@ -486,7 +486,8 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, · 485 unmodified lines
486	return 1;	486	return 1;
487	}	487	}
488		488
489	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)	489	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,
		490	unsigned flags)
490	{	491	{
491	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);	492	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);
492		493

arch/powerpc/include/asm/kvm_host.h+2−1

@@ -58,7 +58,8 @@ · 57 unmodified lines
58	#define KVM_ARCH_WANT_MMU_NOTIFIER	58	#define KVM_ARCH_WANT_MMU_NOTIFIER
59		59
60	extern int kvm_unmap_hva_range(struct kvm *kvm,	60	extern int kvm_unmap_hva_range(struct kvm *kvm,
61	unsigned long start, unsigned long end);	61	unsigned long start, unsigned long end,
		62	unsigned flags);
62	extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);	63	extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
63	extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);	64	extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
64	extern int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);	65	extern int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/powerpc/kvm/book3s.c+2−1

@@ -834,7 +834,8 @@ void kvmppc_core_commit_memory_region(struct kvm *kvm, · 833 unmodified lines
834	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);	834	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);
835	}	835	}
836		836
837	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)	837	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,
		838	unsigned flags)
838	{	839	{
839	return kvm->arch.kvm_ops->unmap_hva_range(kvm, start, end);	840	return kvm->arch.kvm_ops->unmap_hva_range(kvm, start, end);
840	}	841	}

arch/powerpc/kvm/e500_mmu_host.c+2−1

@@ -734,7 +734,8 @@ static int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) · 733 unmodified lines
734	return 0;	734	return 0;
735	}	735	}
736		736
737	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)	737	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,
		738	unsigned flags)
738	{	739	{
739	/* kvm_unmap_hva flushes everything anyways */	740	/* kvm_unmap_hva flushes everything anyways */
740	kvm_unmap_hva(kvm, start);	741	kvm_unmap_hva(kvm, start);

arch/x86/include/asm/kvm_host.h+2−1

@@ -1596,7 +1596,8 @@ asmlinkage void kvm_spurious_fault(void); · 1595 unmodified lines
1596	_ASM_EXTABLE(666b, 667b)	1596	_ASM_EXTABLE(666b, 667b)
1597		1597
1598	#define KVM_ARCH_WANT_MMU_NOTIFIER	1598	#define KVM_ARCH_WANT_MMU_NOTIFIER
1599	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end);	1599	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,
		1600	unsigned flags);
1600	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);	1601	int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
1601	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);	1602	int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
1602	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);	1603	int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/x86/kvm/mmu/mmu.c+2−1

@@ -1916,7 +1916,8 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, · 1915 unmodified lines
1916	return kvm_handle_hva_range(kvm, hva, hva + 1, data, handler);	1916	return kvm_handle_hva_range(kvm, hva, hva + 1, data, handler);
1917	}	1917	}
1918		1918
1919	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)	1919	int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,
		1920	unsigned flags)
1920	{	1921	{
1921	return kvm_handle_hva_range(kvm, start, end, 0, kvm_unmap_rmapp);	1922	return kvm_handle_hva_range(kvm, start, end, 0, kvm_unmap_rmapp);
1922	}	1923	}

virt/kvm/kvm_main.c+2−1

 	 * count is also read inside the mmu_lock critical section.
 	 */
 	kvm->mmu_notifier_count++;
-	need_tlb_flush = kvm_unmap_hva_range(kvm, range->start, range->end);
+	need_tlb_flush = kvm_unmap_hva_range(kvm, range->start, range->end,
+					     range->flags);
 	need_tlb_flush |= kvm->tlbs_dirty;
 	/* we've to flush the tlb before the pages can be freed */
 	if (need_tlb_flush)

KVM: Pass MMU notifier range flags to kvm_unmap_hva_range()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code