From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org, dm-devel@redhat.com
Cc: jack@suse.czi, rdunlap@infradead.org, sagi@grimberg.me,
mingo@redhat.com, rostedt@goodmis.org, snitzer@redhat.com,
agk@redhat.com, axboe@kernel.dk, paolo.valente@linaro.org,
ming.lei@redhat.com, bvanassche@acm.org, fangguoju@gmail.com,
colyli@suse.de, hch@lst.de,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH 10/11] block: use block_bio class for getrq and sleeprq
Date: Mon, 29 Jun 2020 16:43:13 -0700 [thread overview]
Message-ID: <20200629234314.10509-11-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20200629234314.10509-1-chaitanya.kulkarni@wdc.com>
The only difference in block_get_rq and block_bio was the last param
passed __entry->nr_sector & bio->bi_iter.bi_size respectively. Since
that is not the case anymore replace block_get_rq class with block_bio
for block_getrq and block_sleeprq events, also adjust the code to handle
null bio case in block_bio.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
include/trace/events/block.h | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index d191d2cd1070..21f1daaf012b 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -272,11 +272,19 @@ DECLARE_EVENT_CLASS(block_bio,
),
TP_fast_assign(
- __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);
- memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
+ if (bio) {
+ __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);
+ memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
+ } else {
+ __entry->dev = 0;
+ __entry->sector = 0;
+ __entry->nr_sector = 0;
+ blk_fill_rwbs(__entry->rwbs, 0);
+ memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
+ }
),
TP_printk("%d,%d %s %llu + %u [%s]",
@@ -380,7 +388,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
* A request struct for queue has been allocated to handle the
* block IO operation @bio.
*/
-DEFINE_EVENT(block_get_rq, block_getrq,
+DEFINE_EVENT(block_bio, block_getrq,
TP_PROTO(struct bio *bio),
@@ -396,7 +404,7 @@ DEFINE_EVENT(block_get_rq, block_getrq,
* available. This tracepoint event is generated each time the
* process goes to sleep waiting for request struct become available.
*/
-DEFINE_EVENT(block_get_rq, block_sleeprq,
+DEFINE_EVENT(block_bio, block_sleeprq,
TP_PROTO(struct bio *bio),
--
2.26.0
next prev parent reply other threads:[~2020-06-29 23:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 23:43 [PATCH 00/10] block: blktrace framework cleanup Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 01/11] " Chaitanya Kulkarni
2020-06-30 5:10 ` Christoph Hellwig
2020-07-01 4:32 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 02/11] block: rename block_bio_merge class to block_bio Chaitanya Kulkarni
2020-06-30 5:10 ` Christoph Hellwig
2020-07-01 4:33 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 03/11] block: use block_bio event class for bio_queue Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 04/11] block: use block_bio event class for bio_bounce Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 05/11] block: get rid of the trace rq insert wrapper Chaitanya Kulkarni
2020-06-30 5:11 ` Christoph Hellwig
2020-07-01 4:34 ` Chaitanya Kulkarni
2020-07-03 23:29 ` Chaitanya Kulkarni
2020-07-07 6:57 ` hch
2020-06-29 23:43 ` [PATCH 06/11] block: remove extra param for trace_block_getrq() Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 07/11] block: get rid of blk_trace_request_get_cgid() Chaitanya Kulkarni
2020-06-30 5:12 ` Christoph Hellwig
2020-07-01 4:38 ` Chaitanya Kulkarni
2020-07-01 6:16 ` Christoph Hellwig
2020-07-01 21:06 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 08/11] block: fix the comments in the trace event block.h Chaitanya Kulkarni
2020-06-30 5:12 ` Christoph Hellwig
2020-06-29 23:43 ` [PATCH 09/11] block: remove unsed param in blk_fill_rwbs() Chaitanya Kulkarni
2020-06-30 5:12 ` Christoph Hellwig
2020-07-01 4:38 ` Chaitanya Kulkarni
2020-06-29 23:43 ` Chaitanya Kulkarni [this message]
2020-06-30 5:13 ` [PATCH 10/11] block: use block_bio class for getrq and sleeprq Christoph Hellwig
2020-07-01 4:45 ` Chaitanya Kulkarni
2020-07-01 6:18 ` Christoph Hellwig
2020-07-01 21:06 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 11/11] block: remove block_get_rq event class Chaitanya Kulkarni
2020-06-30 0:58 ` [PATCH 00/10] block: blktrace framework cleanup Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629234314.10509-11-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=fangguoju@gmail.com \
--cc=hch@lst.de \
--cc=jack@suse.czi \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=mingo@redhat.com \
--cc=paolo.valente@linaro.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sagi@grimberg.me \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).