Commit 0f7c8f0f authored by Jinke Han's avatar Jinke Han Committed by Jens Axboe
Browse files

block: Fix io statistics for cgroup in throttle path 



In the current code, io statistics are missing for cgroup when bio
was throttled by blk-throttle. Fix it by moving the unreaching code
to submit_bio_noacct_nocheck.

Fixes: 3f98c753 ("block: don't check bio in blk_throtl_dispatch_work_fn")
Signed-off-by: default avatarJinke Han <hanjinke.666@bytedance.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Acked-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230216032250.74230-1-hanjinke.666@bytedance.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 67205f80

block/blk-core.c

+12 −11
Original line number Diff line number Diff line
@@ -684,6 +684,18 @@ static void __submit_bio_noacct_mq(struct bio *bio) 


void submit_bio_noacct_nocheck(struct bio *bio)

{

	blk_cgroup_bio_start(bio);

	blkcg_bio_issue_init(bio);



	if (!bio_flagged(bio, BIO_TRACE_COMPLETION)) {

		trace_block_bio_queue(bio);

		/*

		 * Now that enqueuing has been traced, we need to trace

		 * completion as well.

		 */

		bio_set_flag(bio, BIO_TRACE_COMPLETION);

	}



	/*

	 * We only want one ->submit_bio to be active at a time, else stack

	 * usage with stacked devices could be a problem.  Use current->bio_list
@@ -788,17 +800,6 @@ void submit_bio_noacct(struct bio *bio) 


	if (blk_throtl_bio(bio))

		return;



	blk_cgroup_bio_start(bio);

	blkcg_bio_issue_init(bio);



	if (!bio_flagged(bio, BIO_TRACE_COMPLETION)) {

		trace_block_bio_queue(bio);

		/* Now that enqueuing has been traced, we need to trace

		 * completion as well.

		 */

		bio_set_flag(bio, BIO_TRACE_COMPLETION);

	}

	submit_bio_noacct_nocheck(bio);

	return;