History

Revert "KVM: VMX: Always honor guest PAT on CPUs that support self-snoop"

This reverts commit 377b2f359d1f71c75f8cc352b5c81f2210312d83. This caused a regression with the bochsdrm driver, which used ioremap() instead of ioremap_wc() to map the video RAM. After the commit, the WB memory type is used without the IGNORE_PAT, resulting in the slower UC memory type. In fact, UC is slow enough to basically cause guests to not boot... but only on new processors such as Sapphire Rapids and Cascade Lake. Coffee Lake for example works properly, though that might also be an effect of being on a larger, more NUMA system. The driver has been fixed but that does not help older guests. Until we figure out whether Cascade Lake and newer processors are working as intended, revert the commit. Long term we might add a quirk, but the details depend on whether the processors are working as intended: for example if they are, the quirk might reference bochs-compatible devices, e.g. in the name and documentation, so that userspace can disable the quirk by default and only leave it enabled if such a device is being exposed to the guest. If instead this is actually a bug in CLX+, then the actions we need to take are different and depend on the actual cause of the bug.

Paolo Bonzini committed 2 years ago

Commit 9d70f3f1 parent 59cbd4e2 files · +7 −11Browse files

Unified · Split

2 files
  1. arch/x86/kvm/mmu/mmu.c +3 −5
  2. arch/x86/kvm/vmx/vmx.c +4 −6
arch/x86/kvm/mmu/mmu.c+3−5
@@ -4674,16 +4674,14 @@ out_unlock: · 4673 unmodified lines
4674bool kvm_mmu_may_ignore_guest_pat(void)4674bool kvm_mmu_may_ignore_guest_pat(void)
4675{4675{
4676 /*4676 /*
4677 * When EPT is enabled (shadow_memtype_mask is non-zero), the CPU does4677 * When EPT is enabled (shadow_memtype_mask is non-zero), and the VM
4678 * not support self-snoop (or is affected by an erratum), and the VM
4679 * has non-coherent DMA (DMA doesn't snoop CPU caches), KVM's ABI is to4678 * has non-coherent DMA (DMA doesn't snoop CPU caches), KVM's ABI is to
4680 * honor the memtype from the guest's PAT so that guest accesses to4679 * honor the memtype from the guest's PAT so that guest accesses to
4681 * memory that is DMA'd aren't cached against the guest's wishes. As a4680 * memory that is DMA'd aren't cached against the guest's wishes. As a
4682 * result, KVM _may_ ignore guest PAT, whereas without non-coherent DMA,4681 * result, KVM _may_ ignore guest PAT, whereas without non-coherent DMA,
4683 * KVM _always_ ignores or honors guest PAT, i.e. doesn't toggle SPTE4682 * KVM _always_ ignores guest PAT (when EPT is enabled).
4684 * bits in response to non-coherent device (un)registration.
4685 */4683 */
4686 return !static_cpu_has(X86_FEATURE_SELFSNOOP) && shadow_memtype_mask;4684 return shadow_memtype_mask;
4687}4685}
4688 4686
4689int kvm_tdp_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)4687int kvm_tdp_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
arch/x86/kvm/vmx/vmx.c+4−6
@@ -7659,13 +7659,11 @@ u8 vmx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) · 7658 unmodified lines
7659 7659
7660 /*7660 /*
7661 * Force WB and ignore guest PAT if the VM does NOT have a non-coherent7661 * Force WB and ignore guest PAT if the VM does NOT have a non-coherent
7662 * device attached and the CPU doesn't support self-snoop. Letting the7662 * device attached. Letting the guest control memory types on Intel
7663 * guest control memory types on Intel CPUs without self-snoop may7663 * CPUs may result in unexpected behavior, and so KVM's ABI is to trust
7664 * result in unexpected behavior, and so KVM's (historical) ABI is to7664 * the guest to behave only as a last resort.
7665 * trust the guest to behave only as a last resort.
7666 */7665 */
7667 if (!static_cpu_has(X86_FEATURE_SELFSNOOP) &&7666 if (!kvm_arch_has_noncoherent_dma(vcpu->kvm))
7668 !kvm_arch_has_noncoherent_dma(vcpu->kvm))
7669 return (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT) | VMX_EPT_IPAT_BIT;7667 return (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT) | VMX_EPT_IPAT_BIT;
7670 7668
7671 return (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT);7669 return (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t