diff options
| author | Dennis Zhou <dennis@kernel.org> | 2019-05-23 16:10:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:12:37 +0200 |
| commit | c8632e34f614245c7299ccf7ad6d0976dff002de (patch) | |
| tree | 8f159b4d52d0e1cd2deb73de8b0c029e71db6833 /block | |
| parent | 1d4bf99c6a601e56ed010a4c184e34a2d2aebc35 (diff) | |
| download | linux-stable-c8632e34f614245c7299ccf7ad6d0976dff002de.tar.gz linux-stable-c8632e34f614245c7299ccf7ad6d0976dff002de.tar.bz2 linux-stable-c8632e34f614245c7299ccf7ad6d0976dff002de.zip | |
blk-iolatency: only account submitted bios
[ Upstream commit a3fb01ba5af066521f3f3421839e501bb2c71805 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -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 507212d75ee2..58bac44ba78a 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -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; |