X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=dd0c6798f93c09727cb4982f38e4c84c70241583;hb=175c0c3c2ee8aae7a1185f591988f02e0e3be103;hp=e25a77454b97d5d2b6422c7d01db7c654af67021;hpb=858dfdcae1b1a73b9dfa6612ab49ad791708cf13;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 e25a7745..dd0c6798 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -214,6 +214,30 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	)
 )
 
+#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_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,
 
@@ -233,6 +257,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 		ctf_integer(bool, retry, retry)
 	)
 )
+#endif
+
 #endif /* LTTNG_TRACE_KVM_MMU_H */
 
 #undef TRACE_INCLUDE_PATH