Commit 3e633e7e authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Sean Christopherson
Browse files

KVM: x86: Add interrupt injection information to the kvm_entry tracepoint 



Add VMX/SVM specific interrupt injection info the kvm_entry tracepoint.
As is done with kvm_exit, gather the information via a kvm_x86_ops hook
to avoid the moderately costly VMREADs on VMX when the tracepoint isn't
enabled.

Opportunistically rename the parameters in the get_exit_info()
declaration to match the names used by both SVM and VMX.

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20240910200350.264245-2-mlevitsk@redhat.com


[sean: drop is_guest_mode() change, use intr_info/error_code for names]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 62e41f6b

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ KVM_X86_OP(get_l2_tsc_multiplier) 
KVM_X86_OP(write_tsc_offset)

KVM_X86_OP(write_tsc_multiplier)

KVM_X86_OP(get_exit_info)

KVM_X86_OP(get_entry_info)

KVM_X86_OP(check_intercept)

KVM_X86_OP(handle_exit_irqoff)

KVM_X86_OP_OPTIONAL(update_cpu_dirty_logging)

arch/x86/include/asm/kvm_host.h

+5 −2
Original line number Diff line number Diff line
@@ -1770,12 +1770,15 @@ struct kvm_x86_ops { 
	void (*write_tsc_multiplier)(struct kvm_vcpu *vcpu);



	/*

	 * Retrieve somewhat arbitrary exit information.  Intended to

	 * Retrieve somewhat arbitrary exit/entry information.  Intended to

	 * be used only from within tracepoints or error paths.

	 */

	void (*get_exit_info)(struct kvm_vcpu *vcpu, u32 *reason,

			      u64 *info1, u64 *info2,

			      u32 *exit_int_info, u32 *exit_int_info_err_code);

			      u32 *intr_info, u32 *error_code);



	void (*get_entry_info)(struct kvm_vcpu *vcpu,

			       u32 *intr_info, u32 *error_code);



	int (*check_intercept)(struct kvm_vcpu *vcpu,

			       struct x86_instruction_info *info,

arch/x86/kvm/svm/svm.c

+16 −0
Original line number Diff line number Diff line
@@ -3542,6 +3542,21 @@ static void svm_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason, 
		*error_code = 0;

}



static void svm_get_entry_info(struct kvm_vcpu *vcpu, u32 *intr_info,

			       u32 *error_code)

{

	struct vmcb_control_area *control = &to_svm(vcpu)->vmcb->control;



	*intr_info = control->event_inj;



	if ((*intr_info & SVM_EXITINTINFO_VALID) &&

	    (*intr_info & SVM_EXITINTINFO_VALID_ERR))

		*error_code = control->event_inj_err;

	else

		*error_code = 0;



}



static int svm_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -5082,6 +5097,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.required_apicv_inhibits = AVIC_REQUIRED_APICV_INHIBITS,



	.get_exit_info = svm_get_exit_info,

	.get_entry_info = svm_get_entry_info,



	.vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid,

arch/x86/kvm/trace.h

+8 −1
Original line number Diff line number Diff line
@@ -22,15 +22,22 @@ TRACE_EVENT(kvm_entry, 
		__field(	unsigned int,	vcpu_id		)

		__field(	unsigned long,	rip		)

		__field(	bool,		immediate_exit	)

		__field(	u32,		intr_info	)

		__field(	u32,		error_code	)

	),



	TP_fast_assign(

		__entry->vcpu_id        = vcpu->vcpu_id;

		__entry->rip		= kvm_rip_read(vcpu);

		__entry->immediate_exit	= force_immediate_exit;



		kvm_x86_call(get_entry_info)(vcpu, &__entry->intr_info,

					     &__entry->error_code);

	),



	TP_printk("vcpu %u, rip 0x%lx%s", __entry->vcpu_id, __entry->rip,

	TP_printk("vcpu %u, rip 0x%lx intr_info 0x%08x error_code 0x%08x%s",

		  __entry->vcpu_id, __entry->rip,

		  __entry->intr_info, __entry->error_code,

		  __entry->immediate_exit ? "[immediate exit]" : "")

);

arch/x86/kvm/vmx/main.c

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { 
	.get_mt_mask = vmx_get_mt_mask,



	.get_exit_info = vmx_get_exit_info,

	.get_entry_info = vmx_get_entry_info,



	.vcpu_after_set_cpuid = vmx_vcpu_after_set_cpuid,