lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] rtla/timerlat_top: Fix segmentation fault when failing to enable -t
    Date
    rtla timerlat top is causing a segmentation fault when running with
    the --trace option on a kernel that does not support multiple
    instances. For example:

    [root@f34 rtla]# rtla timerlat top -t
    failed to enable the tracer timerlat
    Could not enable osnoiser tracer for tracing
    Failed to enable the trace instance
    Segmentation fault (core dumped)

    This error happens because the exit code of the tools is trying
    to destroy the trace instance that failed to be created.

    Rearrange the order in which trace instances are destroyed to avoid
    this problem.

    Fixes: a828cd18bc4a ("rtla: Add timerlat tool and timelart top mode")
    Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-trace-devel@vger.kernel.org
    Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
    ---
    tools/tracing/rtla/src/timerlat_top.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
    index 1ebd5291539c..323fd1f88313 100644
    --- a/tools/tracing/rtla/src/timerlat_top.c
    +++ b/tools/tracing/rtla/src/timerlat_top.c
    @@ -584,7 +584,7 @@ int timerlat_top_main(int argc, char *argv[])
    trace);
    if (retval < 0) {
    err_msg("Error iterating on events\n");
    - goto out_top;
    + goto out_trace;
    }

    if (!params->quiet)
    @@ -606,12 +606,12 @@ int timerlat_top_main(int argc, char *argv[])
    save_trace_to_file(record->trace.inst, params->trace_output);
    }
    }
    -
    +out_trace:
    + if (params->trace_output)
    + osnoise_destroy_tool(record);
    out_top:
    timerlat_free_top(top->data);
    osnoise_destroy_tool(top);
    - if (params->trace_output)
    - osnoise_destroy_tool(record);
    free(params);
    out_exit:
    exit(return_value);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-24 15:25    [W:16.901 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site