* [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_requeue()
@ 2020-03-23 16:29 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-23 16:29 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 2b79163384b7..97a7eec4913a 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1161,7 +1161,25 @@ static void blk_add_trace_rq_requeue(void *ignore,
struct request_queue *q,
struct request *rq)
{
- blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_REQUEUE,
+ u64 ta;
+ struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+
+ rcu_read_lock();
+ bt = rcu_dereference(rq->q->blk_trace);
+ bte = rcu_dereference(rq->q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte) ) {
+ rcu_read_unlock();
+ return;
+ }
+
+ if (bt) {
+ ta = BLK_TA_REQUEUE;
+ } else if (bte) {
+ ta = BLK_TA_REQUEUE_EXT;
+ }
+ rcu_read_unlock();
+ blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), ta,
blk_trace_request_get_cgid(q, rq));
}
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_requeue()
@ 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 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index be39b99531ff..ff4eee1d33d8 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1133,7 +1133,14 @@ static void blk_add_trace_rq_requeue(void *ignore,
struct request_queue *q,
struct request *rq)
{
- blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_REQUEUE,
+ u64 ta = 0;
+
+ if (rq->q->blk_trace) {
+ ta = BLK_TA_REQUEUE;
+ } else if (rq->q->blk_trace_ext) {
+ ta = BLK_TA_REQUEUE_EXT;
+ }
+ blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), ta,
blk_trace_request_get_cgid(q, rq));
}
--
2.22.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-23 16:29 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:29 [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_requeue() 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).