X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=3ac3ddfe3f761d204c29592738f6f20a0790ffcf;hb=0155bce179eec75e9dc51ae27f1559242626b8ff;hp=e54704000282cb2ebb2770c7e5229c5a36311e8b;hpb=0980f1c78c0b749664800b805deaad453542445c;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index e5470400..3ac3ddfe 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -3,18 +3,18 @@ #define LTTNG_TRACE_KVM_MMU_H #include -#include +#include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) #include -#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ +#else /* if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */ #include -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ +#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */ #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm_mmu -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) || \ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0) || \ LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) #define LTTNG_KVM_MMU_PAGE_FIELDS \ @@ -23,7 +23,7 @@ ctf_integer(__u32, root_count, (sp)->root_count) \ ctf_integer(bool, unsync, (sp)->unsync) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) #define LTTNG_KVM_MMU_PAGE_FIELDS \ ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \ @@ -32,7 +32,7 @@ ctf_integer(__u32, root_count, (sp)->root_count) \ ctf_integer(bool, unsync, (sp)->unsync) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */ +#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */ #define LTTNG_KVM_MMU_PAGE_FIELDS \ ctf_integer(__u64, gfn, (sp)->gfn) \ @@ -40,9 +40,9 @@ ctf_integer(__u32, root_count, (sp)->root_count) \ ctf_integer(bool, unsync, (sp)->unsync) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */ +#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0)) /* * A pagetable walk has started */ @@ -56,7 +56,7 @@ LTTNG_TRACEPOINT_EVENT( ctf_integer(__u32, pferr, pferr) ) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */ +#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0)) */ /* * A pagetable walk has started */ @@ -72,7 +72,7 @@ LTTNG_TRACEPOINT_EVENT( | (!!fetch_fault << 4)) ) ) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */ +#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0)) */ /* We just walked a paging element */ LTTNG_TRACEPOINT_EVENT( @@ -163,7 +163,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page, TP_ARGS(sp) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) + +LTTNG_TRACEPOINT_EVENT_MAP( + mark_mmio_spte, + + kvm_mmu_mark_mmio_spte, + + TP_PROTO(u64 *sptep, gfn_t gfn, u64 spte), + TP_ARGS(sptep, gfn, spte), + + TP_FIELDS( + ctf_integer_hex(void *, sptep, sptep) + ctf_integer(gfn_t, gfn, gfn) + ctf_integer(unsigned, access, spte & ACC_ALL) + ctf_integer(unsigned int, gen, get_mmio_spte_generation(spte)) + ) +) + +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) LTTNG_TRACEPOINT_EVENT_MAP( mark_mmio_spte, @@ -181,7 +200,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( ) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */ +#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */ LTTNG_TRACEPOINT_EVENT_MAP( mark_mmio_spte, @@ -198,7 +217,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( ) ) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */ +#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */ LTTNG_TRACEPOINT_EVENT_MAP( handle_mmio_page_fault, @@ -215,7 +234,48 @@ LTTNG_TRACEPOINT_EVENT_MAP( ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) || \ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0)) +LTTNG_TRACEPOINT_EVENT_MAP( + fast_page_fault, + + kvm_mmu_fast_page_fault, + + TP_PROTO(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, + u64 *sptep, u64 old_spte, int ret), + TP_ARGS(vcpu, fault, sptep, old_spte, ret), + + TP_FIELDS( + ctf_integer(int, vcpu_id, vcpu->vcpu_id) + ctf_integer(gpa_t, cr2_or_gpa, fault->addr) + ctf_integer(u32, error_code, fault->error_code) + ctf_integer_hex(u64 *, sptep, sptep) + ctf_integer(u64, old_spte, old_spte) + ctf_integer(u64, new_spte, *sptep) + ctf_integer(int, ret, ret) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) +LTTNG_TRACEPOINT_EVENT_MAP( + fast_page_fault, + + kvm_mmu_fast_page_fault, + + TP_PROTO(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 error_code, + u64 *sptep, u64 old_spte, int ret), + TP_ARGS(vcpu, cr2_or_gpa, error_code, sptep, old_spte, ret), + + TP_FIELDS( + ctf_integer(int, vcpu_id, vcpu->vcpu_id) + ctf_integer(gpa_t, cr2_or_gpa, cr2_or_gpa) + ctf_integer(u32, error_code, error_code) + ctf_integer_hex(u64 *, sptep, sptep) + ctf_integer(u64, old_spte, old_spte) + ctf_integer(u64, new_spte, *sptep) + ctf_integer(int, ret, ret) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \ LTTNG_KERNEL_RANGE(4,19,103, 4,20,0) || \ LTTNG_KERNEL_RANGE(5,4,19, 5,5,0) || \ LTTNG_KERNEL_RANGE(5,5,3, 5,6,0) || \