* [RFC PATCH 25/39] blktrace: update blk_add_trace_bio_remap()
@ 2019-11-20 4:24 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2019-11-20 4:24 UTC (permalink / raw
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 13c70d5cff65..d9418335ec26 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1392,18 +1392,24 @@ static void blk_add_trace_bio_remap(void *ignore,
dev_t dev, sector_t from)
{
struct blk_trace *bt = q->blk_trace;
+ struct blk_trace_ext *bte = q->blk_trace_ext;
struct blk_io_trace_remap r;
- if (likely(!bt))
- return;
-
r.device_from = cpu_to_be32(dev);
r.device_to = cpu_to_be32(bio_dev(bio));
r.sector_from = cpu_to_be64(from);
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_status,
- sizeof(r), &r, 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,
+ BLK_TA_REMAP, bio->bi_status, sizeof(r), &r,
+ 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,
+ BLK_TA_REMAP_EXT, bio->bi_status, sizeof(r), &r,
+ blk_trace_bio_get_cgid(q, bio), bio_prio(bio));
+ }
}
/**
--
2.22.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 25/39] blktrace: update blk_add_trace_bio_remap()
@ 2020-03-23 16:30 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-23 16:30 UTC (permalink / raw
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 6ac1c3744c3d..687f8e1025a0 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1552,11 +1552,13 @@ static void blk_add_trace_bio_remap(void *ignore,
dev_t dev, sector_t from)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
struct blk_io_trace_remap r;
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;
}
@@ -1565,9 +1567,18 @@ static void blk_add_trace_bio_remap(void *ignore,
r.device_to = cpu_to_be32(bio_dev(bio));
r.sector_from = cpu_to_be64(from);
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_status,
- sizeof(r), &r, blk_trace_bio_get_cgid(q, bio));
+ if (bt) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf,
+ BLK_TA_REMAP, bio->bi_status, sizeof(r), &r,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (bte) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, BLK_TA_REMAP_EXT, bio->bi_status,
+ sizeof(r), &r,
+ blk_trace_bio_get_cgid(q, bio), 0);
+ }
rcu_read_unlock();
}
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-23 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-23 16:30 [RFC PATCH 25/39] blktrace: update blk_add_trace_bio_remap() Chaitanya Kulkarni
-- strict thread matches above, loose matches on Subject: below --
2019-11-20 4:24 Chaitanya Kulkarni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.