Commit faa03b39 authored by Wonhyuk Yang's avatar Wonhyuk Yang Committed by Paolo Bonzini
Browse files

KVM: Add extra information in kvm_page_fault trace point 



Currently, kvm_page_fault trace point provide fault_address and error
code. However it is not enough to find which cpu and instruction
cause kvm_page_faults. So add vcpu id and instruction pointer in
kvm_page_fault trace point.

Cc: Baik Song An <bsahn@etri.re.kr>
Cc: Hong Yeon Kim <kimhy@etri.re.kr>
Cc: Taeung Song <taeung@reallinux.co.kr>
Cc: linuxgeek@linuxgeek.io
Signed-off-by: default avatarWonhyuk Yang <vvghjk1234@gmail.com>
Link: https://lore.kernel.org/r/20220510071001.87169-1-vvghjk1234@gmail.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b5cb32b1

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -4302,7 +4302,7 @@ int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code, 


	vcpu->arch.l1tf_flush_l1d = true;

	if (!flags) {

		trace_kvm_page_fault(fault_address, error_code);

		trace_kvm_page_fault(vcpu, fault_address, error_code);



		if (kvm_event_needs_reinjection(vcpu))

			kvm_mmu_unprotect_page_virt(vcpu, fault_address);

arch/x86/kvm/svm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static int npf_interception(struct kvm_vcpu *vcpu) 
	u64 fault_address = svm->vmcb->control.exit_info_2;

	u64 error_code = svm->vmcb->control.exit_info_1;



	trace_kvm_page_fault(fault_address, error_code);

	trace_kvm_page_fault(vcpu, fault_address, error_code);

	return kvm_mmu_page_fault(vcpu, fault_address, error_code,

			static_cpu_has(X86_FEATURE_DECODEASSISTS) ?

			svm->vmcb->control.insn_bytes : NULL,

arch/x86/kvm/trace.h

+9 −3
Original line number Diff line number Diff line
@@ -394,20 +394,26 @@ TRACE_EVENT(kvm_inj_exception, 
 * Tracepoint for page fault.

 */

TRACE_EVENT(kvm_page_fault,

	TP_PROTO(unsigned long fault_address, unsigned int error_code),

	TP_ARGS(fault_address, error_code),

	TP_PROTO(struct kvm_vcpu *vcpu, unsigned long fault_address,

		 unsigned int error_code),

	TP_ARGS(vcpu, fault_address, error_code),



	TP_STRUCT__entry(

		__field(	unsigned int,	vcpu_id		)

		__field(	unsigned long,	guest_rip	)

		__field(	unsigned long,	fault_address	)

		__field(	unsigned int,	error_code	)

	),



	TP_fast_assign(

		__entry->vcpu_id	= vcpu->vcpu_id;

		__entry->guest_rip	= kvm_rip_read(vcpu);

		__entry->fault_address	= fault_address;

		__entry->error_code	= error_code;

	),



	TP_printk("address %lx error_code %x",

	TP_printk("vcpu %u rip 0x%lx address 0x%lx error_code %x",

		  __entry->vcpu_id, __entry->guest_rip,

		  __entry->fault_address, __entry->error_code)

);

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -5638,7 +5638,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) 
		vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO, GUEST_INTR_STATE_NMI);



	gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);

	trace_kvm_page_fault(gpa, exit_qualification);

	trace_kvm_page_fault(vcpu, gpa, exit_qualification);



	/* Is it a read fault? */

	error_code = (exit_qualification & EPT_VIOLATION_ACC_READ)