Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df14a68d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:

 - Fix FPU refactoring ("kvm: x86: fix load xsave feature warning")

 - Fix eager FPU mode (Cc stable)

 - AMD bits of MTRR virtualization

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: fix load xsave feature warning
  KVM: x86: apply guest MTRR virtualization on host reserved pages
  KVM: SVM: Sync g_pat with guest-written PAT value
  KVM: SVM: use NPT page attributes
  KVM: count number of assigned devices
  KVM: VMX: fix vmwrite to invalid VMCS
  KVM: x86: reintroduce kvm_is_mmio_pfn
  x86: hyperv: add CPUID bit for crash handlers
parents bec33cd2 ee4100da

arch/x86/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ struct kvm_arch { 
	bool iommu_noncoherent;

#define __KVM_HAVE_ARCH_NONCOHERENT_DMA

	atomic_t noncoherent_dma_count;

#define __KVM_HAVE_ARCH_ASSIGNED_DEVICE

	atomic_t assigned_device_count;

	struct kvm_pic *vpic;

	struct kvm_ioapic *vioapic;

	struct kvm_pit *vpit;

arch/x86/include/uapi/asm/hyperv.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ 
#define HV_X64_HYPERCALL_PARAMS_XMM_AVAILABLE		(1 << 4)

/* Support for a virtual guest idle state is available */

#define HV_X64_GUEST_IDLE_STATE_AVAILABLE		(1 << 5)

/* Guest crash data handler available */

#define HV_X64_GUEST_CRASH_MSR_AVAILABLE		(1 << 10)



/*

 * Implementation recommendations. Indicates which behaviors the hypervisor

arch/x86/kvm/cpuid.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) 
		best->ebx = xstate_required_size(vcpu->arch.xcr0, true);



	vcpu->arch.eager_fpu = use_eager_fpu() || guest_cpuid_has_mpx(vcpu);

	if (vcpu->arch.eager_fpu)

		kvm_x86_ops->fpu_activate(vcpu);



	/*

	 * The existing code assumes virtual address is 48-bit in the canonical

arch/x86/kvm/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ int kvm_assign_device(struct kvm *kvm, struct pci_dev *pdev) 
			goto out_unmap;

	}



	kvm_arch_start_assignment(kvm);

	pci_set_dev_assigned(pdev);



	dev_info(&pdev->dev, "kvm assign device\n");
@@ -224,6 +225,7 @@ int kvm_deassign_device(struct kvm *kvm, struct pci_dev *pdev) 
	iommu_detach_device(domain, &pdev->dev);



	pci_clear_dev_assigned(pdev);

	kvm_arch_end_assignment(kvm);



	dev_info(&pdev->dev, "kvm deassign device\n");

arch/x86/kvm/mmu.c

+9 −1
Original line number Diff line number Diff line
@@ -2479,6 +2479,14 @@ static int mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn, 
	return 0;

}



static bool kvm_is_mmio_pfn(pfn_t pfn)

{

	if (pfn_valid(pfn))

		return !is_zero_pfn(pfn) && PageReserved(pfn_to_page(pfn));



	return true;

}



static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,

		    unsigned pte_access, int level,

		    gfn_t gfn, pfn_t pfn, bool speculative,
@@ -2506,7 +2514,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
		spte |= PT_PAGE_SIZE_MASK;

	if (tdp_enabled)

		spte |= kvm_x86_ops->get_mt_mask(vcpu, gfn,

			kvm_is_reserved_pfn(pfn));

			kvm_is_mmio_pfn(pfn));



	if (host_writable)

		spte |= SPTE_HOST_WRITEABLE;