Skip to contentSkip to conversation

tracing: block events

RFC PATCH In review Peter Zijlstra 3 participants 3 messages Mar 4, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 tracing: block events

Subject: tracing: block events
From: Peter Zijlstra <[email protected]>
Date: Wed Mar 04 15:09:43 CET 2009

---
 include/trace/block.h             |   69 --------------
 include/trace/block_event_types.h |  177 ++++++++++++++++++++++++++++++++++++++
 include/trace/trace_event_types.h |    1 
 include/trace/trace_events.h      |    1 
 4 files changed, 180 insertions(+), 68 deletions(-)
include/trace/block.h +1 -68
Index: linux-2.6/include/trace/block.h
===================================================================
@@ -4,73 +4,6 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(block_rq_abort,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_insert,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_issue,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_requeue,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_complete,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_bio_bounce,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_complete,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_backmerge,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_frontmerge,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_queue,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_getrq,
-	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-		TPARGS(q, bio, rw));
-
-DECLARE_TRACE(block_sleeprq,
-	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-		TPARGS(q, bio, rw));
-
-DECLARE_TRACE(block_plug,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_unplug_timer,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_unplug_io,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_split,
-	TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
-		TPARGS(q, bio, pdu));
-
-DECLARE_TRACE(block_remap,
-	TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
-		sector_t from, sector_t to),
-		TPARGS(q, bio, dev, from, to));
+#include <trace/block_event_types.h>
 
 #endif
include/trace/block_event_types.h new file +177 -0

177 lines not on this page · raw message

include/trace/trace_event_types.h +1 -0
Index: linux-2.6/include/trace/trace_event_types.h
===================================================================
@@ -3,3 +3,4 @@
 #include <trace/sched_event_types.h>
 #include <trace/irq_event_types.h>
 #include <trace/lockdep_event_types.h>
+#include <trace/block_event_types.h>
include/trace/trace_events.h +1 -0
Index: linux-2.6/include/trace/trace_events.h
===================================================================
@@ -3,3 +3,4 @@
 #include <trace/sched.h>
 #include <trace/irq.h>
 #include <trace/lockdep.h>
+#include <trace/block.h>
maintainer
#1 lore raw
Quoted 5 lines · Peter Zijlstra

Subject: tracing: block events
From: Peter Zijlstra <[email protected]>
Date: Wed Mar 04 15:09:43 CET 2009

Peter, Thanks!

I'll try it out. I know this is an RFC patch, but it could really due with a change log ;-)

-- Steve

Quoted 289 lines
---
 include/trace/block.h             |   69 --------------
 include/trace/block_event_types.h |  177 ++++++++++++++++++++++++++++++++++++++
 include/trace/trace_event_types.h |    1 
 include/trace/trace_events.h      |    1 
 4 files changed, 180 insertions(+), 68 deletions(-)

Index: linux-2.6/include/trace/block.h
===================================================================

include/trace/block.h +1 -68
@@ -4,73 +4,6 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(block_rq_abort,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_insert,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_issue,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_requeue,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_rq_complete,
-	TPPROTO(struct request_queue *q, struct request *rq),
-		TPARGS(q, rq));
-
-DECLARE_TRACE(block_bio_bounce,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_complete,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_backmerge,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_frontmerge,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_bio_queue,
-	TPPROTO(struct request_queue *q, struct bio *bio),
-		TPARGS(q, bio));
-
-DECLARE_TRACE(block_getrq,
-	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-		TPARGS(q, bio, rw));
-
-DECLARE_TRACE(block_sleeprq,
-	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-		TPARGS(q, bio, rw));
-
-DECLARE_TRACE(block_plug,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_unplug_timer,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_unplug_io,
-	TPPROTO(struct request_queue *q),
-		TPARGS(q));
-
-DECLARE_TRACE(block_split,
-	TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
-		TPARGS(q, bio, pdu));
-
-DECLARE_TRACE(block_remap,
-	TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
-		sector_t from, sector_t to),
-		TPARGS(q, bio, dev, from, to));
+#include <trace/block_event_types.h>
 
 #endif

Index: linux-2.6/include/trace/block_event_types.h
===================================================================

include/trace/block_event_types.h new file +177 -0
@@ -0,0 +1,177 @@
+
+#ifndef TRACE_EVENT_FORMAT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM block
+
+#ifdef CONFIG_BLK_DEV_IO_TRACE
+#define Q_DEV(q) (q->bt ? q->bt->dev : 0)
+#else
+#define Q_DEV(q) 0
+#endif
+
+TRACE_FORMAT(block_rq_abort,
+	TPPROTO(struct request_queue *q, struct request *rq),
+	TPARGS(q, rq),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		rq->cmd_flags & __REQ_RW ? 'W' : 'R',
+		blk_pc_request(rq) ? 0 : rq->hard_sector,
+		blk_pc_request(rq) ? rq->data_len : rq->hard_nr_sectors << 9)
+	);
+
+TRACE_FORMAT(block_rq_insert,
+	TPPROTO(struct request_queue *q, struct request *rq),
+	TPARGS(q, rq),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		rq->cmd_flags & __REQ_RW ? 'W' : 'R',
+		blk_pc_request(rq) ? 0 : rq->hard_sector,
+		blk_pc_request(rq) ? rq->data_len : rq->hard_nr_sectors << 9)
+	);
+
+TRACE_FORMAT(block_rq_issue,
+	TPPROTO(struct request_queue *q, struct request *rq),
+	TPARGS(q, rq),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		rq->cmd_flags & __REQ_RW ? 'W' : 'R',
+		blk_pc_request(rq) ? 0 : rq->hard_sector,
+		blk_pc_request(rq) ? rq->data_len : rq->hard_nr_sectors << 9)
+	);
+
+TRACE_FORMAT(block_rq_requeue,
+	TPPROTO(struct request_queue *q, struct request *rq),
+	TPARGS(q, rq),
+	TPFMT("%d:%d %c %llu + %u [%d]",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		rq->cmd_flags & __REQ_RW ? 'W' : 'R',
+		blk_pc_request(rq) ? 0 : rq->hard_sector,
+		blk_pc_request(rq) ? rq->data_len : rq->hard_nr_sectors << 9,
+		rq->errors)
+	);
+
+TRACE_FORMAT(block_rq_complete,
+	TPPROTO(struct request_queue *q, struct request *rq),
+	TPARGS(q, rq),
+	TPFMT("%d:%d %c %llu + %u [%d]",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		rq->cmd_flags & __REQ_RW ? 'W' : 'R',
+		blk_pc_request(rq) ? 0 : rq->hard_sector,
+		blk_pc_request(rq) ? rq->data_len : rq->hard_nr_sectors << 9,
+		rq->errors)
+	);
+
+TRACE_FORMAT(block_bio_bounce,
+	TPPROTO(struct request_queue *q, struct bio *bio),
+	TPARGS(q, bio),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size)
+	);
+
+TRACE_FORMAT(block_bio_complete,
+	TPPROTO(struct request_queue *q, struct bio *bio),
+	TPARGS(q, bio),
+	TPFMT("%d:%d %c %llu + %u [%d]",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size,
+		!bio_flagged(bio, BIO_UPTODATE))
+	);
+
+TRACE_FORMAT(block_bio_backmerge,
+	TPPROTO(struct request_queue *q, struct bio *bio),
+	TPARGS(q, bio),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size)
+	);
+
+TRACE_FORMAT(block_bio_frontmerge,
+	TPPROTO(struct request_queue *q, struct bio *bio),
+	TPARGS(q, bio),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size)
+	);
+
+TRACE_FORMAT(block_bio_queue,
+	TPPROTO(struct request_queue *q, struct bio *bio),
+	TPARGS(q, bio),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size)
+	);
+
+TRACE_FORMAT(block_getrq,
+	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
+	TPARGS(q, bio, rw),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		(bio ? (bio->bi_rw & WRITE) : rw) ? 'W' : 'R',
+		bio ? bio->bi_sector : 0,
+		bio ? bio->bi_size : 0)
+	);
+
+TRACE_FORMAT(block_sleeprq,
+	TPPROTO(struct request_queue *q, struct bio *bio, int rw),
+	TPARGS(q, bio, rw),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		(bio ? (bio->bi_rw & WRITE) : rw) ? 'W' : 'R',
+		bio ? bio->bi_sector : 0,
+		bio ? bio->bi_size : 0)
+	);
+
+TRACE_FORMAT(block_plug,
+	TPPROTO(struct request_queue *q),
+	TPARGS(q),
+	TPFMT("%d:%d",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)))
+	);
+
+TRACE_FORMAT(block_unplug_timer,
+	TPPROTO(struct request_queue *q),
+	TPARGS(q),
+	TPFMT("%d:%d",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)))
+	);
+
+TRACE_FORMAT(block_unplug_io,
+	TPPROTO(struct request_queue *q),
+	TPARGS(q),
+	TPFMT("%d:%d",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)))
+	);
+
+TRACE_FORMAT(block_split,
+	TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
+	TPARGS(q, bio, pdu),
+	TPFMT("%d:%d %c %llu + %u",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		bio->bi_sector, bio->bi_size)
+	); /* FIXME add pdu info */
+
+TRACE_FORMAT(block_remap,
+	TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
+		sector_t from, sector_t to),
+	TPARGS(q, bio, dev, from, to),
+	TPFMT("%d:%d %c %llu + %u -> (%d:%d) %llu",
+		MAJOR(Q_DEV(q)), MINOR(Q_DEV(q)),
+		bio->bi_rw & WRITE ? 'W' : 'R',
+		from, bio->bi_size,
+		MAJOR(dev), MINOR(dev), to)
+	);
+
+#undef Q_DEV
+
+#undef TRACE_SYSTEM

Index: linux-2.6/include/trace/trace_event_types.h
===================================================================

include/trace/trace_event_types.h +1 -0
@@ -3,3 +3,4 @@
 #include <trace/sched_event_types.h>
 #include <trace/irq_event_types.h>
 #include <trace/lockdep_event_types.h>
+#include <trace/block_event_types.h>

Index: linux-2.6/include/trace/trace_events.h
===================================================================

include/trace/trace_events.h +1 -0
@@ -3,3 +3,4 @@
 #include <trace/sched.h>
 #include <trace/irq.h>
 #include <trace/lockdep.h>
+#include <trace/block.h>
#2 lore raw
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · Peter Zijlstra

Subject: tracing: block events
From: Peter Zijlstra <[email protected]>
Date: Wed Mar 04 15:09:43 CET 2009

Quoted 6 lines
Quoted 1 line

Peter, Thanks!

I'll try it out. I know this is an RFC patch, but it could really due with a change log ;-)

also, i think there's some extra complexity in the blktrace tracepoints that needs the _SPECIAL macro - right?

Ingo