From f4c179bc0f69ca4e5de78bf73bca334c21083986 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 14 Dec 2021 15:06:51 -0500 Subject: [PATCH] fix: KVM: MMU: change tracepoints arguments to kvm_page_fault (v5.16) See upstream commit : commit f0066d94c92dc5cf7f1a272a1bd324b0fc575292 Author: Paolo Bonzini Date: Fri Aug 6 04:35:50 2021 -0400 KVM: MMU: change tracepoints arguments to kvm_page_fault Pass struct kvm_page_fault to tracepoints instead of extracting the arguments from the struct. This also lets the kvm_mmu_spte_requested tracepoint pick the gfn directly from fault->gfn, instead of using the address. Change-Id: I5ee3f344a8d1cd0ed185cdeecb3a3121183c9b43 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .../events/arch/x86/kvm/mmutrace.h | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/include/instrumentation/events/arch/x86/kvm/mmutrace.h b/include/instrumentation/events/arch/x86/kvm/mmutrace.h index b2c0ff4f..e20cda20 100644 --- a/include/instrumentation/events/arch/x86/kvm/mmutrace.h +++ b/include/instrumentation/events/arch/x86/kvm/mmutrace.h @@ -233,7 +233,27 @@ LTTNG_TRACEPOINT_EVENT_MAP( ) ) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0)) +LTTNG_TRACEPOINT_EVENT_MAP( + fast_page_fault, + + kvm_mmu_fast_page_fault, + + TP_PROTO(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, + u64 *sptep, u64 old_spte, int ret), + TP_ARGS(vcpu, fault, sptep, old_spte, ret), + + TP_FIELDS( + ctf_integer(int, vcpu_id, vcpu->vcpu_id) + ctf_integer(gpa_t, cr2_or_gpa, fault->addr) + ctf_integer(u32, error_code, fault->error_code) + ctf_integer_hex(u64 *, sptep, sptep) + ctf_integer(u64, old_spte, old_spte) + ctf_integer(u64, new_spte, *sptep) + ctf_integer(int, ret, ret) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0)) LTTNG_TRACEPOINT_EVENT_MAP( fast_page_fault, -- 2.34.1