Re: [PATCH] blktrace: add missing probe argument toblock_bio_complete

[Mathieu Desnoyers]

* Jens Axboe (axboe@xxxxxxxxx) wrote:
> On 2011-01-07 15:13, Jeff Moyer wrote:
> > Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx> writes:
> > 
> >> blktrace.c block bio complete callback needs to gain a new argument to reflect
> >> the newly added "error" tracepoint argument. This is needed to match the new
> >> block_bio_complete TRACE_EVENT as of
> >> commit de983a7bfcb7c020901ca6e2314cf55a4207ab5a.
> >>
> >> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
> >> CC: Jeff Moyer <jmoyer@xxxxxxxxxx>
> >> CC: Steven Rostedt <rostedt@xxxxxxxxxxx>
> >> CC: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> >> CC: Ingo Molnar <mingo@xxxxxxx>
> >> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> >> CC: Jens Axboe <axboe@xxxxxxxxx>
> >> CC: Li Zefan <lizf@xxxxxxxxxxxxxx>
> >> ---
> >>  kernel/trace/blktrace.c |    3 ++-
> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> Index: linux-2.6-lttng/kernel/trace/blktrace.c
> >> ===================================================================
> >> --- linux-2.6-lttng.orig/kernel/trace/blktrace.c
> >> +++ linux-2.6-lttng/kernel/trace/blktrace.c
> >> @@ -785,7 +785,8 @@ static void blk_add_trace_bio_bounce(voi
> >>  }
> >>  
> >>  static void blk_add_trace_bio_complete(void *ignore,
> >> -				       struct request_queue *q, struct bio *bio)
> >> +				       struct request_queue *q, struct bio *bio,
> >> +				       int error)
> >>  {
> >>  	blk_add_trace_bio(q, bio, BLK_TA_COMPLETE);
> >>  }
> > 
> > OK, I clearly didn't look closely enough last time.  There's no sense
> > passing this information down if it isn't used (as you said initially).
> > blk_add_trace_bio sets the error based on whether or not the
> > BIO_UPTODATE bit is set.  So, I think we should instead revert the patch
> > I sent you (Mathieu), and then completely get rid of the error field in
> > the TP macros.
> > 
> > Does that make sense to everyone else?
> 
> We usually use BIO_UPTODATE if we have no other information available.
> So if we have, then we should use it.

Good point. I tested your patch below applied after "trace event block fix
unassigned field", and it builds fine. Please feel free to add my

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>

Are you planning to apply it on top of "blktrace: add missing probe argument to
block_bio_complete" ? (which I see you have merged in block for-next)

Thanks,

Mathieu


-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/