Fix: update kvm instrumentation for Ubuntu 3.13.0-144

[lttng-modules.git] / instrumentation / events / lttng-module / kvm.h

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
old mode 100755 (executable)
new mode 100644 (file)
index 3a6585f..85aa8a7
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -1,7 +1,7 @@
 #if !defined(LTTNG_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MAIN_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/version.h>
 
 #undef TRACE_SYSTEM
@@ -84,6 +84,32 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
        { KVM_TRACE_MMIO_READ, "read" }, \
        { KVM_TRACE_MMIO_WRITE, "write" }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
+       || LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
+       || LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
+       || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
+       || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \
+       || LTTNG_KERNEL_RANGE(4,1,50, 4,2,0) \
+       || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
+       || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,144, 3,14,0,0) \
+       || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
+       || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \
+       || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0))
+
+LTTNG_TRACEPOINT_EVENT(kvm_mmio,
+       TP_PROTO(int type, int len, u64 gpa, void *val),
+       TP_ARGS(type, len, gpa, val),
+
+       TP_FIELDS(
+               ctf_integer(u32, type, type)
+               ctf_integer(u32, len, len)
+               ctf_integer(u64, gpa, gpa)
+               ctf_sequence_hex(unsigned char, val, val, u32, len)
+       )
+)
+
+#else
+
 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
        TP_PROTO(int type, int len, u64 gpa, u64 val),
        TP_ARGS(type, len, gpa, val),
@@ -96,6 +122,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
        )
 )
 
+#endif
+
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
 
 #define kvm_fpu_load_symbol    \
@@ -111,30 +139,20 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(kvm_age_page,
        TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
        TP_ARGS(gfn, level, slot, ref),
 
-       TP_STRUCT__entry(
-               __field(        u64,    hva             )
-               __field(        u64,    gfn             )
-               __field(        u8,     level           )
-               __field(        u8,     referenced      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(gfn, gfn)
-               tp_assign(level, level)
-               tp_assign(hva, ((gfn - slot->base_gfn) <<
-                       PAGE_SHIFT) + slot->userspace_addr)
-               tp_assign(referenced, ref)
-       ),
-
-       TP_printk("hva %llx gfn %llx level %u %s",
-               __entry->hva, __entry->gfn, __entry->level,
-               __entry->referenced ? "YOUNG" : "OLD")
+       TP_FIELDS(
+               ctf_integer(u64, hva,
+                       ((gfn - slot->base_gfn) << PAGE_SHIFT) + slot->userspace_addr)
+               ctf_integer(u64, gfn, gfn)
+               ctf_integer(u8, level, level)
+               ctf_integer(u8, referenced, ref)
+       )
 )
 
 #else
@@ -208,7 +226,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_async_pf_nopresent_ready, kvm_async_pf_ready
        TP_ARGS(token, gva)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(
        kvm_async_pf_completed,
@@ -244,4 +263,4 @@ LTTNG_TRACEPOINT_EVENT(
 #endif /* LTTNG_TRACE_KVM_MAIN_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>