Commit 954f419b authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: nSVM: move nested vmrun tracepoint to enter_svm_guest_mode 



This way trace will capture all the nested mode entries
(including entries after migration, and from smm)

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210217145718.1217358-3-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f5c59b57

arch/x86/kvm/svm/nested.c

+14 −12
Original line number Diff line number Diff line
@@ -436,6 +436,20 @@ int enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb12_gpa, 
{

	int ret;



	trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb12_gpa,

			       vmcb12->save.rip,

			       vmcb12->control.int_ctl,

			       vmcb12->control.event_inj,

			       vmcb12->control.nested_ctl);



	trace_kvm_nested_intercepts(vmcb12->control.intercepts[INTERCEPT_CR] & 0xffff,

				    vmcb12->control.intercepts[INTERCEPT_CR] >> 16,

				    vmcb12->control.intercepts[INTERCEPT_EXCEPTION],

				    vmcb12->control.intercepts[INTERCEPT_WORD3],

				    vmcb12->control.intercepts[INTERCEPT_WORD4],

				    vmcb12->control.intercepts[INTERCEPT_WORD5]);





	svm->nested.vmcb12_gpa = vmcb12_gpa;

	load_nested_vmcb_control(svm, &vmcb12->control);

	nested_prepare_vmcb_save(svm, vmcb12);
@@ -489,18 +503,6 @@ int nested_svm_vmrun(struct vcpu_svm *svm) 
		goto out;

	}



	trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb12_gpa,

			       vmcb12->save.rip,

			       vmcb12->control.int_ctl,

			       vmcb12->control.event_inj,

			       vmcb12->control.nested_ctl);



	trace_kvm_nested_intercepts(vmcb12->control.intercepts[INTERCEPT_CR] & 0xffff,

				    vmcb12->control.intercepts[INTERCEPT_CR] >> 16,

				    vmcb12->control.intercepts[INTERCEPT_EXCEPTION],

				    vmcb12->control.intercepts[INTERCEPT_WORD3],

				    vmcb12->control.intercepts[INTERCEPT_WORD4],

				    vmcb12->control.intercepts[INTERCEPT_WORD5]);



	/* Clear internal status */

	kvm_clear_exception_queue(&svm->vcpu);