X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=9f2102846304f7c91bcfe275a134be3a062f0710;hb=369708f464bedc0682151df9308cebfa14dbdb2b;hp=a71b2a1ae9bc5bce96aa5e247953be3ce1d3a868;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;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 a71b2a1a..9f210284 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -1,8 +1,10 @@
+/* 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 <linux/ftrace_event.h>
+#include <probes/lttng-tracepoint-event.h>
+
+#include <linux/trace_events.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm_mmu
@@ -22,12 +24,11 @@ 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)
 	)
 )
 
-
 /* We just walked a paging element */
 LTTNG_TRACEPOINT_EVENT(
 	kvm_mmu_paging_element,
@@ -122,13 +123,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 
 	kvm_mmu_mark_mmio_spte,
 
-	TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
-	TP_ARGS(sptep, gfn, access),
+	TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access, unsigned int gen),
+	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)
 	)
 )
 
@@ -141,7 +143,7 @@ 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)
 	)
@@ -152,26 +154,27 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 
 	kvm_mmu_fast_page_fault,
 
-	TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
+	TP_PROTO(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 error_code,
 		 u64 *sptep, u64 old_spte, bool retry),
-	TP_ARGS(vcpu, gva, error_code, sptep, old_spte, 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(gva_t, gva, gva)
+		ctf_integer(gpa_t, cr2_or_gpa, cr2_or_gpa)
 		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 /* 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>