[PATCH] kyber: make trace_block_rq call consistent with documentation

[PATCH] kyber: make trace_block_rq call consistent with documentation

[Vincent Fu]

The kyber ioscheduler calls trace_block_rq_insert() *after* the request
is added to the queue but the documentation for trace_block_rq_insert()
says that the call should be made *before* the request is added to the
queue.  Move the tracepoint for the kyber ioscheduler so that it is
consistent with the documentation.

Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
---
 block/kyber-iosched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index 81e3279ec..15a8be572 100644
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -596,13 +596,13 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
 		struct list_head *head = &kcq->rq_list[sched_domain];
 
 		spin_lock(&kcq->lock);
+		trace_block_rq_insert(rq);
 		if (at_head)
 			list_move(&rq->queuelist, head);
 		else
 			list_move_tail(&rq->queuelist, head);
 		sbitmap_set_bit(&khd->kcq_map[sched_domain],
 				rq->mq_ctx->index_hw[hctx->type]);
-		trace_block_rq_insert(rq);
 		spin_unlock(&kcq->lock);
 	}
 }
-- 
2.25.1

Re: [PATCH] kyber: make trace_block_rq call consistent with documentation

[Adam Manzanares]

On Wed, Aug 04, 2021 at 07:49:23PM +0000, Vincent Fu wrote:
> The kyber ioscheduler calls trace_block_rq_insert() *after* the request
> is added to the queue but the documentation for trace_block_rq_insert()
> says that the call should be made *before* the request is added to the
> queue.  Move the tracepoint for the kyber ioscheduler so that it is
> consistent with the documentation.
> 
> Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
> ---
>  block/kyber-iosched.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
> index 81e3279ec..15a8be572 100644
> --- a/block/kyber-iosched.c
> +++ b/block/kyber-iosched.c
> @@ -596,13 +596,13 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
>  		struct list_head *head = &kcq->rq_list[sched_domain];
>  
>  		spin_lock(&kcq->lock);
> +		trace_block_rq_insert(rq);
>  		if (at_head)
>  			list_move(&rq->queuelist, head);
>  		else
>  			list_move_tail(&rq->queuelist, head);
>  		sbitmap_set_bit(&khd->kcq_map[sched_domain],
>  				rq->mq_ctx->index_hw[hctx->type]);
> -		trace_block_rq_insert(rq);
>  		spin_unlock(&kcq->lock);
>  	}
>  }
> -- 
> 2.25.1

Looks good.

Reviewed by: Adam Manzanares <a.manzanares@samsung.com>

Re: [PATCH] kyber: make trace_block_rq call consistent with documentation

[Jens Axboe]

On 8/4/21 1:49 PM, Vincent Fu wrote:
> The kyber ioscheduler calls trace_block_rq_insert() *after* the request
> is added to the queue but the documentation for trace_block_rq_insert()
> says that the call should be made *before* the request is added to the
> queue.  Move the tracepoint for the kyber ioscheduler so that it is
> consistent with the documentation.

Applied, thanks.

-- 
Jens Axboe