random: convert DEBUG_ENT to tracepoints

Instead of using the random driver's ad-hoc DEBUG_ENT() mechanism, use
tracepoints instead.  This allows for a much more fine-grained control
of which debugging mechanism which a developer might need, and unifies
the debugging messages with all of the existing tracepoints.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 128 insertions, 0 deletions

diff --git a/include/trace/events/random.h b/include/trace/events/random.h
index 527b5dc1b416..805af6db41cc 100644
--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@@ -109,6 +109,89 @@ TRACE_EVENT(push_to_pool,
                   __entry->input_bits)
 );
 
+TRACE_EVENT(debit_entropy,
+        TP_PROTO(const char *pool_name, int debit_bits),
+
+        TP_ARGS(pool_name, debit_bits),
+
+        TP_STRUCT__entry(
+                __field( const char *,  pool_name               )
+                __field(          int,  debit_bits              )
+        ),
+
+        TP_fast_assign(
+                __entry->pool_name      = pool_name;
+                __entry->debit_bits     = debit_bits;
+        ),
+
+        TP_printk("%s: debit_bits %d", __entry->pool_name,
+                  __entry->debit_bits)
+);
+
+TRACE_EVENT(add_input_randomness,
+        TP_PROTO(int input_bits),
+
+        TP_ARGS(input_bits),
+
+        TP_STRUCT__entry(
+                __field(          int,  input_bits              )
+        ),
+
+        TP_fast_assign(
+                __entry->input_bits     = input_bits;
+        ),
+
+        TP_printk("input_pool_bits %d", __entry->input_bits)
+);
+
+TRACE_EVENT(add_disk_randomness,
+        TP_PROTO(dev_t dev, int input_bits),
+
+        TP_ARGS(dev, input_bits),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(          int,  input_bits              )
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = dev;
+                __entry->input_bits     = input_bits;
+        ),
+
+        TP_printk("dev %d,%d input_pool_bits %d", MAJOR(__entry->dev),
+                  MINOR(__entry->dev), __entry->input_bits)
+);
+
+TRACE_EVENT(xfer_secondary_pool,
+        TP_PROTO(const char *pool_name, int xfer_bits, int request_bits,
+                 int pool_entropy, int input_entropy),
+
+        TP_ARGS(pool_name, xfer_bits, request_bits, pool_entropy,
+                input_entropy),
+
+        TP_STRUCT__entry(
+                __field( const char *,  pool_name               )
+                __field(          int,  xfer_bits               )
+                __field(          int,  request_bits            )
+                __field(          int,  pool_entropy            )
+                __field(          int,  input_entropy           )
+        ),
+
+        TP_fast_assign(
+                __entry->pool_name      = pool_name;
+                __entry->xfer_bits      = xfer_bits;
+                __entry->request_bits   = request_bits;
+                __entry->pool_entropy   = pool_entropy;
+                __entry->input_entropy  = input_entropy;
+        ),
+
+        TP_printk("pool %s xfer_bits %d request_bits %d pool_entropy %d "
+                  "input_entropy %d", __entry->pool_name, __entry->xfer_bits,
+                  __entry->request_bits, __entry->pool_entropy,
+                  __entry->input_entropy)
+);
+
 DECLARE_EVENT_CLASS(random__get_random_bytes,
         TP_PROTO(int nbytes, unsigned long IP),
 
@@ -179,7 +262,52 @@ DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
         TP_ARGS(pool_name, nbytes, entropy_count, IP)
 );
 
+TRACE_EVENT(random_read,
+        TP_PROTO(int got_bits, int need_bits, int pool_left, int input_left),
 
+        TP_ARGS(got_bits, need_bits, pool_left, input_left),
+
+        TP_STRUCT__entry(
+                __field(          int,  got_bits                )
+                __field(          int,  need_bits               )
+                __field(          int,  pool_left               )
+                __field(          int,  input_left              )
+        ),
+
+        TP_fast_assign(
+                __entry->got_bits       = got_bits;
+                __entry->need_bits      = need_bits;
+                __entry->pool_left      = pool_left;
+                __entry->input_left     = input_left;
+        ),
+
+        TP_printk("got_bits %d still_needed_bits %d "
+                  "blocking_pool_entropy_left %d input_entropy_left %d",
+                  __entry->got_bits, __entry->got_bits, __entry->pool_left,
+                  __entry->input_left)
+);
+
+TRACE_EVENT(urandom_read,
+        TP_PROTO(int got_bits, int pool_left, int input_left),
+
+        TP_ARGS(got_bits, pool_left, input_left),
+
+        TP_STRUCT__entry(
+                __field(          int,  got_bits                )
+                __field(          int,  pool_left               )
+                __field(          int,  input_left              )
+        ),
+
+        TP_fast_assign(
+                __entry->got_bits       = got_bits;
+                __entry->pool_left      = pool_left;
+                __entry->input_left     = input_left;
+        ),
+
+        TP_printk("got_bits %d nonblocking_pool_entropy_left %d "
+                  "input_entropy_left %d", __entry->got_bits,
+                  __entry->pool_left, __entry->input_left)
+);
 
 #endif /* _TRACE_RANDOM_H */