X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=1cbbb8930f55a4c6a2cf52110291910cc14400b7;hb=0d8c4f9caa7156f6dd2de1fb9fa660f5a7d71afb;hp=e0234ff5a2a75e50e9ec11996b0f4e5b896f86b0;hpb=d3a7bdc5106ec364c84cc8ea13bcc0585b7c58f4;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 e0234ff5..1cbbb893 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -1,19 +1,47 @@
+/* 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 <linux/ftrace_event.h>
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/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))
+
+#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) \
 	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)
 
+#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)) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
 /*
  * A pagetable walk has started
  */
@@ -23,11 +51,27 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(addr, pferr),
 
 	TP_FIELDS(
-		ctf_integer(__u64, addr, addr)
+		ctf_integer_hex(__u64, addr, addr)
 		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(
@@ -129,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)
@@ -147,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)
 	)
@@ -164,12 +208,39 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	TP_ARGS(addr, gfn, access),
 
 	TP_FIELDS(
-		ctf_integer(u64, addr, addr)
+		ctf_integer_hex(u64, addr, addr)
 		ctf_integer(gfn_t, gfn, gfn)
 		ctf_integer(unsigned, access, access)
 	)
 )
 
+#if (LINUX_VERSION_CODE >= 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) || \
+	LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,92, 4,16,0,0) || \
+	LTTNG_UBUNTU_KERNEL_RANGE(5,3,18,43, 5,3,18,45) || \
+	LTTNG_UBUNTU_KERNEL_RANGE(5,3,18,46, 5,4,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, bool retry),
+	TP_ARGS(vcpu, cr2_or_gpa, error_code, sptep, old_spte, retry),
+
+	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(bool, retry, retry)
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_MAP(
 	fast_page_fault,
 
@@ -183,18 +254,20 @@ 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)
 	)
 )
+#endif
+
 #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>