Commit ca0ea8a6 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 for compilation of selftests on non-x86 architectures

 - Fix for kvm_run->if_flag on SEV-ES

 - Fix for page table use-after-free if yielding during exit_mm()

 - Improve behavior when userspace starts a nested guest with invalid
   state

 - Fix missed wakeup with assigned devices but no VT-d posted interrupts

 - Do not tell userspace to save/restore an unsupported PMU MSR

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: Wake vCPU when delivering posted IRQ even if vCPU == this vCPU
  KVM: selftests: Add test to verify TRIPLE_FAULT on invalid L2 guest state
  KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state
  KVM: nVMX: Synthesize TRIPLE_FAULT for L2 if emulation is required
  KVM: VMX: Always clear vmx->fail on emulation_required
  selftests: KVM: Fix non-x86 compiling
  KVM: x86: Always set kvm_run->if_flag
  KVM: x86/mmu: Don't advance iterator after restart due to yielding
  KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all
parents 5dbdc4c5 fdba608f

Documentation/admin-guide/kernel-parameters.txt

+6 −2
Original line number Diff line number Diff line
@@ -2413,8 +2413,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

arch/x86/include/asm/kvm-x86-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ KVM_X86_OP(set_dr7) 
KVM_X86_OP(cache_reg)

KVM_X86_OP(get_rflags)

KVM_X86_OP(set_rflags)

KVM_X86_OP(get_if_flag)

KVM_X86_OP(tlb_flush_all)

KVM_X86_OP(tlb_flush_current)

KVM_X86_OP_NULL(tlb_remote_flush)

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,7 @@ struct kvm_x86_ops { 
	void (*cache_reg)(struct kvm_vcpu *vcpu, enum kvm_reg reg);

	unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);

	void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);

	bool (*get_if_flag)(struct kvm_vcpu *vcpu);



	void (*tlb_flush_all)(struct kvm_vcpu *vcpu);

	void (*tlb_flush_current)(struct kvm_vcpu *vcpu);

arch/x86/kvm/mmu/tdp_iter.c

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static gfn_t round_gfn_for_level(gfn_t gfn, int level) 
 */

void tdp_iter_restart(struct tdp_iter *iter)

{

	iter->yielded = false;

	iter->yielded_gfn = iter->next_last_level_gfn;

	iter->level = iter->root_level;
@@ -160,6 +161,11 @@ static bool try_step_up(struct tdp_iter *iter) 
 */

void tdp_iter_next(struct tdp_iter *iter)

{

	if (iter->yielded) {

		tdp_iter_restart(iter);

		return;

	}



	if (try_step_down(iter))

		return;

arch/x86/kvm/mmu/tdp_iter.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ struct tdp_iter { 
	 * iterator walks off the end of the paging structure.

	 */

	bool valid;

	/*

	 * True if KVM dropped mmu_lock and yielded in the middle of a walk, in

	 * which case tdp_iter_next() needs to restart the walk at the root

	 * level instead of advancing to the next entry.

	 */

	bool yielded;

};



/*