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

Commit aa1be08f 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:

 - PPC and ARM bugfixes from submaintainers

 - Fix old Windows versions on AMD (recent regression)

 - Fix old Linux versions on processors without EPT

 - Fixes for LAPIC timer optimizations

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (21 commits)
  KVM: nVMX: Fix size checks in vmx_set_nested_state
  KVM: selftests: make hyperv_cpuid test pass on AMD
  KVM: lapic: Check for in-kernel LAPIC before deferencing apic pointer
  KVM: fix KVM_CLEAR_DIRTY_LOG for memory slots of unaligned size
  x86/kvm/mmu: reset MMU context when 32-bit guest switches PAE
  KVM: x86: Whitelist port 0x7e for pre-incrementing %rip
  Documentation: kvm: fix dirty log ioctl arch lists
  KVM: VMX: Move RSB stuffing to before the first RET after VM-Exit
  KVM: arm/arm64: Don't emulate virtual timers on userspace ioctls
  kvm: arm: Skip stage2 huge mappings for unaligned ipa backed by THP
  KVM: arm/arm64: Ensure vcpu target is unset on reset failure
  KVM: lapic: Convert guest TSC to host time domain if necessary
  KVM: lapic: Allow user to disable adaptive tuning of timer advancement
  KVM: lapic: Track lapic timer advance per vCPU
  KVM: lapic: Disable timer advancement if adaptive tuning goes haywire
  x86: kvm: hyper-v: deal with buggy TLB flush requests from WS2012
  KVM: x86: Consider LAPIC TSC-Deadline timer expired if deadline too short
  KVM: PPC: Book3S: Protect memslots while validating user address
  KVM: PPC: Book3S HV: Perserve PSSCR FAKE_SUSPEND bit on guest exit
  KVM: arm/arm64: vgic-v3: Retire pending interrupts on disabling LPIs
  ...
parents 82463436 e8ab8d24

Documentation/virtual/kvm/api.txt

+6 −5
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ cpu's hardware control block. 
4.8 KVM_GET_DIRTY_LOG (vm ioctl)



Capability: basic

Architectures: x86

Architectures: all

Type: vm ioctl

Parameters: struct kvm_dirty_log (in/out)

Returns: 0 on success, -1 on error
@@ -3810,7 +3810,7 @@ to I/O ports. 
4.117 KVM_CLEAR_DIRTY_LOG (vm ioctl)



Capability: KVM_CAP_MANUAL_DIRTY_LOG_PROTECT

Architectures: x86

Architectures: x86, arm, arm64, mips

Type: vm ioctl

Parameters: struct kvm_dirty_log (in)

Returns: 0 on success, -1 on error
@@ -3830,8 +3830,9 @@ The ioctl clears the dirty status of pages in a memory slot, according to 
the bitmap that is passed in struct kvm_clear_dirty_log's dirty_bitmap

field.  Bit 0 of the bitmap corresponds to page "first_page" in the

memory slot, and num_pages is the size in bits of the input bitmap.

Both first_page and num_pages must be a multiple of 64.  For each bit

that is set in the input bitmap, the corresponding page is marked "clean"

first_page must be a multiple of 64; num_pages must also be a multiple of

64 unless first_page + num_pages is the size of the memory slot.  For each

bit that is set in the input bitmap, the corresponding page is marked "clean"

in KVM's dirty bitmap, and dirty tracking is re-enabled for that page

(for example via write-protection, or by clearing the dirty bit in

a page table entry).
@@ -4799,7 +4800,7 @@ and injected exceptions. 


7.18 KVM_CAP_MANUAL_DIRTY_LOG_PROTECT



Architectures: all

Architectures: x86, arm, arm64, mips

Parameters: args[0] whether feature should be enabled or not



With this capability enabled, KVM_GET_DIRTY_LOG will not automatically

arch/powerpc/kvm/book3s_64_vio.c

+3 −3
Original line number Diff line number Diff line
@@ -543,14 +543,14 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
	if (ret != H_SUCCESS)

		return ret;



	idx = srcu_read_lock(&vcpu->kvm->srcu);



	ret = kvmppc_tce_validate(stt, tce);

	if (ret != H_SUCCESS)

		return ret;

		goto unlock_exit;



	dir = iommu_tce_direction(tce);



	idx = srcu_read_lock(&vcpu->kvm->srcu);



	if ((dir != DMA_NONE) && kvmppc_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) {

		ret = H_PARAMETER;

		goto unlock_exit;

arch/powerpc/kvm/book3s_hv.c

+3 −1
Original line number Diff line number Diff line
@@ -3423,7 +3423,9 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit, 
	vcpu->arch.shregs.sprg2 = mfspr(SPRN_SPRG2);

	vcpu->arch.shregs.sprg3 = mfspr(SPRN_SPRG3);



	mtspr(SPRN_PSSCR, host_psscr);

	/* Preserve PSSCR[FAKE_SUSPEND] until we've called kvmppc_save_tm_hv */

	mtspr(SPRN_PSSCR, host_psscr |

	      (local_paca->kvm_hstate.fake_suspend << PSSCR_FAKE_SUSPEND_LG));

	mtspr(SPRN_HFSCR, host_hfscr);

	mtspr(SPRN_CIABR, host_ciabr);

	mtspr(SPRN_DAWR, host_dawr);

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ union kvm_mmu_extended_role { 
		unsigned int valid:1;

		unsigned int execonly:1;

		unsigned int cr0_pg:1;

		unsigned int cr4_pae:1;

		unsigned int cr4_pse:1;

		unsigned int cr4_pke:1;

		unsigned int cr4_smap:1;

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

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)

#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	(1 << 2)

#define KVM_X86_QUIRK_OUT_7E_INC_RIP	(1 << 3)



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002