From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 20:13:10 +0000 (-0400)
Subject: instrumentation: kvm: remove compatibility code
X-Git-Tag: for-upstreaming-review-1~61
X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=8554aaaea87dc65cc42250f06c902f2cfbc98170

instrumentation: kvm: remove compatibility code
---

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
index 894bf6a2..cdcc35b2 100644
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -3,7 +3,6 @@
 #define LTTNG_TRACE_KVM_MAIN_H
 
 #include <probes/lttng-tracepoint-event.h>
-#include <linux/version.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm
@@ -18,13 +17,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
 	)
 )
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
-#if defined(__KVM_HAVE_IOAPIC)
-#undef __KVM_HAVE_IRQ_LINE
-#define __KVM_HAVE_IRQ_LINE
-#endif
-#endif
-
 #if defined(__KVM_HAVE_IRQ_LINE)
 LTTNG_TRACEPOINT_EVENT(kvm_set_irq,
 	TP_PROTO(unsigned int gsi, int level, int irq_source_id),
@@ -83,34 +75,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq,
 	{ KVM_TRACE_MMIO_WRITE, "write" }
 
 
-#if (LTTNG_SLE_KERNEL_RANGE(4,4,121,92,92,0, 4,4,122,0,0,0) \
-	|| LTTNG_SLE_KERNEL_RANGE(4,4,131,94,0,0, 4,5,0,0,0,0))
-
-LTTNG_TRACEPOINT_EVENT(kvm_mmio,
-	TP_PROTO(int type, int len, u64 gpa, u64 val),
-	TP_ARGS(type, len, gpa, val),
-
-	TP_FIELDS(
-		ctf_integer(u32, type, type)
-		ctf_integer(u32, len, len)
-		ctf_integer(u64, gpa, gpa)
-		ctf_integer(u64, val, val)
-	)
-)
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \
-	|| LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
-	|| LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
-	|| LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
-	|| LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \
-	|| LTTNG_KERNEL_RANGE(4,1,50, 4,2,0) \
-	|| LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \
-	|| LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,144, 3,14,0,0) \
-	|| LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
-	|| LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \
-	|| LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \
-	|| LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0))
-
 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
 	TP_PROTO(int type, int len, u64 gpa, void *val),
 	TP_ARGS(type, len, gpa, val),
@@ -123,22 +87,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
 	)
 )
 
-#else
-
-LTTNG_TRACEPOINT_EVENT(kvm_mmio,
-	TP_PROTO(int type, int len, u64 gpa, u64 val),
-	TP_ARGS(type, len, gpa, val),
-
-	TP_FIELDS(
-		ctf_integer(u32, type, type)
-		ctf_integer(u32, len, len)
-		ctf_integer(u64, gpa, gpa)
-		ctf_integer(u64, val, val)
-	)
-)
-
-#endif
-
 #define kvm_fpu_load_symbol	\
 	{0, "unload"},		\
 	{1, "load"}
@@ -152,9 +100,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) \
-	|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
-
 LTTNG_TRACEPOINT_EVENT(kvm_age_page,
 	TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
 	TP_ARGS(gfn, level, slot, ref),
@@ -168,21 +113,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page,
 	)
 )
 
-#else
-
-LTTNG_TRACEPOINT_EVENT(kvm_age_page,
-	TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
-	TP_ARGS(hva, slot, ref),
-
-	TP_FIELDS(
-		ctf_integer(u64, hva, hva)
-		ctf_integer(u64, gfn,
-			slot->base_gfn + ((hva - slot->userspace_addr) >> PAGE_SHIFT))
-		ctf_integer(u8, referenced, ref)
-	)
-)
-#endif
-
 #ifdef CONFIG_KVM_ASYNC_PF
 LTTNG_TRACEPOINT_EVENT_CLASS(kvm_async_get_page_class,
 
@@ -236,9 +166,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_async_pf_nopresent_ready, kvm_async_pf_ready
 	TP_ARGS(token, gva)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) \
-	|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
-
 LTTNG_TRACEPOINT_EVENT(
 	kvm_async_pf_completed,
 	TP_PROTO(unsigned long address, u64 gva),
@@ -250,22 +177,6 @@ LTTNG_TRACEPOINT_EVENT(
 	)
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)) */
-
-LTTNG_TRACEPOINT_EVENT(
-	kvm_async_pf_completed,
-	TP_PROTO(unsigned long address, struct page *page, u64 gva),
-	TP_ARGS(address, page, gva),
-
-	TP_FIELDS(
-		ctf_integer_hex(unsigned long, address, address)
-		ctf_integer(pfn_t, pfn, page ? page_to_pfn(page) : 0)
-		ctf_integer(u64, gva, gva)
-	)
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)) */
-
 #endif
 
 #endif /* LTTNG_TRACE_KVM_MAIN_H */