* [RFC PATCH 20/39] blktrace: update blk_add_trace_getrq()
@ 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 | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index e181428b97c1..9fd0e5758d3d 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1377,16 +1377,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;
+ 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;
+ }
+ rcu_read_unlock();
+
+ if (bio) {
+ if (bt) {
+ blk_add_trace_bio(q, bio, BLK_TA_GETRQ, 0);
+ } else if (bte) {
+ blk_add_trace_bio(q, bio, BLK_TA_GETRQ_EXT, 0);
+ }
+ } else {
struct blk_trace *bt;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
+ bte = rcu_dereference(q->blk_trace_ext);
if (bt)
__blk_add_trace(bt, 0, 0, rw, 0, BLK_TA_GETRQ, 0, 0,
NULL, 0);
+ else if (bte)
+ __blk_add_trace_ext(bte, 0, 0, rw, 0, BLK_TA_GETRQ_EXT,
+ 0, 0, NULL, 0, 0);
rcu_read_unlock();
}
}
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 20/39] blktrace: update blk_add_trace_getrq()
@ 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 | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 8f89b0ca0053..31b4fc636e04 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1263,14 +1263,23 @@ 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 {
+ if (bio) {
+ if (q->blk_trace) {
+ blk_add_trace_bio(q, bio, BLK_TA_GETRQ, 0);
+ } else if (q->blk_trace_ext) {
+ blk_add_trace_bio(q, bio, BLK_TA_GETRQ_EXT, 0);
+ }
+ } else {
struct blk_trace *bt = q->blk_trace;
+ struct blk_trace_ext *bte = q->blk_trace_ext;
- if (bt)
+ if (q->blk_trace) {
__blk_add_trace(bt, 0, 0, rw, 0, BLK_TA_GETRQ, 0, 0,
NULL, NULL);
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, 0, 0, rw, 0, BLK_TA_GETRQ_EXT,
+ 0, 0, NULL, NULL, 0);
+ }
}
}
--
2.22.1
^ 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 20/39] blktrace: update blk_add_trace_getrq() Chaitanya Kulkarni
-- strict thread matches above, loose matches on Subject: below --
2019-11-20 4:24 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).