blk-iolatency: only account submitted bios
Subsystems (2)
PATCH 1/1 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.
--- block/blk-iolatency.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-iolatency.c +4 -0
@@ -599,6 +599,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 ;
Signature · 1 line
2.17.1
Hi Jens,
Quoted 30 lines · Dennis Zhou
As is, iolatency recognizes
done_bioand cleanup as ending paths. If a request is markedREQ_NOWAITand fails to get a request, the bio is cleaned up viarq_qos_cleanup()and ended inbio_wouldblock_error(). This results in underflowing the inflight counter. Fix this by only accounting bios that were actually submitted.Signed-off-by Dennis Zhou <[email protected]>Cc Josef Bacik <[email protected]>--- block/blk-iolatency.c | 4 ++++ 1 file changed, 4 insertions(+)block/blk-iolatency.c +4
-0@@ -599,6 +599,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 ;Signature · 1 line
2.17.1
Can you please take a look at this?
Thanks,
Dennis
Jens Axboe
maintainerQuoted 5 lines · Dennis Zhou
As is, iolatency recognizes
done_bioand cleanup as ending paths. If a request is markedREQ_NOWAITand fails to get a request, the bio is cleaned up viarq_qos_cleanup()and ended inbio_wouldblock_error(). This results in underflowing the inflight counter. Fix this by only accounting bios that were actually submitted.
Looks good to me, applied.
Signature · 1 line
Jens Axboe