Commit 34f4335c 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:

 - syzkaller NULL pointer dereference

 - TDP MMU performance issue with disabling dirty logging

 - 5.14 regression with SVM TSC scaling

 - indefinite stall on applying live patches

 - unstable selftest

 - memory leak from wrong copy-and-paste

 - missed PV TLB flush when racing with emulation

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: do not report a vCPU as preempted outside instruction boundaries
  KVM: x86: do not set st->preempted when going back to user space
  KVM: SVM: fix tsc scaling cache logic
  KVM: selftests: Make hyperv_clock selftest more stable
  KVM: x86/MMU: Zap non-leaf SPTEs when disabling dirty logging
  x86: drop bogus "cc" clobber from __try_cmpxchg_user_asm()
  KVM: x86/mmu: Check every prev_roots in __kvm_mmu_free_obsolete_roots()
  entry/kvm: Exit to user mode when TIF_NOTIFY_SIGNAL is set
  KVM: Don't null dereference ops->destroy
parents 32d380a7 6cd88243

arch/x86/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ struct kvm_vcpu_arch { 
	u64 ia32_misc_enable_msr;

	u64 smbase;

	u64 smi_count;

	bool at_instruction_boundary;

	bool tpr_access_reporting;

	bool xsaves_enabled;

	bool xfd_no_write_intercept;
@@ -1300,6 +1301,8 @@ struct kvm_vcpu_stat { 
	u64 nested_run;

	u64 directed_yield_attempted;

	u64 directed_yield_successful;

	u64 preemption_reported;

	u64 preemption_other;

	u64 guest_mode;

};

arch/x86/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ do { \ 
		       [ptr] "+m" (*_ptr),				\

		       [old] "+a" (__old)				\

		     : [new] ltype (__new)				\

		     : "memory", "cc");					\

		     : "memory");					\

	if (unlikely(__err))						\

		goto label;						\

	if (unlikely(!success))						\

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -5179,7 +5179,7 @@ static void __kvm_mmu_free_obsolete_roots(struct kvm *kvm, struct kvm_mmu *mmu) 
		roots_to_free |= KVM_MMU_ROOT_CURRENT;



	for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) {

		if (is_obsolete_root(kvm, mmu->root.hpa))

		if (is_obsolete_root(kvm, mmu->prev_roots[i].hpa))

			roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);

	}

arch/x86/kvm/mmu/tdp_iter.c

+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ static bool try_step_up(struct tdp_iter *iter) 
	return true;

}



/*

 * Step the iterator back up a level in the paging structure. Should only be

 * used when the iterator is below the root level.

 */

void tdp_iter_step_up(struct tdp_iter *iter)

{

	WARN_ON(!try_step_up(iter));

}



/*

 * Step to the next SPTE in a pre-order traversal of the paging structure.

 * To get to the next SPTE, the iterator either steps down towards the goal

arch/x86/kvm/mmu/tdp_iter.h

+1 −0
Original line number Diff line number Diff line
@@ -114,5 +114,6 @@ void tdp_iter_start(struct tdp_iter *iter, struct kvm_mmu_page *root, 
		    int min_level, gfn_t next_last_level_gfn);

void tdp_iter_next(struct tdp_iter *iter);

void tdp_iter_restart(struct tdp_iter *iter);

void tdp_iter_step_up(struct tdp_iter *iter);



#endif /* __KVM_X86_MMU_TDP_ITER_H */