X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=1195ded72bfa7ff95f6634329dfa41895df2ad0a;hb=cf77d12083b5092eca8c6f9899ec0892756845aa;hp=39ec6a98df6bc56b68fddda260830c79d90299b0;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;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 39ec6a98..1195ded7 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -1,8 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #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 <lttng/tracepoint-event.h>
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
@@ -14,7 +14,16 @@
 #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) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,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) \
@@ -43,7 +52,7 @@ 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)
 	)
 )
@@ -57,7 +66,7 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(addr, write_fault, user_fault, fetch_fault),
 
 	TP_FIELDS(
-		ctf_integer(__u64, addr, addr)
+		ctf_integer_hex(__u64, addr, addr)
 		ctf_integer(__u32, pferr,
 			(!!write_fault << 1) | (!!user_fault << 2)
 			| (!!fetch_fault << 4))
@@ -200,12 +209,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,
 
@@ -225,6 +261,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 		ctf_integer(bool, retry, retry)
 	)
 )
+#endif
+
 #endif /* LTTNG_TRACE_KVM_MMU_H */
 
 #undef TRACE_INCLUDE_PATH
@@ -233,4 +271,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #define TRACE_INCLUDE_FILE mmutrace
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>