* [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
@ 2020-11-05 2:40 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2020-11-05 2:40 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 5472b445f9b0..623fcb4fc746 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1261,20 +1261,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
*
**/
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
- u32 what, int error)
+ u64 what, int error)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (likely(!bt)) {
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
rcu_read_unlock();
return;
}
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, what, error, 0, NULL,
- blk_trace_bio_get_cgid(q, bio));
+ if (q->blk_trace) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, (u32)what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio),
+ bio_prio(bio));
+ }
rcu_read_unlock();
}
--
2.22.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
@ 2020-08-25 22:09 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2020-08-25 22:09 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 19519852ce89..c2e72cbcef4a 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1261,20 +1261,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
*
**/
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
- u32 what, int error)
+ u64 what, int error)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (likely(!bt)) {
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
rcu_read_unlock();
return;
}
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, what, error, 0, NULL,
- blk_trace_bio_get_cgid(q, bio));
+ if (q->blk_trace) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, (u32)what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio),
+ bio_prio(bio));
+ }
rcu_read_unlock();
}
--
2.22.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-05 2:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 2:40 [RFC PATCH 13/39] blktrace: update blk_add_trace_bio() Chaitanya Kulkarni
-- strict thread matches above, loose matches on Subject: below --
2020-08-25 22:09 Chaitanya Kulkarni
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).