Fix: Revert "KVM: MMU: show mmu_valid_gen..." (v5.1)

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

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index 65dabde9ff39b495b2bfaa6ceadba58d443f0b5d..e25a77454b97d5d2b6422c7d01db7c654af67021 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -1,7 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_KVM_MMU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MMU_H
 
-#include "../../../../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
@@ -13,7 +14,15 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm_mmu
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,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)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
 #define LTTNG_KVM_MMU_PAGE_FIELDS \
        ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
@@ -32,6 +41,7 @@
 
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
 /*
  * A pagetable walk has started
  */
@@ -45,7 +55,23 @@ 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(__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(
@@ -147,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
        TP_ARGS(sptep, gfn, access, gen),
 
        TP_FIELDS(
-               ctf_integer(void *, sptep, sptep)
+               ctf_integer_hex(void *, sptep, sptep)
                ctf_integer(gfn_t, gfn, gfn)
                ctf_integer(unsigned, access, access)
                ctf_integer(unsigned int, gen, gen)
@@ -165,7 +191,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
        TP_ARGS(sptep, gfn, access),
 
        TP_FIELDS(
-               ctf_integer(void *, sptep, sptep)
+               ctf_integer_hex(void *, sptep, sptep)
                ctf_integer(gfn_t, gfn, gfn)
                ctf_integer(unsigned, access, access)
        )
@@ -201,7 +227,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
                ctf_integer(int, vcpu_id, vcpu->vcpu_id)
                ctf_integer(gva_t, gva, gva)
                ctf_integer(u32, error_code, error_code)
-               ctf_integer(u64 *, sptep, sptep)
+               ctf_integer_hex(u64 *, sptep, sptep)
                ctf_integer(u64, old_spte, old_spte)
                ctf_integer(u64, new_spte, *sptep)
                ctf_integer(bool, retry, retry)
@@ -210,9 +236,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #endif /* LTTNG_TRACE_KVM_MMU_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE mmutrace
 
 /* This part must be outside protection */
-#include "../../../../../../probes/define_trace.h"
+#include <probes/define_trace.h>