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: Wonhyuk Yang <vvghjk1234@gmail.com>
Link: https://lore.kernel.org/r/20220510071001.87169-1-vvghjk1234@gmail.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 32b60a6b83bdd52aac1d4308d6e9a7370afa844c..40feb5ec761e7e2ce0c7464699e1a25e6d4daf48 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -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);

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 26a348389ecef353121f2b5238b3b00503635b70..ec2b42a5abe34cf443fb9257917dcacdd9bd7c0b 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -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,

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 2120d7c060a9a3ac081cf739ec228ebdece79676..331bdb0ae4b1c424c4c9e61b3e49800ac3261036 100644 (file)
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -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)
 );
 

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index c9b49a09e6b53a64be9f657671faf6ca467ed99d..3eae410864166cf54e45fe53030e452f22c8f649 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -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)