Add support for RHEL 9.0

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

diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h
index 5d34c61f39a8c54bb928a562373634f2e79e0cfe..662330a4d45848d39de50bc2b6dfa29845fbd165 100644 (file)
--- a/include/instrumentation/events/block.h
+++ b/include/instrumentation/events/block.h
@@ -425,7 +425,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_complete,
                        lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
        )
 )
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT(block_rq_complete,
 
        TP_PROTO(struct request *rq, blk_status_t error, unsigned int nr_bytes),

diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
index 3c43f32d229edaa50f7d0ad66a8eed029b6dce8c..039debc65a2fb44da361c800560a8b82efb154e1 100644 (file)
--- a/include/instrumentation/events/skb.h
+++ b/include/instrumentation/events/skb.h
@@ -15,7 +15,6 @@
  */
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
        || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0))
-
 LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
        TP_ENUM_VALUES(
                ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED)
@@ -27,7 +26,22 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
                ctf_enum_value("MAX",           SKB_DROP_REASON_MAX)
        )
 )
+#elif (LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0))
+LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
+       TP_ENUM_VALUES(
+               ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED)
+               ctf_enum_value("NO_SOCKET",     SKB_DROP_REASON_NO_SOCKET)
+               ctf_enum_value("PKT_TOO_SMALL", SKB_DROP_REASON_PKT_TOO_SMALL)
+               ctf_enum_value("TCP_CSUM",      SKB_DROP_REASON_TCP_CSUM)
+               ctf_enum_value("UDP_CSUM",      SKB_DROP_REASON_UDP_CSUM)
+               ctf_enum_value("MAX",           SKB_DROP_REASON_MAX)
+       )
+)
+#endif
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
+       || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 
        skb_kfree,