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

Commit 7753ea09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kvm-4.15-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM updates from Radim Krčmář:
 "Trimmed second batch of KVM changes for Linux 4.15:

   - GICv4 Support for KVM/ARM

   - re-introduce support for CPUs without virtual NMI (cc stable) and
     allow testing of KVM without virtual NMI on available CPUs

   - fix long-standing performance issues with assigned devices on AMD
     (cc stable)"

* tag 'kvm-4.15-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (30 commits)
  kvm: vmx: Allow disabling virtual NMI support
  kvm: vmx: Reinstate support for CPUs without virtual NMI
  KVM: SVM: obey guest PAT
  KVM: arm/arm64: Don't queue VLPIs on INV/INVALL
  KVM: arm/arm64: Fix GICv4 ITS initialization issues
  KVM: arm/arm64: GICv4: Theory of operations
  KVM: arm/arm64: GICv4: Enable VLPI support
  KVM: arm/arm64: GICv4: Prevent userspace from changing doorbell affinity
  KVM: arm/arm64: GICv4: Prevent a VM using GICv4 from being saved
  KVM: arm/arm64: GICv4: Enable virtual cpuif if VLPIs can be delivered
  KVM: arm/arm64: GICv4: Hook vPE scheduling into vgic flush/sync
  KVM: arm/arm64: GICv4: Use the doorbell interrupt as an unblocking source
  KVM: arm/arm64: GICv4: Add doorbell interrupt handling
  KVM: arm/arm64: GICv4: Use pending_last as a scheduling hint
  KVM: arm/arm64: GICv4: Handle INVALL applied to a vPE
  KVM: arm/arm64: GICv4: Propagate property updates to VLPIs
  KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE
  KVM: arm/arm64: GICv4: Handle CLEAR applied to a VLPI
  KVM: arm/arm64: GICv4: Propagate affinity changes to the physical ITS
  KVM: arm/arm64: GICv4: Unmap VLPI when freeing an LPI
  ...
parents 83ada031 d02fcf50

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,10 @@ 
			[KVM,ARM] Trap guest accesses to GICv3 common

			system registers



	kvm-arm.vgic_v4_enable=

			[KVM,ARM] Allow use of GICv4 for direct injection of

			LPIs.



	kvm-intel.ept=	[KVM,Intel] Disable extended page tables

			(virtualized MMU) support on capable Intel chips.

			Default is 1 (enabled)

Documentation/virtual/kvm/devices/arm-vgic-its.txt

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ Groups: 
    -EINVAL: Inconsistent restored data

    -EFAULT: Invalid guest ram access

    -EBUSY:  One or more VCPUS are running

    -EACCES: The virtual ITS is backed by a physical GICv4 ITS, and the

	     state is not available



  KVM_DEV_ARM_VGIC_GRP_ITS_REGS

  Attributes:

arch/arm/kvm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -23,6 +24,8 @@ config KVM 
	select PREEMPT_NOTIFIERS

	select ANON_INODES

	select ARM_GIC

	select ARM_GIC_V3

	select ARM_GIC_V3_ITS

	select HAVE_KVM_CPU_RELAX_INTERCEPT

	select HAVE_KVM_ARCH_TLB_FLUSH_ALL

	select KVM_MMIO
@@ -36,6 +39,8 @@ config KVM 
	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER

	---help---

	  Support hosting virtualized guest machines.

arch/arm/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ obj-y += $(KVM)/arm/vgic/vgic-init.o 
obj-y += $(KVM)/arm/vgic/vgic-irqfd.o

obj-y += $(KVM)/arm/vgic/vgic-v2.o

obj-y += $(KVM)/arm/vgic/vgic-v3.o

obj-y += $(KVM)/arm/vgic/vgic-v4.o

obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v3.o

arch/arm64/kvm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -36,6 +37,8 @@ config KVM 
	select HAVE_KVM_MSI

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	---help---

	  Support hosting virtualized guest machines.

	  We don't support KVM with 16K page tables yet, due to the multiple