* [PATCH RFC 2/2] tracing/block: add request operation and flags into trace events
2020-05-04 15:16 [PATCH RFC 1/2] tracing/block: cleanup rwbs filling in trace events Konstantin Khlebnikov
@ 2020-05-04 15:16 ` Konstantin Khlebnikov
2020-05-04 17:35 ` Steven Rostedt
2020-05-06 7:07 ` [PATCH RFC 1/2] tracing/block: cleanup rwbs filling in " Coly Li
1 sibling, 1 reply; 4+ messages in thread
From: Konstantin Khlebnikov @ 2020-05-04 15:16 UTC (permalink / raw)
To: linux-kernel, linux-block
Cc: linux-bcache, Jens Axboe, Steven Rostedt (VMware), Christoph Hellwig
It's hard to fit all flags into field 'rwbs' and even harder to remove
something without breaking compatibility. Let's expose all request flags
using common trace event methods: __print_symbolic and __print_flags.
This adds 32-bit 'req' field printed as req=OP,FLAGS,... by all events.
Exact constants are not part of ABI thus could be easily added/removed.
Keep 'rwbs' for backward compatibility.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
include/trace/events/block.h | 178 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 156 insertions(+), 22 deletions(-)
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index aac9a5c0e2cc..25fff917a07f 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -11,6 +11,96 @@
#include <linux/tracepoint.h>
+/* Request operations, see enum req_opf */
+
+TRACE_DEFINE_ENUM(REQ_OP_READ);
+TRACE_DEFINE_ENUM(REQ_OP_WRITE);
+TRACE_DEFINE_ENUM(REQ_OP_FLUSH);
+TRACE_DEFINE_ENUM(REQ_OP_DISCARD);
+TRACE_DEFINE_ENUM(REQ_OP_SECURE_ERASE);
+TRACE_DEFINE_ENUM(REQ_OP_ZONE_RESET);
+TRACE_DEFINE_ENUM(REQ_OP_WRITE_SAME);
+TRACE_DEFINE_ENUM(REQ_OP_ZONE_RESET_ALL);
+TRACE_DEFINE_ENUM(REQ_OP_WRITE_ZEROES);
+TRACE_DEFINE_ENUM(REQ_OP_ZONE_OPEN);
+TRACE_DEFINE_ENUM(REQ_OP_ZONE_CLOSE);
+TRACE_DEFINE_ENUM(REQ_OP_ZONE_FINISH);
+TRACE_DEFINE_ENUM(REQ_OP_SCSI_IN);
+TRACE_DEFINE_ENUM(REQ_OP_SCSI_OUT);
+TRACE_DEFINE_ENUM(REQ_OP_DRV_IN);
+TRACE_DEFINE_ENUM(REQ_OP_DRV_OUT);
+
+#define BLOCK_REQ_OP_STRINGS \
+ { REQ_OP_READ, "READ" }, \
+ { REQ_OP_WRITE, "WRITE" }, \
+ { REQ_OP_FLUSH, "FLUSH" }, \
+ { REQ_OP_DISCARD, "DISCARD" }, \
+ { REQ_OP_SECURE_ERASE, "SECURE_ERASE" }, \
+ { REQ_OP_ZONE_RESET, "ZONE_RESET" }, \
+ { REQ_OP_WRITE_SAME, "WRITE_SAME" }, \
+ { REQ_OP_ZONE_RESET_ALL,"ZONE_RESET_ALL" }, \
+ { REQ_OP_WRITE_ZEROES, "WRITE_ZEROES" }, \
+ { REQ_OP_ZONE_OPEN, "ZONE_OPEN" }, \
+ { REQ_OP_ZONE_CLOSE, "ZONE_CLOSE" }, \
+ { REQ_OP_ZONE_FINISH, "ZONE_FINISH" }, \
+ { REQ_OP_SCSI_IN, "SCSI_IN" }, \
+ { REQ_OP_SCSI_OUT, "SCSI_OUT" }, \
+ { REQ_OP_DRV_IN, "DRV_IN" }, \
+ { REQ_OP_DRV_OUT, "DRV_OUT" }
+
+#define show_block_req_op(req) \
+ __print_symbolic((req) & REQ_OP_MASK, BLOCK_REQ_OP_STRINGS)
+
+
+/* Request operation flags, see enum req_flag_bits */
+
+TRACE_DEFINE_ENUM(__REQ_FAILFAST_DEV);
+TRACE_DEFINE_ENUM(__REQ_FAILFAST_TRANSPORT);
+TRACE_DEFINE_ENUM(__REQ_FAILFAST_DRIVER);
+TRACE_DEFINE_ENUM(__REQ_SYNC);
+TRACE_DEFINE_ENUM(__REQ_META);
+TRACE_DEFINE_ENUM(__REQ_PRIO);
+TRACE_DEFINE_ENUM(__REQ_NOMERGE);
+TRACE_DEFINE_ENUM(__REQ_IDLE);
+TRACE_DEFINE_ENUM(__REQ_INTEGRITY);
+TRACE_DEFINE_ENUM(__REQ_FUA);
+TRACE_DEFINE_ENUM(__REQ_PREFLUSH);
+TRACE_DEFINE_ENUM(__REQ_RAHEAD);
+TRACE_DEFINE_ENUM(__REQ_BACKGROUND);
+TRACE_DEFINE_ENUM(__REQ_NOWAIT);
+TRACE_DEFINE_ENUM(__REQ_NOWAIT_INLINE);
+TRACE_DEFINE_ENUM(__REQ_CGROUP_PUNT);
+TRACE_DEFINE_ENUM(__REQ_NOUNMAP);
+TRACE_DEFINE_ENUM(__REQ_HIPRI);
+TRACE_DEFINE_ENUM(__REQ_DRV);
+TRACE_DEFINE_ENUM(__REQ_SWAP);
+
+#define BLOCK_REQ_FLAG_STRINGS \
+ { REQ_FAILFAST_DEV, "FAILFAST_DEV" }, \
+ { REQ_FAILFAST_TRANSPORT,"FAILFAST_TRANSPORT" }, \
+ { REQ_FAILFAST_DRIVER, "FAILFAST_DRIVER" }, \
+ { REQ_SYNC, "SYNC" }, \
+ { REQ_META, "META" }, \
+ { REQ_PRIO, "PRIO" }, \
+ { REQ_NOMERGE, "NOMERGE" }, \
+ { REQ_IDLE, "IDLE" }, \
+ { REQ_INTEGRITY, "INTEGRITY" }, \
+ { REQ_FUA, "FUA" }, \
+ { REQ_PREFLUSH, "PREFLUSH" }, \
+ { REQ_RAHEAD, "RAHEAD" }, \
+ { REQ_BACKGROUND, "BACKGROUND" }, \
+ { REQ_NOWAIT, "NOWAIT" }, \
+ { REQ_NOWAIT_INLINE, "NOWAIT_INLINE" }, \
+ { REQ_CGROUP_PUNT, "CGROUP_PUNT" }, \
+ { REQ_NOUNMAP, "NOUNMAP" }, \
+ { REQ_HIPRI, "HIPRI" }, \
+ { REQ_DRV, "DRV" }, \
+ { REQ_SWAP, "SWAP" }
+
+#define show_block_req_flags(req) \
+ __print_flags((req) & ~REQ_OP_MASK, ",", BLOCK_REQ_FLAG_STRINGS)
+
+
DECLARE_EVENT_CLASS(block_buffer,
TP_PROTO(struct buffer_head *bh),
@@ -78,6 +168,7 @@ TRACE_EVENT(block_rq_requeue,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -86,6 +177,7 @@ TRACE_EVENT(block_rq_requeue,
TP_fast_assign(
__entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
+ __entry->req = rq->cmd_flags;
__entry->sector = blk_rq_trace_sector(rq);
__entry->nr_sector = blk_rq_trace_nr_sectors(rq);
@@ -93,11 +185,13 @@ TRACE_EVENT(block_rq_requeue,
__get_str(cmd)[0] = '\0';
),
- TP_printk("%d,%d %s (%s) %llu + %u [%d]",
+ TP_printk("%d,%d %s (%s) %llu + %u [%d] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd),
(unsigned long long)__entry->sector,
- __entry->nr_sector, 0)
+ __entry->nr_sector, 0,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -120,6 +214,7 @@ TRACE_EVENT(block_rq_complete,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( int, error )
@@ -129,6 +224,7 @@ TRACE_EVENT(block_rq_complete,
TP_fast_assign(
__entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
+ __entry->req = rq->cmd_flags;
__entry->sector = blk_rq_pos(rq);
__entry->nr_sector = nr_bytes >> 9;
__entry->error = error;
@@ -137,11 +233,13 @@ TRACE_EVENT(block_rq_complete,
__get_str(cmd)[0] = '\0';
),
- TP_printk("%d,%d %s (%s) %llu + %u [%d]",
+ TP_printk("%d,%d %s (%s) %llu + %u [%d] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->error)
+ __entry->nr_sector, __entry->error,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
DECLARE_EVENT_CLASS(block_rq,
@@ -152,6 +250,7 @@ DECLARE_EVENT_CLASS(block_rq,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, bytes )
@@ -162,6 +261,7 @@ DECLARE_EVENT_CLASS(block_rq,
TP_fast_assign(
__entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
+ __entry->req = rq->cmd_flags;
__entry->sector = blk_rq_trace_sector(rq);
__entry->nr_sector = blk_rq_trace_nr_sectors(rq);
__entry->bytes = blk_rq_bytes(rq);
@@ -171,11 +271,13 @@ DECLARE_EVENT_CLASS(block_rq,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
+ TP_printk("%d,%d %s %u (%s) %llu + %u [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __entry->bytes, __get_str(cmd),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -229,6 +331,7 @@ TRACE_EVENT(block_bio_bounce,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -237,16 +340,19 @@ TRACE_EVENT(block_bio_bounce,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -266,6 +372,7 @@ TRACE_EVENT(block_bio_complete,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned, nr_sector )
__field( int, error )
@@ -274,16 +381,19 @@ TRACE_EVENT(block_bio_complete,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
__entry->error = error;
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
- TP_printk("%d,%d %s %llu + %u [%d]",
+ TP_printk("%d,%d %s %llu + %u [%d] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->error)
+ __entry->nr_sector, __entry->error,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
DECLARE_EVENT_CLASS(block_bio_merge,
@@ -294,6 +404,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -302,16 +413,19 @@ DECLARE_EVENT_CLASS(block_bio_merge,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -361,6 +475,7 @@ TRACE_EVENT(block_bio_queue,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -369,16 +484,19 @@ TRACE_EVENT(block_bio_queue,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
DECLARE_EVENT_CLASS(block_get_rq,
@@ -389,6 +507,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -397,16 +516,19 @@ DECLARE_EVENT_CLASS(block_get_rq,
TP_fast_assign(
__entry->dev = bio ? bio_dev(bio) : 0;
+ __entry->req = bio ? bio->bi_opf : 0;
__entry->sector = bio ? bio->bi_iter.bi_sector : 0;
__entry->nr_sector = bio ? bio_sectors(bio) : 0;
blk_fill_rwbs(__entry->rwbs, bio ? bio->bi_opf : 0);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -523,6 +645,7 @@ TRACE_EVENT(block_split,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( sector_t, new_sector )
__array( char, rwbs, BLK_RWBS_LEN )
@@ -531,17 +654,20 @@ TRACE_EVENT(block_split,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->new_sector = new_sector;
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu / %llu [%s]",
+ TP_printk("%d,%d %s %llu / %llu [%s] req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
(unsigned long long)__entry->new_sector,
- __entry->comm)
+ __entry->comm,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -563,6 +689,7 @@ TRACE_EVENT(block_bio_remap,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( dev_t, old_dev )
@@ -572,6 +699,7 @@ TRACE_EVENT(block_bio_remap,
TP_fast_assign(
__entry->dev = bio_dev(bio);
+ __entry->req = bio->bi_opf;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
__entry->old_dev = dev;
@@ -579,12 +707,14 @@ TRACE_EVENT(block_bio_remap,
blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
- TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
+ TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
__entry->nr_sector,
MAJOR(__entry->old_dev), MINOR(__entry->old_dev),
- (unsigned long long)__entry->old_sector)
+ (unsigned long long)__entry->old_sector,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
/**
@@ -607,6 +737,7 @@ TRACE_EVENT(block_rq_remap,
TP_STRUCT__entry(
__field( dev_t, dev )
+ __field( unsigned int, req )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( dev_t, old_dev )
@@ -617,6 +748,7 @@ TRACE_EVENT(block_rq_remap,
TP_fast_assign(
__entry->dev = disk_devt(rq->rq_disk);
+ __entry->req = rq->cmd_flags;
__entry->sector = blk_rq_pos(rq);
__entry->nr_sector = blk_rq_sectors(rq);
__entry->old_dev = dev;
@@ -625,12 +757,14 @@ TRACE_EVENT(block_rq_remap,
blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
),
- TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u",
+ TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u req=%s,%s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
__entry->nr_sector,
MAJOR(__entry->old_dev), MINOR(__entry->old_dev),
- (unsigned long long)__entry->old_sector, __entry->nr_bios)
+ (unsigned long long)__entry->old_sector, __entry->nr_bios,
+ show_block_req_op(__entry->req),
+ show_block_req_flags(__entry->req))
);
#endif /* _TRACE_BLOCK_H */
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH RFC 1/2] tracing/block: cleanup rwbs filling in trace events
2020-05-04 15:16 [PATCH RFC 1/2] tracing/block: cleanup rwbs filling in trace events Konstantin Khlebnikov
2020-05-04 15:16 ` [PATCH RFC 2/2] tracing/block: add request operation and flags into " Konstantin Khlebnikov
@ 2020-05-06 7:07 ` Coly Li
1 sibling, 0 replies; 4+ messages in thread
From: Coly Li @ 2020-05-06 7:07 UTC (permalink / raw)
To: Konstantin Khlebnikov, linux-kernel, linux-block
Cc: linux-bcache, Jens Axboe, Steven Rostedt (VMware), Christoph Hellwig
On 2020/5/4 23:16, Konstantin Khlebnikov wrote:
> Define BLK_RWBS_LEN in blktrace_api.h
> Bcache events use shorter 6 char buffer which could overflow.
>
> Also remove unsed "bytes" argument.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
The patch is good for me, it can be directly handled by block layer
maintainer and skip me.
Reviewed-by: Coly Li <colyli@suse.de>
Thank you.
Coly Li
> ---
> include/linux/blktrace_api.h | 4 +-
> include/trace/events/bcache.h | 20 +++++-----
> include/trace/events/block.h | 84 ++++++++++++++++++++---------------------
> kernel/trace/blktrace.c | 2 -
> 4 files changed, 55 insertions(+), 55 deletions(-)
>
> diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
> index 3b6ff5902edc..ea9da15d32d9 100644
> --- a/include/linux/blktrace_api.h
> +++ b/include/linux/blktrace_api.h
> @@ -120,7 +120,9 @@ struct compat_blk_user_trace_setup {
>
> #endif
>
> -extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes);
> +#define BLK_RWBS_LEN 8
> +
> +extern void blk_fill_rwbs(char *rwbs, unsigned int op);
>
> static inline sector_t blk_rq_trace_sector(struct request *rq)
> {
> diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
> index 0bddea663b3b..7440d704c200 100644
> --- a/include/trace/events/bcache.h
> +++ b/include/trace/events/bcache.h
> @@ -18,7 +18,7 @@ DECLARE_EVENT_CLASS(bcache_request,
> __field(sector_t, sector )
> __field(dev_t, orig_sector )
> __field(unsigned int, nr_sector )
> - __array(char, rwbs, 6 )
> + __array(char, rwbs, BLK_RWBS_LEN )
> ),
>
> TP_fast_assign(
> @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request,
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->orig_sector = bio->bi_iter.bi_sector - 16;
> __entry->nr_sector = bio->bi_iter.bi_size >> 9;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> ),
>
> TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)",
> @@ -95,14 +95,14 @@ DECLARE_EVENT_CLASS(bcache_bio,
> __field(dev_t, dev )
> __field(sector_t, sector )
> __field(unsigned int, nr_sector )
> - __array(char, rwbs, 6 )
> + __array(char, rwbs, BLK_RWBS_LEN )
> ),
>
> TP_fast_assign(
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio->bi_iter.bi_size >> 9;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> ),
>
> TP_printk("%d,%d %s %llu + %u",
> @@ -128,7 +128,7 @@ TRACE_EVENT(bcache_read,
> __field(dev_t, dev )
> __field(sector_t, sector )
> __field(unsigned int, nr_sector )
> - __array(char, rwbs, 6 )
> + __array(char, rwbs, BLK_RWBS_LEN )
> __field(bool, cache_hit )
> __field(bool, bypass )
> ),
> @@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read,
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio->bi_iter.bi_size >> 9;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> __entry->cache_hit = hit;
> __entry->bypass = bypass;
> ),
> @@ -158,7 +158,7 @@ TRACE_EVENT(bcache_write,
> __field(u64, inode )
> __field(sector_t, sector )
> __field(unsigned int, nr_sector )
> - __array(char, rwbs, 6 )
> + __array(char, rwbs, BLK_RWBS_LEN )
> __field(bool, writeback )
> __field(bool, bypass )
> ),
> @@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write,
> __entry->inode = inode;
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio->bi_iter.bi_size >> 9;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> __entry->writeback = writeback;
> __entry->bypass = bypass;
> ),
> @@ -229,7 +229,7 @@ TRACE_EVENT(bcache_journal_write,
> __field(dev_t, dev )
> __field(sector_t, sector )
> __field(unsigned int, nr_sector )
> - __array(char, rwbs, 6 )
> + __array(char, rwbs, BLK_RWBS_LEN )
> __field(u32, nr_keys )
> ),
>
> @@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write,
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio->bi_iter.bi_size >> 9;
> __entry->nr_keys = keys;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> ),
>
> TP_printk("%d,%d %s %llu + %u keys %u",
> diff --git a/include/trace/events/block.h b/include/trace/events/block.h
> index 81b43f5bdf23..aac9a5c0e2cc 100644
> --- a/include/trace/events/block.h
> +++ b/include/trace/events/block.h
> @@ -10,7 +10,6 @@
> #include <linux/buffer_head.h>
> #include <linux/tracepoint.h>
>
> -#define RWBS_LEN 8
>
> DECLARE_EVENT_CLASS(block_buffer,
>
> @@ -81,7 +80,7 @@ TRACE_EVENT(block_rq_requeue,
> __field( dev_t, dev )
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __dynamic_array( char, cmd, 1 )
> ),
>
> @@ -90,7 +89,7 @@ TRACE_EVENT(block_rq_requeue,
> __entry->sector = blk_rq_trace_sector(rq);
> __entry->nr_sector = blk_rq_trace_nr_sectors(rq);
>
> - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
> + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
> __get_str(cmd)[0] = '\0';
> ),
>
> @@ -124,7 +123,7 @@ TRACE_EVENT(block_rq_complete,
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> __field( int, error )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __dynamic_array( char, cmd, 1 )
> ),
>
> @@ -134,7 +133,7 @@ TRACE_EVENT(block_rq_complete,
> __entry->nr_sector = nr_bytes >> 9;
> __entry->error = error;
>
> - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes);
> + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
> __get_str(cmd)[0] = '\0';
> ),
>
> @@ -156,7 +155,7 @@ DECLARE_EVENT_CLASS(block_rq,
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> __field( unsigned int, bytes )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __array( char, comm, TASK_COMM_LEN )
> __dynamic_array( char, cmd, 1 )
> ),
> @@ -167,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq,
> __entry->nr_sector = blk_rq_trace_nr_sectors(rq);
> __entry->bytes = blk_rq_bytes(rq);
>
> - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
> + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
> __get_str(cmd)[0] = '\0';
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
> @@ -232,7 +231,7 @@ TRACE_EVENT(block_bio_bounce,
> __field( dev_t, dev )
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __array( char, comm, TASK_COMM_LEN )
> ),
>
> @@ -240,7 +239,7 @@ TRACE_EVENT(block_bio_bounce,
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio_sectors(bio);
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
>
> @@ -266,11 +265,11 @@ TRACE_EVENT(block_bio_complete,
> TP_ARGS(q, bio, error),
>
> TP_STRUCT__entry(
> - __field( dev_t, dev )
> - __field( sector_t, sector )
> - __field( unsigned, nr_sector )
> - __field( int, error )
> - __array( char, rwbs, RWBS_LEN)
> + __field( dev_t, dev )
> + __field( sector_t, sector )
> + __field( unsigned, nr_sector )
> + __field( int, error )
> + __array( char, rwbs, BLK_RWBS_LEN )
> ),
>
> TP_fast_assign(
> @@ -278,7 +277,7 @@ TRACE_EVENT(block_bio_complete,
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio_sectors(bio);
> __entry->error = error;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> ),
>
> TP_printk("%d,%d %s %llu + %u [%d]",
> @@ -297,7 +296,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
> __field( dev_t, dev )
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __array( char, comm, TASK_COMM_LEN )
> ),
>
> @@ -305,7 +304,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio_sectors(bio);
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
>
> @@ -364,7 +363,7 @@ TRACE_EVENT(block_bio_queue,
> __field( dev_t, dev )
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __array( char, comm, TASK_COMM_LEN )
> ),
>
> @@ -372,7 +371,7 @@ TRACE_EVENT(block_bio_queue,
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->nr_sector = bio_sectors(bio);
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
>
> @@ -392,7 +391,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
> __field( dev_t, dev )
> __field( sector_t, sector )
> __field( unsigned int, nr_sector )
> - __array( char, rwbs, RWBS_LEN )
> + __array( char, rwbs, BLK_RWBS_LEN )
> __array( char, comm, TASK_COMM_LEN )
> ),
>
> @@ -400,8 +399,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
> __entry->dev = bio ? bio_dev(bio) : 0;
> __entry->sector = bio ? bio->bi_iter.bi_sector : 0;
> __entry->nr_sector = bio ? bio_sectors(bio) : 0;
> - blk_fill_rwbs(__entry->rwbs,
> - bio ? bio->bi_opf : 0, __entry->nr_sector);
> + blk_fill_rwbs(__entry->rwbs, bio ? bio->bi_opf : 0);
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
>
> @@ -524,18 +522,18 @@ TRACE_EVENT(block_split,
> TP_ARGS(q, bio, new_sector),
>
> TP_STRUCT__entry(
> - __field( dev_t, dev )
> - __field( sector_t, sector )
> - __field( sector_t, new_sector )
> - __array( char, rwbs, RWBS_LEN )
> - __array( char, comm, TASK_COMM_LEN )
> + __field( dev_t, dev )
> + __field( sector_t, sector )
> + __field( sector_t, new_sector )
> + __array( char, rwbs, BLK_RWBS_LEN )
> + __array( char, comm, TASK_COMM_LEN )
> ),
>
> TP_fast_assign(
> __entry->dev = bio_dev(bio);
> __entry->sector = bio->bi_iter.bi_sector;
> __entry->new_sector = new_sector;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
> ),
>
> @@ -564,12 +562,12 @@ TRACE_EVENT(block_bio_remap,
> TP_ARGS(q, bio, dev, from),
>
> TP_STRUCT__entry(
> - __field( dev_t, dev )
> - __field( sector_t, sector )
> - __field( unsigned int, nr_sector )
> - __field( dev_t, old_dev )
> - __field( sector_t, old_sector )
> - __array( char, rwbs, RWBS_LEN)
> + __field( dev_t, dev )
> + __field( sector_t, sector )
> + __field( unsigned int, nr_sector )
> + __field( dev_t, old_dev )
> + __field( sector_t, old_sector )
> + __array( char, rwbs, BLK_RWBS_LEN )
> ),
>
> TP_fast_assign(
> @@ -578,7 +576,7 @@ TRACE_EVENT(block_bio_remap,
> __entry->nr_sector = bio_sectors(bio);
> __entry->old_dev = dev;
> __entry->old_sector = from;
> - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
> + blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
> ),
>
> TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
> @@ -608,13 +606,13 @@ TRACE_EVENT(block_rq_remap,
> TP_ARGS(q, rq, dev, from),
>
> TP_STRUCT__entry(
> - __field( dev_t, dev )
> - __field( sector_t, sector )
> - __field( unsigned int, nr_sector )
> - __field( dev_t, old_dev )
> - __field( sector_t, old_sector )
> - __field( unsigned int, nr_bios )
> - __array( char, rwbs, RWBS_LEN)
> + __field( dev_t, dev )
> + __field( sector_t, sector )
> + __field( unsigned int, nr_sector )
> + __field( dev_t, old_dev )
> + __field( sector_t, old_sector )
> + __field( unsigned int, nr_bios )
> + __array( char, rwbs, BLK_RWBS_LEN )
> ),
>
> TP_fast_assign(
> @@ -624,7 +622,7 @@ TRACE_EVENT(block_rq_remap,
> __entry->old_dev = dev;
> __entry->old_sector = from;
> __entry->nr_bios = blk_rq_count_bios(rq);
> - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
> + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
> ),
>
> TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u",
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index ca39dc3230cb..dd10667d4164 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -1935,7 +1935,7 @@ void blk_trace_remove_sysfs(struct device *dev)
>
> #ifdef CONFIG_EVENT_TRACING
>
> -void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes)
> +void blk_fill_rwbs(char *rwbs, unsigned int op)
> {
> int i = 0;
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread