Commit a3fb01ba authored May 23, 2019 by Dennis Zhou Committed by Jens Axboe Jun 20, 2019

blk-iolatency: only account submitted bios



As is, iolatency recognizes done_bio and cleanup as ending paths. If a
request is marked REQ_NOWAIT and fails to get a request, the bio is
cleaned up via rq_qos_cleanup() and ended in bio_wouldblock_error().
This results in underflowing the inflight counter. Fix this by only
accounting bios that were actually submitted.

Signed-off-by: Dennis Zhou <dennis@kernel.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent d27e84a3

block/blk-iolatency.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,10 @@ static void blkcg_iolatency_done_bio(struct rq_qos rqos, struct bio bio)
		if (!blkg \|\| !bio_flagged(bio, BIO_TRACKED))
		return;

		/* We didn't actually submit this bio, don't account it. */
		if (bio->bi_status == BLK_STS_AGAIN)
		return;

		iolat = blkg_to_lat(bio->bi_blkg);
		if (!iolat)
		return;

Admin message