From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-btrace@vger.kernel.org
Subject: [RFC PATCH 21/39] blktrace: update blk_add_trace_sleeprq()
Date: Mon, 23 Mar 2020 16:30:04 +0000 [thread overview]
Message-ID: <20200323163022.30688-22-chaitanya.kulkarni@wdc.com> (raw)
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 9fd0e5758d3d..a95ed09990e1 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1416,16 +1416,36 @@ static void blk_add_trace_sleeprq(void *ignore,
struct request_queue *q,
struct bio *bio, int rw)
{
- if (bio)
- blk_add_trace_bio(q, bio, BLK_TA_SLEEPRQ, 0);
- else {
+ 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_SLEEPRQ;
+ } else if (bte) {
+ ta = BLK_TA_SLEEPRQ_EXT;
+ }
+ rcu_read_unlock();
+ if (bio) {
+ blk_add_trace_bio(q, bio, ta, 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_SLEEPRQ,
- 0, 0, NULL, 0);
+ __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.0
next reply other threads:[~2020-03-23 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 16:30 Chaitanya Kulkarni [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-20 4:24 [RFC PATCH 21/39] blktrace: update blk_add_trace_sleeprq() Chaitanya Kulkarni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200323163022.30688-22-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=linux-btrace@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).