fix: Adjust ranges for RHEL 8.6 kernels

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I0b2c90f3678d0fb4503f61f336a4af185de2b39d

diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h
index d4821c1228518d123f2bbb49aed58bdf090a1b6c..598d75a947aab08d2aa082b6bb4835a5d1eb5913 100644 (file)
--- a/include/instrumentation/events/block.h
+++ b/include/instrumentation/events/block.h
@@ -367,7 +367,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
        )
 )
 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 /**
  * block_rq_requeue - place block IO request back on a queue
  * @rq: block IO operation request
@@ -613,7 +614,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
        )
 )
 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
 
        TP_PROTO(struct request *rq),
@@ -749,7 +751,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
 #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 /**
  * block_rq_insert - insert block operation request into queue
  * @rq: block IO operation request
@@ -785,7 +788,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert,
 #endif
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 /**
  * block_rq_issue - issue pending block IO request operation to device driver
  * @rq: block IO operation operation request
@@ -1638,7 +1642,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap,
        )
 )
 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+       || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 /**
  * block_rq_remap - map request for a block operation request
  * @rq: block IO operation request

diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h
index 0f5bd8e64225d7c784b9147fe30d96fba2900920..aa9c98d1e9759e4414187a2685ac94aa3878c1c9 100644 (file)
--- a/include/instrumentation/events/kmem.h
+++ b/include/instrumentation/events/kmem.h
@@ -229,7 +229,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(kfree,
 
        kmem_kfree,

diff --git a/include/wrapper/objtool.h b/include/wrapper/objtool.h
index 36a8cf73702bc79073382d42395e6400c1e88f6d..9b3f4898a39bfae0fa60cc10d680f092397371a7 100644 (file)
--- a/include/wrapper/objtool.h
+++ b/include/wrapper/objtool.h
@@ -10,7 +10,8 @@
 
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 #include <linux/objtool.h>
 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0))
 #include <linux/frame.h>

diff --git a/include/wrapper/sched.h b/include/wrapper/sched.h
index 54e29f7d99bc244cd93735a193bd8684df90a022..2627489d6f6cc9589e8e99d8f8ef241e88eb4b05 100644 (file)
--- a/include/wrapper/sched.h
+++ b/include/wrapper/sched.h
@@ -11,7 +11,8 @@
 #include <linux/sched.h>
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,14,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,14,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
 
 #define lttng_get_task_state(task)     READ_ONCE((task)->__state)
 #define lttng_task_is_running(task)    task_is_running(task)