lkml.org 
[lkml]   [2009]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:tracing/blktrace] blktrace: fix the original blktrace
    Commit-ID:  29d661309424188942aeea9edcd362c1bd7414ab
    Gitweb: http://git.kernel.org/tip/29d661309424188942aeea9edcd362c1bd7414ab
    Author: Li Zefan <lizf@cn.fujitsu.com>
    AuthorDate: Wed, 25 Mar 2009 17:21:26 +0800
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 25 Mar 2009 12:05:39 +0100

    blktrace: fix the original blktrace

    Currently the original blktrace, which is using relay and is used via
    ioctl, is broken. You can use ftrace to see the output of blktrace,
    but user-space blktrace is unusable.

    It's broken by "blktrace: add ftrace plugin"
    (c71a896154119f4ca9e89d6078f5f63ad60ef199)

    - if (unlikely(bt->trace_state != Blktrace_running))
    + if (unlikely(bt->trace_state != Blktrace_running || !blk_tracer_enabled))
    return;

    With this patch, both ioctl and ftrace can be used, but of course you
    can't use both of them at the same time.

    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Jens Axboe <jens.axboe@oracle.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <49C9F796.9040503@cn.fujitsu.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    kernel/trace/blktrace.c | 12 +++++-------
    1 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
    index 95f89fa..a7f7ff5 100644
    --- a/kernel/trace/blktrace.c
    +++ b/kernel/trace/blktrace.c
    @@ -110,7 +110,7 @@ void __trace_note_message(struct blk_trace *bt, const char *fmt, ...)
    unsigned long flags;
    char *buf;

    - if (blk_tr) {
    + if (blk_tracer_enabled) {
    va_start(args, fmt);
    ftrace_vprintk(fmt, args);
    va_end(args);
    @@ -169,7 +169,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
    pid_t pid;
    int cpu, pc = 0;

    - if (unlikely(bt->trace_state != Blktrace_running ||
    + if (unlikely(bt->trace_state != Blktrace_running &&
    !blk_tracer_enabled))
    return;

    @@ -185,7 +185,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
    return;
    cpu = raw_smp_processor_id();

    - if (blk_tr) {
    + if (blk_tracer_enabled) {
    tracing_record_cmdline(current);

    pc = preempt_count();
    @@ -235,7 +235,7 @@ record_it:
    if (pdu_len)
    memcpy((void *) t + sizeof(*t), pdu_data, pdu_len);

    - if (blk_tr) {
    + if (blk_tracer_enabled) {
    trace_buffer_unlock_commit(blk_tr, event, 0, pc);
    return;
    }
    @@ -267,8 +267,7 @@ int blk_trace_remove(struct request_queue *q)
    if (!bt)
    return -EINVAL;

    - if (bt->trace_state == Blktrace_setup ||
    - bt->trace_state == Blktrace_stopped)
    + if (bt->trace_state != Blktrace_running)
    blk_trace_cleanup(bt);

    return 0;
    @@ -1273,7 +1272,6 @@ static int blk_trace_setup_queue(struct request_queue *q, dev_t dev)
    bt->dev = dev;
    bt->act_mask = (u16)-1;
    bt->end_lba = -1ULL;
    - bt->trace_state = Blktrace_running;

    old_bt = xchg(&q->blk_trace, bt);
    if (old_bt != NULL) {

    \
     
     \ /
      Last update: 2009-03-25 12:59    [W:4.689 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site