fix: random: only read from /dev/random after its pool has received 128 bits (v5.2)

[lttng-modules.git] / instrumentation / events / lttng-module / random.h

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index 910ea9149b133555a34f56aa47e1c62941e8f673..80b227968e611e058840d8c191971fd9918ff0ea 100644 (file)
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -1,10 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random
 
 #if !defined(LTTNG_TRACE_RANDOM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_RANDOM_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/writeback.h>
 
 LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes,
@@ -12,20 +13,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes,
 
        TP_ARGS(pool_name, bytes, IP),
 
-       TP_STRUCT__entry(
-               __string(   pool_name,  pool_name               )
-               __field(          int,  bytes                   )
-               __field(unsigned long,  IP                      )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(pool_name, pool_name)
-               tp_assign(bytes, bytes)
-               tp_assign(IP, IP)
-       ),
-
-       TP_printk("%s pool: bytes %d caller %pF",
-                 __get_str(pool_name), __entry->bytes, (void *)__entry->IP)
+       TP_FIELDS(
+               ctf_string(pool_name, pool_name)
+               ctf_integer(int, bytes, bytes)
+               ctf_integer(unsigned long, IP, IP)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes,
@@ -46,6 +38,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes_noloc
        TP_ARGS(pool_name, bytes, IP)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0))
+LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
+
+       random_credit_entropy_bits,
+
+       TP_PROTO(const char *pool_name, int bits, int entropy_count,
+                unsigned long IP),
+
+       TP_ARGS(pool_name, bits, entropy_count, IP),
+
+       TP_FIELDS(
+               ctf_string(pool_name, pool_name)
+               ctf_integer(int, bits, bits)
+               ctf_integer(int, entropy_count, entropy_count)
+               ctf_integer(unsigned long, IP, IP)
+       )
+)
+#else
 LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
 
        random_credit_entropy_bits,
@@ -55,27 +65,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
 
        TP_ARGS(pool_name, bits, entropy_count, entropy_total, IP),
 
-       TP_STRUCT__entry(
-               __string(   pool_name,  pool_name               )
-               __field(          int,  bits                    )
-               __field(          int,  entropy_count           )
-               __field(          int,  entropy_total           )
-               __field(unsigned long,  IP                      )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(pool_name, pool_name)
-               tp_assign(bits, bits)
-               tp_assign(entropy_count, entropy_count)
-               tp_assign(entropy_total, entropy_total)
-               tp_assign(IP, IP)
-       ),
-
-       TP_printk("%s pool: bits %d entropy_count %d entropy_total %d "
-                 "caller %pF", __get_str(pool_name), __entry->bits,
-                 __entry->entropy_count, __entry->entropy_total,
-                 (void *)__entry->IP)
+       TP_FIELDS(
+               ctf_string(pool_name, pool_name)
+               ctf_integer(int, bits, bits)
+               ctf_integer(int, entropy_count, entropy_count)
+               ctf_integer(int, entropy_total, entropy_total)
+               ctf_integer(unsigned long, IP, IP)
+       )
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
 
@@ -85,17 +83,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
 
        TP_ARGS(nbytes, IP),
 
-       TP_STRUCT__entry(
-               __field(          int,  nbytes                  )
-               __field(unsigned long,  IP                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(nbytes, nbytes)
-               tp_assign(IP, IP)
-       ),
-
-       TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->IP)
+       TP_FIELDS(
+               ctf_integer(int, nbytes, nbytes)
+               ctf_integer(unsigned long, IP, IP)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy,
@@ -104,23 +95,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy,
 
        TP_ARGS(pool_name, nbytes, entropy_count, IP),
 
-       TP_STRUCT__entry(
-               __string(   pool_name,  pool_name               )
-               __field(          int,  nbytes                  )
-               __field(          int,  entropy_count           )
-               __field(unsigned long,  IP                      )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(pool_name, pool_name)
-               tp_assign(nbytes, nbytes)
-               tp_assign(entropy_count, entropy_count)
-               tp_assign(IP, IP)
-       ),
-
-       TP_printk("%s pool: nbytes %d entropy_count %d caller %pF",
-                 __get_str(pool_name), __entry->nbytes, __entry->entropy_count,
-                 (void *)__entry->IP)
+       TP_FIELDS(
+               ctf_string(pool_name, pool_name)
+               ctf_integer(int, nbytes, nbytes)
+               ctf_integer(int, entropy_count, entropy_count)
+               ctf_integer(unsigned long, IP, IP)
+       )
 )
 
 
@@ -149,4 +129,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy_use
 #endif /* LTTNG_TRACE_RANDOM_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>