Drop support for kernels < 4.4 from kvm instrumentation

[lttng-modules.git] / include / instrumentation / events / arch / x86 / kvm / mmutrace.h

diff --git a/include/instrumentation/events/arch/x86/kvm/mmutrace.h b/include/instrumentation/events/arch/x86/kvm/mmutrace.h
index 6275b0691c7405c1d060151ba3a04134a0f0fc60..4107b6ef25f3211d816bf8257c256d8eeb7f57cc 100644 (file)
--- a/include/instrumentation/events/arch/x86/kvm/mmutrace.h
+++ b/include/instrumentation/events/arch/x86/kvm/mmutrace.h
@@ -3,18 +3,14 @@
 #define LTTNG_TRACE_KVM_MMU_H
 
 #include <lttng/tracepoint-event.h>
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
 #include <linux/trace_events.h>
-#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
-#include <linux/ftrace_event.h>
-#endif /* #else #if (LINUX_VERSION_CODE >= 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 +19,7 @@
        ctf_integer(__u32, root_count, (sp)->root_count) \
        ctf_integer(bool, unsync, (sp)->unsync)
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#else
 
 #define LTTNG_KVM_MMU_PAGE_FIELDS \
        ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
@@ -32,17 +28,8 @@
        ctf_integer(__u32, root_count, (sp)->root_count) \
        ctf_integer(bool, unsync, (sp)->unsync)
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
-
-#define LTTNG_KVM_MMU_PAGE_FIELDS \
-       ctf_integer(__u64, gfn, (sp)->gfn) \
-       ctf_integer(__u32, role, (sp)->role.word) \
-       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
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
 /*
  * A pagetable walk has started
  */
@@ -56,23 +43,6 @@ LTTNG_TRACEPOINT_EVENT(
                ctf_integer(__u32, pferr, pferr)
        )
 )
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */
-/*
- * A pagetable walk has started
- */
-LTTNG_TRACEPOINT_EVENT(
-       kvm_mmu_pagetable_walk,
-       TP_PROTO(u64 addr, int write_fault, int user_fault, int fetch_fault),
-       TP_ARGS(addr, write_fault, user_fault, fetch_fault),
-
-       TP_FIELDS(
-               ctf_integer_hex(__u64, addr, addr)
-               ctf_integer(__u32, pferr,
-                       (!!write_fault << 1) | (!!user_fault << 2)
-                       | (!!fetch_fault << 4))
-       )
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */
 
 /* We just walked a paging element */
 LTTNG_TRACEPOINT_EVENT(
@@ -163,42 +133,42 @@ 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_TRACEPOINT_EVENT_MAP(
        mark_mmio_spte,
 
        kvm_mmu_mark_mmio_spte,
 
-       TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access, unsigned int gen),
-       TP_ARGS(sptep, gfn, access, gen),
+       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, access)
-               ctf_integer(unsigned int, gen, gen)
+               ctf_integer(unsigned, access, spte & ACC_ALL)
+               ctf_integer(unsigned int, gen, get_mmio_spte_generation(spte))
        )
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+#else
 
 LTTNG_TRACEPOINT_EVENT_MAP(
        mark_mmio_spte,
 
        kvm_mmu_mark_mmio_spte,
 
-       TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
-       TP_ARGS(sptep, gfn, access),
+       TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access, unsigned int gen),
+       TP_ARGS(sptep, gfn, access, gen),
 
        TP_FIELDS(
                ctf_integer_hex(void *, sptep, sptep)
                ctf_integer(gfn_t, gfn, gfn)
                ctf_integer(unsigned, access, access)
+               ctf_integer(unsigned int, gen, gen)
        )
 )
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+#endif
 
 LTTNG_TRACEPOINT_EVENT_MAP(
        handle_mmio_page_fault,
@@ -215,7 +185,47 @@ 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_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) || \