[PATCH 07/16] blktrace: split out relaying a blktrace event

[Johannes Thumshirn]

Split out the code relaying a blktrace event to user-space using relayfs.

This enables adding a second version supporting a new version of the
protocol.

Signed-off-by: Johannes Thumshirn <johannes.thumsh...@wdc.com>
---
 kernel/trace/blktrace.c | 50 ++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index d06519957c25..24eef7b116b5 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -91,6 +91,26 @@ static void record_blktrace_event(struct blk_io_trace *t, 
pid_t pid, int cpu,
                memcpy((void *)t + sizeof(*t) + cgid_len, pdu_data, pdu_len);
 }
 
+static void relay_blktrace_event(struct blk_trace *bt, unsigned long sequence,
+                                pid_t pid, int cpu, sector_t sector, int bytes,
+                                u32 what, int error, u64 cgid,
+                                ssize_t cgid_len, void *pdu_data, int pdu_len)
+{
+       struct blk_io_trace *t;
+       size_t trace_len = sizeof(*t) + pdu_len + cgid_len;
+
+       t = relay_reserve(bt->rchan, trace_len);
+       if (!t)
+               return;
+
+       t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
+       t->sequence = sequence;
+       t->time = ktime_to_ns(ktime_get());
+
+       record_blktrace_event(t, pid, cpu, sector, bytes, what, bt->dev, error,
+                             cgid, cgid_len, pdu_data, pdu_len);
+}
+
 /*
  * Send out a notify message.
  */
@@ -126,16 +146,9 @@ static void trace_note(struct blk_trace *bt, pid_t pid, 
int action,
        if (!bt->rchan)
                return;
 
-       t = relay_reserve(bt->rchan, trace_len);
-       if (t) {
-               t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
-               t->time = ktime_to_ns(ktime_get());
-
-               record_blktrace_event(t, pid, cpu, 0, 0,
-                                     action | (cgid ? __BLK_TN_CGROUP : 0),
-                                     bt->dev, 0, cgid, cgid_len, (void *)data,
-                                     len);
-       }
+       relay_blktrace_event(bt, 0, pid, cpu, 0, 0,
+                            action | (cgid ? __BLK_TN_CGROUP : 0), 0, cgid,
+                            cgid_len, (void *)data, len);
 }
 
 /*
@@ -306,19 +319,10 @@ static void __blk_add_trace(struct blk_trace *bt, 
sector_t sector, int bytes,
         * from coming in and stepping on our toes.
         */
        local_irq_save(flags);
-       t = relay_reserve(bt->rchan, trace_len);
-       if (t) {
-               sequence = per_cpu_ptr(bt->sequence, cpu);
-
-               t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
-               t->sequence = ++(*sequence);
-               t->time = ktime_to_ns(ktime_get());
-
-               record_blktrace_event(t, pid, cpu, sector, bytes, what,
-                                     bt->dev, error, cgid, cgid_len,
-                                     pdu_data, pdu_len);
-       }
-
+       sequence = per_cpu_ptr(bt->sequence, cpu);
+       (*sequence)++;
+       relay_blktrace_event(bt, *sequence, pid, cpu, sector, bytes, what,
+                            error, cgid, cgid_len, pdu_data, pdu_len);
        local_irq_restore(flags);
 }
 
-- 
2.51.0