KVM: x86/mmu: Use yield-safe TDP MMU root iter in MMU notifier unmapping

sean-jc · bonzini · commit 7533377215b6 · 2021-11-30T03:09:25.000-05:00
Use the yield-safe variant of the TDP MMU iterator when handling an unmapping event from the MMU notifier, as most occurences of the event allow yielding. Fixes: e1eed58 ("KVM: x86/mmu: Allow yielding during MMU notifier unmap/zap, if possible") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20211120015008.3780032-1-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -1031,7 +1031,7 @@ bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range,
 {
 	struct kvm_mmu_page *root;
 
-	for_each_tdp_mmu_root(kvm, root, range->slot->as_id)
+	for_each_tdp_mmu_root_yield_safe(kvm, root, range->slot->as_id, false)
 		flush = zap_gfn_range(kvm, root, range->start, range->end,
 				      range->may_block, flush, false);
 

Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ bool kvm_tdp_mmu_unmap_gfn_range(struct kvm kvm, struct kvm_gfn_range range,`
`1031`	`1031`	`{`
`1032`	`1032`	`struct kvm_mmu_page *root;`
`1033`	`1033`
`1034`		`- for_each_tdp_mmu_root(kvm, root, range->slot->as_id)`
	`1034`	`+ for_each_tdp_mmu_root_yield_safe(kvm, root, range->slot->as_id, false)`
`1035`	`1035`	`flush = zap_gfn_range(kvm, root, range->start, range->end,`
`1036`	`1036`	`range->may_block, flush, false);`
`1037`	`1037`