Re: [PATCH 5/7] block: get rid of the trace rq insert wrapper

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 2021/02/02 14:26, Chaitanya Kulkarni wrote:
> Get rid of the wrapper for trace_block_rq_insert() and call the function
> directly.
> 
> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
> ---
>  block/bfq-iosched.c     | 4 +++-
>  block/blk-mq-sched.c    | 6 ------
>  block/blk-mq-sched.h    | 1 -
>  block/kyber-iosched.c   | 4 +++-
>  block/mq-deadline.c     | 4 +++-
>  kernel/trace/blktrace.c | 1 +
>  6 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index dfa87e360d71..da5e1f620625 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -125,6 +125,8 @@
>  #include <linux/delay.h>
>  #include <linux/backing-dev.h>
>  
> +#include <trace/events/block.h>
> +
>  #include "blk.h"
>  #include "blk-mq.h"
>  #include "blk-mq-tag.h"
> @@ -5621,7 +5623,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
>  
>  	spin_unlock_irq(&bfqd->lock);
>  
> -	blk_mq_sched_request_inserted(rq);
> +	trace_block_rq_insert(rq);
>  
>  	spin_lock_irq(&bfqd->lock);
>  	bfqq = bfq_init_rq(rq);
> diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
> index deff4e826e23..ddb65e9e6fd9 100644
> --- a/block/blk-mq-sched.c
> +++ b/block/blk-mq-sched.c
> @@ -384,12 +384,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq)
>  }
>  EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);
>  
> -void blk_mq_sched_request_inserted(struct request *rq)
> -{
> -	trace_block_rq_insert(rq);
> -}
> -EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);
> -
>  static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,
>  				       bool has_sched,
>  				       struct request *rq)
> diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
> index 0476360f05f1..5b18ab915c65 100644
> --- a/block/blk-mq-sched.h
> +++ b/block/blk-mq-sched.h
> @@ -7,7 +7,6 @@
>  
>  void blk_mq_sched_assign_ioc(struct request *rq);
>  
> -void blk_mq_sched_request_inserted(struct request *rq);
>  bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
>  		unsigned int nr_segs, struct request **merged_request);
>  bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
> diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
> index c25c41d0d061..f13da10953bf 100644
> --- a/block/kyber-iosched.c
> +++ b/block/kyber-iosched.c
> @@ -13,6 +13,8 @@
>  #include <linux/module.h>
>  #include <linux/sbitmap.h>
>  
> +#include <trace/events/block.h>
> +
>  #include "blk.h"
>  #include "blk-mq.h"
>  #include "blk-mq-debugfs.h"
> @@ -602,7 +604,7 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
>  			list_move_tail(&rq->queuelist, head);
>  		sbitmap_set_bit(&khd->kcq_map[sched_domain],
>  				rq->mq_ctx->index_hw[hctx->type]);
> -		blk_mq_sched_request_inserted(rq);
> +		trace_block_rq_insert(rq);
>  		spin_unlock(&kcq->lock);
>  	}
>  }
> diff --git a/block/mq-deadline.c b/block/mq-deadline.c
> index b57470e154c8..f3631a287466 100644
> --- a/block/mq-deadline.c
> +++ b/block/mq-deadline.c
> @@ -18,6 +18,8 @@
>  #include <linux/rbtree.h>
>  #include <linux/sbitmap.h>
>  
> +#include <trace/events/block.h>
> +
>  #include "blk.h"
>  #include "blk-mq.h"
>  #include "blk-mq-debugfs.h"
> @@ -496,7 +498,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
>  	if (blk_mq_sched_try_insert_merge(q, rq))
>  		return;
>  
> -	blk_mq_sched_request_inserted(rq);
> +	trace_block_rq_insert(rq);
>  
>  	if (at_head || blk_rq_is_passthrough(rq)) {
>  		if (at_head)
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 1a931afcf5c4..259635217a53 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -852,6 +852,7 @@ 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,
>  			 blk_trace_request_get_cgid(rq));
>  }
> +EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert);
>  
>  static void blk_add_trace_rq_merge(void *ignore, struct request *rq)
>  {
> 

Looks good.

Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxx>

-- 
Damien Le Moal
Western Digital Research




[Index of Archives]     [Linux RAID]     [Linux SCSI]     [Linux ATA RAID]     [IDE]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Device Mapper]

  Powered by Linux