lkml.org 
[lkml]   [2017]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 130/139] tracing: Apply trace_clock changes to instance max buffer
    Date
    From: Baohong Liu <baohong.liu@intel.com>

    commit 170b3b1050e28d1ba0700e262f0899ffa4fccc52 upstream.

    Currently trace_clock timestamps are applied to both regular and max
    buffers only for global trace. For instance trace, trace_clock
    timestamps are applied only to regular buffer. But, regular and max
    buffers can be swapped, for example, following a snapshot. So, for
    instance trace, bad timestamps can be seen following a snapshot.
    Let's apply trace_clock timestamps to instance max buffer as well.

    Link: http://lkml.kernel.org/r/ebdb168d0be042dcdf51f81e696b17fabe3609c1.1504642143.git.tom.zanussi@linux.intel.com

    Cc: stable@vger.kernel.org
    Fixes: 277ba0446 ("tracing: Add interface to allow multiple trace buffers")
    Signed-off-by: Baohong Liu <baohong.liu@intel.com>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    kernel/trace/trace.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
    index edffb67..df820d9 100644
    --- a/kernel/trace/trace.c
    +++ b/kernel/trace/trace.c
    @@ -4654,7 +4654,7 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
    tracing_reset_online_cpus(&tr->trace_buffer);

    #ifdef CONFIG_TRACER_MAX_TRACE
    - if (tr->flags & TRACE_ARRAY_FL_GLOBAL && tr->max_buffer.buffer)
    + if (tr->max_buffer.buffer)
    ring_buffer_set_clock(tr->max_buffer.buffer, trace_clocks[i].func);
    tracing_reset_online_cpus(&tr->max_buffer);
    #endif
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-11-01 22:40    [W:3.532 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site