+/* 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/version.h>
+#include <probes/lttng-tracepoint-event.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(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)) */
-
/*
* A pagetable walk has started
*/
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,
TP_ARGS(sp)
)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
-
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
)
)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
-
-LTTNG_TRACEPOINT_EVENT_MAP(
- mark_mmio_spte,
-
- kvm_mmu_mark_mmio_spte,
-
- TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
- TP_ARGS(sptep, gfn, access),
-
- TP_FIELDS(
- ctf_integer_hex(void *, sptep, sptep)
- ctf_integer(gfn_t, gfn, gfn)
- ctf_integer(unsigned, access, access)
- )
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
-
LTTNG_TRACEPOINT_EVENT_MAP(
handle_mmio_page_fault,
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)
)
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_hex(u64 *, sptep, sptep)
ctf_integer(u64, old_spte, old_spte)
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>