Re: [RFC PATCH 10/39] blktrace: update blk_add_trace_rq_issue()
From: Damien Le Moal <hidden>
Date: 2021-02-26 04:49:36
Also in:
linux-fsdevel
On 2021/02/25 16:04, Chaitanya Kulkarni wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Chaitanya Kulkarni <redacted> --- 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 906afa0982c2..e1646d74ac9a 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c@@ -1158,7 +1158,25 @@ static void blk_add_trace_rq_insert(void *ignore, struct request *rq) static void blk_add_trace_rq_issue(void *ignore, struct request *rq) { - blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_ISSUE, + 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_ISSUE; + } else if (bte) { + ta = BLK_TA_ISSUE_EXT; + }
Same comments as for patch 9.
+ rcu_read_unlock(); + blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), ta, blk_trace_request_get_cgid(rq)); }
-- Damien Le Moal Western Digital Research