* [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
@ 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 | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 19519852ce89..c2e72cbcef4a 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1261,20 +1261,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
*
**/
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
- u32 what, int error)
+ u64 what, int error)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (likely(!bt)) {
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
rcu_read_unlock();
return;
}
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, what, error, 0, NULL,
- blk_trace_bio_get_cgid(q, bio));
+ if (q->blk_trace) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, (u32)what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio),
+ bio_prio(bio));
+ }
rcu_read_unlock();
}
--
2.22.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
2021-02-25 7:02 ` [RFC PATCH 13/39] blktrace: update blk_add_trace_bio() Chaitanya Kulkarni
@ 2021-02-26 4:49 ` Damien Le Moal
0 siblings, 0 replies; 4+ messages in thread
From: Damien Le Moal @ 2021-02-26 4:49 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>
No commit message.
> ---
> kernel/trace/blktrace.c | 21 ++++++++++++++++-----
> 1 file changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 07f71a052a0d..14658b2a3fc8 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -1247,20 +1247,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
> *
> **/
> static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
> - u32 what, int error)
> + u64 what, int error)
> {
> struct blk_trace *bt;
> + struct blk_trace_ext *bte;
>
> rcu_read_lock();
> bt = rcu_dereference(q->blk_trace);
> - if (likely(!bt)) {
> + bte = rcu_dereference(q->blk_trace_ext);
> + if (likely(!bt) && likely(!bte)) {
> rcu_read_unlock();
> return;
> }
>
> - __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
> - bio_op(bio), bio->bi_opf, what, error, 0, NULL,
> - blk_trace_bio_get_cgid(q, bio));
> + if (bt) {
> + __blk_add_trace(bt, bio->bi_iter.bi_sector,
> + bio->bi_iter.bi_size, bio_op(bio),
> + bio->bi_opf, (u32)what, error, 0, NULL,
> + blk_trace_bio_get_cgid(q, bio));
> + } else if (bte) {
> + __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
> + bio->bi_iter.bi_size, bio_op(bio),
> + bio->bi_opf, what, error, 0, NULL,
> + blk_trace_bio_get_cgid(q, bio),
> + bio_prio(bio));
> + }
> rcu_read_unlock();
> }
>
>
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 4+ messages in thread
* [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
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:49 ` 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 | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 07f71a052a0d..14658b2a3fc8 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1247,20 +1247,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
*
**/
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
- u32 what, int error)
+ u64 what, int error)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (likely(!bt)) {
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
rcu_read_unlock();
return;
}
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, what, error, 0, NULL,
- blk_trace_bio_get_cgid(q, bio));
+ if (bt) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, (u32)what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (bte) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio),
+ bio_prio(bio));
+ }
rcu_read_unlock();
}
--
2.22.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RFC PATCH 13/39] blktrace: update blk_add_trace_bio()
@ 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 | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 5472b445f9b0..623fcb4fc746 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1261,20 +1261,31 @@ static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
*
**/
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
- u32 what, int error)
+ u64 what, int error)
{
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
- if (likely(!bt)) {
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
rcu_read_unlock();
return;
}
- __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio_op(bio), bio->bi_opf, what, error, 0, NULL,
- blk_trace_bio_get_cgid(q, bio));
+ if (q->blk_trace) {
+ __blk_add_trace(bt, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, (u32)what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio));
+ } else if (q->blk_trace_ext) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, what, error, 0, NULL,
+ blk_trace_bio_get_cgid(q, bio),
+ bio_prio(bio));
+ }
rcu_read_unlock();
}
--
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 13/39] blktrace: update blk_add_trace_bio() 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 13/39] blktrace: update blk_add_trace_bio() Chaitanya Kulkarni
2021-02-26 4:49 ` 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.