* [RFC PATCH 22/39] blktrace: update blk_add_trace_plug()
@ 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 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index a95ed09990e1..1007082d28f2 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1453,11 +1453,20 @@ static void blk_add_trace_sleeprq(void *ignore,
static void blk_add_trace_plug(void *ignore, struct request_queue *q)
{
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)
__blk_add_trace(bt, 0, 0, 0, 0, BLK_TA_PLUG, 0, 0, NULL, 0);
+ else if (bte)
+ __blk_add_trace_ext(bte, 0, 0, 0, 0, BLK_TA_PLUG_EXT, 0, 0,
+ NULL, 0, 0);
rcu_read_unlock();
}
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 22/39] blktrace: update blk_add_trace_plug()
@ 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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index d9c56e6d34f6..51cb190eddea 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1283,7 +1283,6 @@ static void blk_add_trace_getrq(void *ignore,
}
}
-
static void blk_add_trace_sleeprq(void *ignore,
struct request_queue *q,
struct bio *bio, int rw)
@@ -1312,9 +1311,14 @@ static void blk_add_trace_sleeprq(void *ignore,
static void blk_add_trace_plug(void *ignore, struct request_queue *q)
{
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, 0, 0, BLK_TA_PLUG, 0, 0, NULL, NULL);
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, 0, 0, 0, 0, BLK_TA_PLUG_EXT, 0, 0,
+ NULL, NULL, 0);
+ }
}
static void blk_add_trace_unplug(void *ignore, struct request_queue *q,
--
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 22/39] blktrace: update blk_add_trace_plug() 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).