* [RFC PATCH 19/39] blktrace: update blk_add_trace_getrq()
@ 2020-08-25 22:09 Chaitanya Kulkarni
0 siblings, 0 replies; 3+ 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 | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 04c3da8a5443..24b2164d47d4 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1417,16 +1417,36 @@ static void blk_add_trace_getrq(void *ignore,
struct request_queue *q,
struct bio *bio, int rw)
{
- if (bio)
- blk_add_trace_bio(q, bio, BLK_TA_GETRQ, 0);
- else {
- struct blk_trace *bt;
+ 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_GETRQ;
+ } else if (bte) {
+ ta = BLK_TA_GETRQ_EXT;
+ }
+ rcu_read_unlock();
+
+ if (bio) {
+ blk_add_trace_bio(q, bio, ta, 0);
+ } else {
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (bt)
- __blk_add_trace(bt, 0, 0, rw, 0, BLK_TA_GETRQ, 0, 0,
- NULL, 0);
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (bt) {
+ __blk_add_trace(bt, 0, 0, rw, 0, ta, 0, 0, NULL, 0);
+ } else if (bte) {
+ __blk_add_trace_ext(bte, 0, 0, rw, 0, ta, 0, 0, NULL,
+ 0, 0);
+ }
rcu_read_unlock();
}
}
--
2.22.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [RFC PATCH 19/39] blktrace: update blk_add_trace_getrq()
2021-02-25 7:01 [RFC PATCH 00/39] blktrace: add block trace extension support Chaitanya Kulkarni
@ 2021-02-25 7:02 ` Chaitanya Kulkarni
0 siblings, 0 replies; 3+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-25 7:02 UTC (permalink / raw)
To: axboe, viro, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
aravind.ramesh, joshi.k, niklas.cassel, hch, osandov,
martin.petersen
Cc: linux-block, linux-fsdevel
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 45327201ebf6..51c10d86aa92 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1394,7 +1394,24 @@ static void blk_add_trace_bio_queue(void *ignore, struct bio *bio)
static void blk_add_trace_getrq(void *ignore, struct bio *bio)
{
- blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_GETRQ, 0);
+ u64 ta = 0;
+ struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+
+ rcu_read_lock();
+ bt = rcu_dereference(bio->bi_bdev->bd_disk->queue->blk_trace);
+ bte = rcu_dereference(bio->bi_bdev->bd_disk->queue->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
+ rcu_read_unlock();
+ return;
+ }
+ if (bt) {
+ ta = BLK_TA_GETRQ;
+ } else if (bte) {
+ ta = BLK_TA_GETRQ_EXT;
+ }
+ rcu_read_unlock();
+ blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, ta, 0);
}
static void blk_add_trace_plug(void *ignore, struct request_queue *q)
--
2.22.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [RFC PATCH 19/39] blktrace: update blk_add_trace_getrq()
@ 2020-11-05 2:40 Chaitanya Kulkarni
0 siblings, 0 replies; 3+ 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 | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index abb14a22334f..916d7e95dca8 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1417,16 +1417,36 @@ static void blk_add_trace_getrq(void *ignore,
struct request_queue *q,
struct bio *bio, int rw)
{
- if (bio)
- blk_add_trace_bio(q, bio, BLK_TA_GETRQ, 0);
- else {
- struct blk_trace *bt;
+ 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_GETRQ;
+ } else if (bte) {
+ ta = BLK_TA_GETRQ_EXT;
+ }
+ rcu_read_unlock();
+
+ if (bio) {
+ blk_add_trace_bio(q, bio, ta, 0);
+ } else {
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (bt)
- __blk_add_trace(bt, 0, 0, rw, 0, BLK_TA_GETRQ, 0, 0,
- NULL, 0);
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (bt) {
+ __blk_add_trace(bt, 0, 0, rw, 0, ta, 0, 0, NULL, 0);
+ } else if (bte) {
+ __blk_add_trace_ext(bte, 0, 0, rw, 0, ta, 0, 0, NULL,
+ 0, 0);
+ }
rcu_read_unlock();
}
}
--
2.22.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-25 7:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 22:09 [RFC PATCH 19/39] blktrace: update blk_add_trace_getrq() Chaitanya Kulkarni
2020-11-05 2:40 Chaitanya Kulkarni
2021-02-25 7:01 [RFC PATCH 00/39] blktrace: add block trace extension support Chaitanya Kulkarni
2021-02-25 7:02 ` [RFC PATCH 19/39] blktrace: update blk_add_trace_getrq() 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.