All of lore.kernel.org
 help / color / mirror / Atom feed
* [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete()
@ 2020-08-25 22:09 Chaitanya Kulkarni
  0 siblings, 0 replies; 4+ messages in thread
From: Chaitanya Kulkarni @ 2020-08-25 22:09 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 fbbdc4d284ec..19519852ce89 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1227,7 +1227,25 @@ static void blk_add_trace_rq_requeue(void *ignore,
 static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
 			int error, unsigned int nr_bytes)
 {
-	blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE,
+	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_COMPLETE;
+	} else if (bte) {
+		ta = BLK_TA_COMPLETE_EXT;
+	}
+	rcu_read_unlock();
+	blk_add_trace_rq(rq, error, nr_bytes, ta,
 			 blk_trace_request_get_cgid(rq->q, rq));
 }
 
-- 
2.22.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete()
  2021-02-25  7:02 ` [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete() Chaitanya Kulkarni
@ 2021-02-26  4:48   ` Damien Le Moal
  0 siblings, 0 replies; 4+ messages in thread
From: Damien Le Moal @ 2021-02-26  4:48 UTC (permalink / raw)
  To: Chaitanya Kulkarni, axboe, viro, rostedt, mingo,
	Johannes Thumshirn, bvanassche, dongli.zhang, Aravind Ramesh,
	joshi.k, Niklas Cassel, hch, osandov, martin.petersen
  Cc: linux-block, linux-fsdevel

On 2021/02/25 16:04, Chaitanya Kulkarni wrote:
> 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 8a7fedfac6b3..07f71a052a0d 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -1213,7 +1213,25 @@ static void blk_add_trace_rq_requeue(void *ignore, struct request *rq)
>  static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
>  			int error, unsigned int nr_bytes)
>  {
> -	blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE,
> +	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_COMPLETE;
> +	} else if (bte) {
> +		ta = BLK_TA_COMPLETE_EXT;
> +	}
> +	rcu_read_unlock();
> +	blk_add_trace_rq(rq, error, nr_bytes, ta,
>  			 blk_trace_request_get_cgid(rq));
>  }
>  
> 

Same comment as for patch 9.


-- 
Damien Le Moal
Western Digital Research

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete()
  2021-02-25  7:01 [RFC PATCH 00/39] blktrace: add block trace extension support Chaitanya Kulkarni
@ 2021-02-25  7:02 ` Chaitanya Kulkarni
  2021-02-26  4:48   ` Damien Le Moal
  0 siblings, 1 reply; 4+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-25  7:02 UTC (permalink / raw)
  To: axboe, viro, rostedt, mingo, chaitanya.kulkarni,
	johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
	aravind.ramesh, joshi.k, niklas.cassel, hch, osandov,
	martin.petersen
  Cc: linux-block, linux-fsdevel

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 8a7fedfac6b3..07f71a052a0d 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1213,7 +1213,25 @@ static void blk_add_trace_rq_requeue(void *ignore, struct request *rq)
 static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
 			int error, unsigned int nr_bytes)
 {
-	blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE,
+	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_COMPLETE;
+	} else if (bte) {
+		ta = BLK_TA_COMPLETE_EXT;
+	}
+	rcu_read_unlock();
+	blk_add_trace_rq(rq, error, nr_bytes, ta,
 			 blk_trace_request_get_cgid(rq));
 }
 
-- 
2.22.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete()
@ 2020-11-05  2:40 Chaitanya Kulkarni
  0 siblings, 0 replies; 4+ messages in thread
From: Chaitanya Kulkarni @ 2020-11-05  2:40 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 d55dec67354d..5472b445f9b0 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1227,7 +1227,25 @@ static void blk_add_trace_rq_requeue(void *ignore,
 static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
 			int error, unsigned int nr_bytes)
 {
-	blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE,
+	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_COMPLETE;
+	} else if (bte) {
+		ta = BLK_TA_COMPLETE_EXT;
+	}
+	rcu_read_unlock();
+	blk_add_trace_rq(rq, error, nr_bytes, ta,
 			 blk_trace_request_get_cgid(rq->q, rq));
 }
 
-- 
2.22.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-26  4:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 22:09 [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete() Chaitanya Kulkarni
2020-11-05  2:40 Chaitanya Kulkarni
2021-02-25  7:01 [RFC PATCH 00/39] blktrace: add block trace extension support Chaitanya Kulkarni
2021-02-25  7:02 ` [RFC PATCH 12/39] blktrace: update blk_add_trace_rq_complete() Chaitanya Kulkarni
2021-02-26  4:48   ` Damien Le Moal

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.