Commit 8b89fe1f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: x86: move tracepoints outside extended quiescent state 



Invoking tracepoints within kvm_guest_enter/kvm_guest_exit causes a
lockdep splat.

Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6764e5eb

arch/x86/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -3422,6 +3422,8 @@ static int handle_exit(struct kvm_vcpu *vcpu) 
	struct kvm_run *kvm_run = vcpu->run;

	u32 exit_code = svm->vmcb->control.exit_code;



	trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);



	if (!is_cr_intercept(svm, INTERCEPT_CR0_WRITE))

		vcpu->arch.cr0 = svm->vmcb->save.cr0;

	if (npt_enabled)
@@ -3892,8 +3894,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) 
	vcpu->arch.regs[VCPU_REGS_RSP] = svm->vmcb->save.rsp;

	vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip;



	trace_kvm_exit(svm->vmcb->control.exit_code, vcpu, KVM_ISA_SVM);



	if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))

		kvm_before_handle_nmi(&svm->vcpu);

arch/x86/kvm/vmx.c

+2 −1
Original line number Diff line number Diff line
@@ -8042,6 +8042,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) 
	u32 exit_reason = vmx->exit_reason;

	u32 vectoring_info = vmx->idt_vectoring_info;



	trace_kvm_exit(exit_reason, vcpu, KVM_ISA_VMX);



	/*

	 * Flush logged GPAs PML buffer, this will make dirty_bitmap more

	 * updated. Another good is, in kvm_vm_ioctl_get_dirty_log, before
@@ -8668,7 +8670,6 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) 
	vmx->loaded_vmcs->launched = 1;



	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);

	trace_kvm_exit(vmx->exit_reason, vcpu, KVM_ISA_VMX);



	/*

	 * the KVM_REQ_EVENT optimization bit is only on for one entry, and if

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -6515,6 +6515,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
	if (req_immediate_exit)

		smp_send_reschedule(vcpu->cpu);



	trace_kvm_entry(vcpu->vcpu_id);

	wait_lapic_expire(vcpu);

	__kvm_guest_enter();



	if (unlikely(vcpu->arch.switch_db_regs)) {
@@ -6527,8 +6529,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
		vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;

	}



	trace_kvm_entry(vcpu->vcpu_id);

	wait_lapic_expire(vcpu);

	kvm_x86_ops->run(vcpu);



	/*