From 0d8c4f9caa7156f6dd2de1fb9fa660f5a7d71afb Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 30 Mar 2020 17:43:16 -0400 Subject: [PATCH] Fix: update kvm instrumentation for Ubuntu 5.3.0-45 This commit introduced in 5.3.0-43 was dropped in 5.3.0-45 and reintroduced in 5.3.0-46: commit 795f8a34f279e17c279bba46da10f15c5dd00264 Author: Sean Christopherson Date: Fri Dec 6 15:57:14 2019 -0800 KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM BugLink: https://bugs.launchpad.net/bugs/1867051 [ Upstream commit 736c291c9f36b07f8889c61764c28edce20e715d ] Fun times! Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: Ia5f1a4ba355f592f09e964038b6334ddb3ad5153 --- instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index af3ede95..1cbbb893 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -219,7 +219,8 @@ LTTNG_TRACEPOINT_EVENT_MAP( 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,4,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, -- 2.34.1