KVM: x86: Add tracepoint for dr_write/dr_read
PATCH 1/1 KVM: x86: Add tracepoint for dr_write/dr_read
From: Haiwei Li <[email protected]>
Add tracepoint trace_kvm_dr_write/trace_kvm_dr_read for x86 kvm.
Signed-off-by Haiwei Li <[email protected]>
--- arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/trace.h | 27 +++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 10 ++++++++-- arch/x86/kvm/x86.c | 1 + 4 files changed, 38 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/svm.c +2 -0
@@ -2423,12 +2423,14 @@ static int dr_interception(struct vcpu_svm *svm)if (!kvm_require_dr (&svm->vcpu, dr -16 ))return 1 ; val =kvm_register_read (&svm->vcpu, reg); +trace_kvm_dr_write (dr -16 , val);kvm_set_dr (&svm->vcpu, dr -16 , val); }else {if (!kvm_require_dr (&svm->vcpu, dr))return 1 ;kvm_get_dr (&svm->vcpu, dr, &val);kvm_register_write (&svm->vcpu, reg, val); +trace_kvm_dr_read (dr, val); }return kvm_skip_emulated_instruction (&svm->vcpu);
arch/x86/kvm/trace.h +27 -0
@@ -405,6 +405,33 @@ TRACE_EVENT(kvm_cr,#define trace_kvm_cr_read (cr, val) trace_kvm_cr(0, cr, val)#define trace_kvm_cr_write (cr, val) trace_kvm_cr(1, cr, val) +/* +* Tracepoint for guest DR access. +*/ +TRACE_EVENT (kvm_dr, + TP_PROTO(unsigned int rw, unsigned int dr, unsigned long val), +TP_ARGS (rw, dr, val), + +TP_STRUCT__entry ( + __field( unsigned int, rw ) + __field( unsigned int, dr ) + __field( unsigned long, val ) + ), + +TP_fast_assign ( + __entry->rw = rw; + __entry->dr = dr; + __entry->val = val; + ), + +TP_printk ("dr_%s %x = 0x%lx" , + __entry->rw ?"write" :"read" , + __entry->dr, __entry->val) +); + +#define trace_kvm_dr_read (dr, val) trace_kvm_dr(0, dr, val) +#define trace_kvm_dr_write (dr, val) trace_kvm_dr(1, dr, val) + TRACE_EVENT(kvm_pic_set_irq, TP_PROTO(__u8 chip, __u8 pin, __u8 elcr, __u8 imr, bool coalesced), TP_ARGS(chip, pin, elcr, imr, coalesced),
arch/x86/kvm/vmx/vmx.c +8 -2
@@ -5091,10 +5091,16 @@ static int handle_dr(struct kvm_vcpu *vcpu)if (kvm_get_dr (vcpu, dr, &val))return 1 ; +trace_kvm_dr_read (dr, val);kvm_register_write (vcpu, reg, val); - }else -if (kvm_set_dr (vcpu, dr,kvm_register_readl (vcpu, reg))) + }else { +unsigned long val; + + val =kvm_register_readl (vcpu, reg); +trace_kvm_dr_write (dr, val); +if (kvm_set_dr (vcpu, dr, val))return 1 ; + }return kvm_skip_emulated_instruction (vcpu); }
arch/x86/kvm/x86.c +1 -0
@@ -11153,6 +11153,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_page_fault);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_msr);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_cr); +EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_dr);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmrun);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit_inject);
Signature · 1 line
2.18.4
Quoted 3 lines · On Tue, Sep 29, 2020 at 04:55:15PM +0800, [email protected] wrote:
From: Haiwei Li <[email protected]>
Add tracepoint trace_kvm_dr_write/trace_kvm_dr_read for x86 kvm.
This is a changelog in the: i++; /* increment i */, style. Totally inadequate.
Quoted 7 lines · Peter Zijlstra
Quoted 3 lines · On Tue, Sep 29, 2020 at 04:55:15PM +0800, [email protected] wrote:
From: Haiwei Li <[email protected]>
Add tracepoint trace_kvm_dr_write/trace_kvm_dr_read for x86 kvm.
This is a changelog in the: i++; /* increment i */, style. Totally inadequate.
I will improve the changelog and resend. Thanks.
Haiwei