tracing/synthetic: Fix trace_string() return value
authorThorsten Blum <thorsten.blum@toblux.com>
Wed, 14 Feb 2024 22:05:56 +0000 (23:05 +0100)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Thu, 15 Feb 2024 16:40:01 +0000 (11:40 -0500)
Fix trace_string() by assigning the string length to the return variable
which got lost in commit ddeea494a16f ("tracing/synthetic: Use union
instead of casts") and caused trace_string() to always return 0.

Link: https://lore.kernel.org/linux-trace-kernel/20240214220555.711598-1-thorsten.blum@toblux.com
Cc: stable@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fixes: ddeea494a16f ("tracing/synthetic: Use union instead of casts")
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace_events_synth.c

index e7af286af4f1ad9d3ac578cb3ce3c58ba3d5ce0b..c82b401a294d961ae75c48f3a164e92f3ad181b1 100644 (file)
@@ -441,8 +441,9 @@ static unsigned int trace_string(struct synth_trace_event *entry,
        if (is_dynamic) {
                union trace_synth_field *data = &entry->fields[*n_u64];
 
+               len = fetch_store_strlen((unsigned long)str_val);
                data->as_dynamic.offset = struct_size(entry, fields, event->n_u64) + data_size;
-               data->as_dynamic.len = fetch_store_strlen((unsigned long)str_val);
+               data->as_dynamic.len = len;
 
                ret = fetch_store_string((unsigned long)str_val, &entry->fields[*n_u64], entry);