diff options
| author | Dennis Zhou <dennis@kernel.org> | 2019-05-23 16:10:18 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-20 03:29:56 -0600 |
| commit | a3fb01ba5af066521f3f3421839e501bb2c71805 (patch) | |
| tree | eb3032a3a70a2d37e8da4c5d14eda6e58e99e479 | |
| parent | d27e84a305980ac61df0a6841059d0eb09b8283d (diff) | |
| download | linux-a3fb01ba5af066521f3f3421839e501bb2c71805.tar.gz linux-a3fb01ba5af066521f3f3421839e501bb2c71805.tar.bz2 linux-a3fb01ba5af066521f3f3421839e501bb2c71805.zip | |
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>
| -rw-r--r-- | block/blk-iolatency.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 17896bb3aaf2..e8859350ab6e 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -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; |