Skip to content

Commit 362ff6d

Browse files
yanzhao56sean-jc
authored andcommitted
KVM: x86/mmu: Zap KVM TDP when noncoherent DMA assignment starts/stops
Zap KVM TDP when noncoherent DMA assignment starts (noncoherent dma count transitions from 0 to 1) or stops (noncoherent dma count transitions from 1 to 0). Before the zap, test if guest MTRR is to be honored after the assignment starts or was honored before the assignment stops. When there's no noncoherent DMA device, EPT memory type is ((MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT) | VMX_EPT_IPAT_BIT) When there're noncoherent DMA devices, EPT memory type needs to honor guest CR0.CD and MTRR settings. So, if noncoherent DMA count transitions between 0 and 1, EPT leaf entries need to be zapped to clear stale memory type. This issue might be hidden when the device is statically assigned with VFIO adding/removing MMIO regions of the noncoherent DMA devices for several times during guest boot, and current KVM MMU will call kvm_mmu_zap_all_fast() on the memslot removal. But if the device is hot-plugged, or if the guest has mmio_always_on for the device, the MMIO regions of it may only be added for once, then there's no path to do the EPT entries zapping to clear stale memory type. Therefore do the EPT zapping when noncoherent assignment starts/stops to ensure stale entries cleaned away. Signed-off-by: Yan Zhao <[email protected]> Link: https://lore.kernel.org/r/[email protected] [sean: fix misspelled words in comment and changelog] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 9a37681 commit 362ff6d

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

arch/x86/kvm/x86.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13188,15 +13188,30 @@ bool noinstr kvm_arch_has_assigned_device(struct kvm *kvm)
1318813188
}
1318913189
EXPORT_SYMBOL_GPL(kvm_arch_has_assigned_device);
1319013190

13191+
static void kvm_noncoherent_dma_assignment_start_or_stop(struct kvm *kvm)
13192+
{
13193+
/*
13194+
* Non-coherent DMA assignment and de-assignment will affect
13195+
* whether KVM honors guest MTRRs and cause changes in memtypes
13196+
* in TDP.
13197+
* So, pass %true unconditionally to indicate non-coherent DMA was,
13198+
* or will be involved, and that zapping SPTEs might be necessary.
13199+
*/
13200+
if (__kvm_mmu_honors_guest_mtrrs(true))
13201+
kvm_zap_gfn_range(kvm, gpa_to_gfn(0), gpa_to_gfn(~0ULL));
13202+
}
13203+
1319113204
void kvm_arch_register_noncoherent_dma(struct kvm *kvm)
1319213205
{
13193-
atomic_inc(&kvm->arch.noncoherent_dma_count);
13206+
if (atomic_inc_return(&kvm->arch.noncoherent_dma_count) == 1)
13207+
kvm_noncoherent_dma_assignment_start_or_stop(kvm);
1319413208
}
1319513209
EXPORT_SYMBOL_GPL(kvm_arch_register_noncoherent_dma);
1319613210

1319713211
void kvm_arch_unregister_noncoherent_dma(struct kvm *kvm)
1319813212
{
13199-
atomic_dec(&kvm->arch.noncoherent_dma_count);
13213+
if (!atomic_dec_return(&kvm->arch.noncoherent_dma_count))
13214+
kvm_noncoherent_dma_assignment_start_or_stop(kvm);
1320013215
}
1320113216
EXPORT_SYMBOL_GPL(kvm_arch_unregister_noncoherent_dma);
1320213217

0 commit comments

Comments
 (0)