* [RFC PATCH 15/39] blktrace: update blk_add_trace_bio_complete()
@ 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, 19 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 01b89f3bd7f2..9f427aa5e942 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1316,8 +1316,25 @@ static void blk_add_trace_bio_bounce(void *ignore,
static void blk_add_trace_bio_complete(void *ignore,
struct request_queue *q, struct bio *bio)
{
- blk_add_trace_bio(q, bio, BLK_TA_COMPLETE,
- blk_status_to_errno(bio->bi_status));
+ u64 ta = 0;
+ struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+
+ rcu_read_lock();
+ bt = rcu_dereference(q->blk_trace);
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
+ rcu_read_unlock();
+ return;
+ }
+
+ if (bt) {
+ ta = BLK_TA_COMPLETE;
+ } else if (bte) {
+ ta = BLK_TA_COMPLETE_EXT;
+ }
+ rcu_read_unlock();
+ blk_add_trace_bio(q, bio, ta, blk_status_to_errno(bio->bi_status));
}
static void blk_add_trace_bio_backmerge(void *ignore,
--
2.22.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 15/39] blktrace: update blk_add_trace_bio_complete()
@ 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, 19 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 81d2a3ee5a92..a46688289987 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1316,8 +1316,25 @@ static void blk_add_trace_bio_bounce(void *ignore,
static void blk_add_trace_bio_complete(void *ignore,
struct request_queue *q, struct bio *bio)
{
- blk_add_trace_bio(q, bio, BLK_TA_COMPLETE,
- blk_status_to_errno(bio->bi_status));
+ u64 ta = 0;
+ struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+
+ rcu_read_lock();
+ bt = rcu_dereference(q->blk_trace);
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
+ rcu_read_unlock();
+ return;
+ }
+
+ if (bt) {
+ ta = BLK_TA_COMPLETE;
+ } else if (bte) {
+ ta = BLK_TA_COMPLETE_EXT;
+ }
+ rcu_read_unlock();
+ blk_add_trace_bio(q, bio, ta, blk_status_to_errno(bio->bi_status));
}
static void blk_add_trace_bio_backmerge(void *ignore,
--
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 15/39] blktrace: update blk_add_trace_bio_complete() 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).