diff options
author | Sheng Yang <sheng@linux.intel.com> | 2009-04-27 08:35:43 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:50 -0400 |
commit | 522c68c4416de3cd3e11a9ff10d58e776a69ae1e (patch) | |
tree | 62940e35988f5e2a52df10276882ec64518ee369 /arch/x86/kvm/vmx.c | |
parent | 4b12f0de33a64dfc624b2480f55b674f7fa23ef2 (diff) |
KVM: Enable snooping control for supported hardware
Memory aliases with different memory type is a problem for guest. For the guest
without assigned device, the memory type of guest memory would always been the
same as host(WB); but for the assigned device, some part of memory may be used
as DMA and then set to uncacheable memory type(UC/WC), which would be a conflict of
host memory type then be a potential issue.
Snooping control can guarantee the cache correctness of memory go through the
DMA engine of VT-d.
[avi: fix build on ia64]
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 59b080c262e8..e8a5649f9c15 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -3581,11 +3581,26 @@ static u64 vmx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) | |||
3581 | { | 3581 | { |
3582 | u64 ret; | 3582 | u64 ret; |
3583 | 3583 | ||
3584 | /* For VT-d and EPT combination | ||
3585 | * 1. MMIO: always map as UC | ||
3586 | * 2. EPT with VT-d: | ||
3587 | * a. VT-d without snooping control feature: can't guarantee the | ||
3588 | * result, try to trust guest. | ||
3589 | * b. VT-d with snooping control feature: snooping control feature of | ||
3590 | * VT-d engine can guarantee the cache correctness. Just set it | ||
3591 | * to WB to keep consistent with host. So the same as item 3. | ||
3592 | * 3. EPT without VT-d: always map as WB and set IGMT=1 to keep | ||
3593 | * consistent with host MTRR | ||
3594 | */ | ||
3584 | if (is_mmio) | 3595 | if (is_mmio) |
3585 | ret = MTRR_TYPE_UNCACHABLE << VMX_EPT_MT_EPTE_SHIFT; | 3596 | ret = MTRR_TYPE_UNCACHABLE << VMX_EPT_MT_EPTE_SHIFT; |
3597 | else if (vcpu->kvm->arch.iommu_domain && | ||
3598 | !(vcpu->kvm->arch.iommu_flags & KVM_IOMMU_CACHE_COHERENCY)) | ||
3599 | ret = kvm_get_guest_memory_type(vcpu, gfn) << | ||
3600 | VMX_EPT_MT_EPTE_SHIFT; | ||
3586 | else | 3601 | else |
3587 | ret = (kvm_get_guest_memory_type(vcpu, gfn) << | 3602 | ret = (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT) |
3588 | VMX_EPT_MT_EPTE_SHIFT) | VMX_EPT_IGMT_BIT; | 3603 | | VMX_EPT_IGMT_BIT; |
3589 | 3604 | ||
3590 | return ret; | 3605 | return ret; |
3591 | } | 3606 | } |