From 89d917153fc52c1e5b0ddabf8ee078897656b263 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 11 Nov 2022 10:47:54 -0500 Subject: [PATCH] fix: Adjust ranges for RHEL 8.6 kernels Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I0b2c90f3678d0fb4503f61f336a4af185de2b39d --- include/instrumentation/events/block.h | 15 ++++++++++----- include/instrumentation/events/kmem.h | 3 ++- include/wrapper/objtool.h | 3 ++- include/wrapper/sched.h | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h index d4821c12..598d75a9 100644 --- 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 0f5bd8e6..aa9c98d1 100644 --- 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 36a8cf73..9b3f4898 100644 --- a/include/wrapper/objtool.h +++ b/include/wrapper/objtool.h @@ -10,7 +10,8 @@ #include -#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 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0)) #include diff --git a/include/wrapper/sched.h b/include/wrapper/sched.h index 54e29f7d..2627489d 100644 --- a/include/wrapper/sched.h +++ b/include/wrapper/sched.h @@ -11,7 +11,8 @@ #include #include -#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) -- 2.34.1