1 From 33630522da97345c2b0c569c04c1d5d33ab7efa6 Mon Sep 17 00:00:00 2001
2 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
3 Date: Tue, 26 Dec 2017 09:47:22 -0500
4 Subject: [PATCH] Update kvm instrumentation for 4.15
6 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
8 instrumentation/events/lttng-module/kvm.h | 18 ++++++++++++++++++
9 1 file changed, 18 insertions(+)
11 diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
12 index a8b3e9a..c01772c 100644
13 --- a/instrumentation/events/lttng-module/kvm.h
14 +++ b/instrumentation/events/lttng-module/kvm.h
15 @@ -84,6 +84,22 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
16 { KVM_TRACE_MMIO_READ, "read" }, \
17 { KVM_TRACE_MMIO_WRITE, "write" }
19 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
21 +LTTNG_TRACEPOINT_EVENT(kvm_mmio,
22 + TP_PROTO(int type, int len, u64 gpa, void *val),
23 + TP_ARGS(type, len, gpa, val),
26 + ctf_integer(u32, type, type)
27 + ctf_integer(u32, len, len)
28 + ctf_integer(u64, gpa, gpa)
29 + ctf_sequence_hex(unsigned char, val, val, u32, len)
33 +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
35 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
36 TP_PROTO(int type, int len, u64 gpa, u64 val),
37 TP_ARGS(type, len, gpa, val),
38 @@ -96,6 +112,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
42 +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
44 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
46 #define kvm_fpu_load_symbol \
47 From 5ccd696806d409d5d0261b2e7e4d9618daf02e24 Mon Sep 17 00:00:00 2001
48 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
49 Date: Tue, 2 Jan 2018 11:07:05 -0500
50 Subject: [PATCH] Update: kvm instrumentation for 3.16.52 and 3.2.97
52 Starting from 3.16.52 and 3.2.97, the 3.16 and 3.2 stable kernel
53 branches backport a kvm instrumentation change introduced in 4.15 which
54 affects the prototype of the kvm_mmio event.
56 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
58 instrumentation/events/lttng-module/kvm.h | 8 +++++---
59 1 file changed, 5 insertions(+), 3 deletions(-)
61 diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
62 index ec74bdd..ea63e88 100644
63 --- a/instrumentation/events/lttng-module/kvm.h
64 +++ b/instrumentation/events/lttng-module/kvm.h
65 @@ -84,7 +84,9 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
66 { KVM_TRACE_MMIO_READ, "read" }, \
67 { KVM_TRACE_MMIO_WRITE, "write" }
69 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
70 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
71 + || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
72 + || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0))
74 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
75 TP_PROTO(int type, int len, u64 gpa, void *val),
76 @@ -98,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
80 -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
83 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
84 TP_PROTO(int type, int len, u64 gpa, u64 val),
85 @@ -112,7 +114,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
89 -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
92 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
94 From bda29b79b33c2a31d3ffb396e741724590f6e455 Mon Sep 17 00:00:00 2001
95 From: Michael Jeanson <mjeanson@efficios.com>
96 Date: Tue, 9 Jan 2018 15:43:20 -0500
97 Subject: [PATCH] Update kvm instrumentation for debian kernel 4.9.65-3
99 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
100 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
102 instrumentation/events/lttng-module/kvm.h | 3 ++-
103 1 file changed, 2 insertions(+), 1 deletion(-)
105 diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
106 index ea63e88..d9d0300 100644
107 --- a/instrumentation/events/lttng-module/kvm.h
108 +++ b/instrumentation/events/lttng-module/kvm.h
109 @@ -86,7 +86,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
111 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
112 || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
113 - || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0))
114 + || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
115 + || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0))
117 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
118 TP_PROTO(int type, int len, u64 gpa, void *val),
119 From 1d822c67df88b678c9cbe73d0bb47fc177af194a Mon Sep 17 00:00:00 2001
120 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
121 Date: Wed, 17 Jan 2018 11:17:08 -0500
122 Subject: [PATCH] Update: kvm instrumentation for 4.14.14+, 4.9.77+, 4.4.112+
124 Starting from 3.14.14, 4.9.77, and 4.4.112, the 3.14, 4.9, and 4.4
125 stable kernel branches backport a kvm instrumentation change introduced
126 in 4.15 which affects the prototype of the kvm_mmio event.
128 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
130 instrumentation/events/lttng-module/kvm.h | 3 +++
131 1 file changed, 3 insertions(+)
133 diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
134 index d9d0300..fbd603b 100644
135 --- a/instrumentation/events/lttng-module/kvm.h
136 +++ b/instrumentation/events/lttng-module/kvm.h
137 @@ -85,6 +85,9 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
138 { KVM_TRACE_MMIO_WRITE, "write" }
140 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
141 + || LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
142 + || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
143 + || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \
144 || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
145 || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
146 || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0))