diff options
| author | Ming Lei <ming.lei@redhat.com> | 2022-02-16 12:45:13 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-02-16 19:42:28 -0700 |
| commit | 5a93b6027eb4ef5db60a4bc5bdbeba5fb9f29384 (patch) | |
| tree | b7839a03f6554e1c3a7e4e3c58a1ebb5e5b94f25 /block/blk-throttle.h | |
| parent | 9f5ede3c01f9951b0ae7d68b28762ad51d9bacc8 (diff) | |
| download | linux-5a93b6027eb4ef5db60a4bc5bdbeba5fb9f29384.tar.gz | |
block: don't try to throttle split bio if iops limit isn't set
We need to throttle split bio in case of IOPS limit even though the split bio has been marked as BIO_THROTTLED since block layer accounts split bio actually. If only throughput throttle is setup, no need to throttle any more if BIO_THROTTLED is set since we have accounted & considered the whole bio bytes already. Add one flag of THROTL_TG_HAS_IOPS_LIMIT for serving this purpose. Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20220216044514.2903784-8-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-throttle.h')
| -rw-r--r-- | block/blk-throttle.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/block/blk-throttle.h b/block/blk-throttle.h index cb43f4417d6e..c996a15f290e 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -52,6 +52,12 @@ struct throtl_service_queue { struct timer_list pending_timer; /* fires on first_pending_disptime */ }; +enum tg_state_flags { + THROTL_TG_PENDING = 1 << 0, /* on parent's pending tree */ + THROTL_TG_WAS_EMPTY = 1 << 1, /* bio_lists[] became non-empty */ + THROTL_TG_HAS_IOPS_LIMIT = 1 << 2, /* tg has iops limit */ +}; + enum { LIMIT_LOW, LIMIT_MAX, @@ -170,6 +176,11 @@ static inline bool blk_throtl_bio(struct bio *bio) { struct throtl_grp *tg = blkg_to_tg(bio->bi_blkg); + /* no need to throttle bps any more if the bio has been throttled */ + if (bio_flagged(bio, BIO_THROTTLED) && + !(tg->flags & THROTL_TG_HAS_IOPS_LIMIT)) + return false; + if (!tg->has_rules[bio_data_dir(bio)]) return false; |