Commit 5b7048b8 authored by Baolin Wang's avatar Baolin Wang Committed by Jens Axboe
Browse files

blk-throttle: Fix IO hang for a corner case 



It can not scale up in throtl_adjusted_limit() if we set bps or iops is
1, which will cause IO hang when enable low limit. Thus we should treat
1 as a illegal value to avoid this issue.

Signed-off-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b185efa7

block/blk-throttle.c

+4 −4
Original line number Diff line number Diff line
@@ -1687,13 +1687,13 @@ static ssize_t tg_set_limit(struct kernfs_open_file *of, 
			goto out_finish;



		ret = -EINVAL;

		if (!strcmp(tok, "rbps"))

		if (!strcmp(tok, "rbps") && val > 1)

			v[0] = val;

		else if (!strcmp(tok, "wbps"))

		else if (!strcmp(tok, "wbps") && val > 1)

			v[1] = val;

		else if (!strcmp(tok, "riops"))

		else if (!strcmp(tok, "riops") && val > 1)

			v[2] = min_t(u64, val, UINT_MAX);

		else if (!strcmp(tok, "wiops"))

		else if (!strcmp(tok, "wiops") && val > 1)

			v[3] = min_t(u64, val, UINT_MAX);

		else if (off == LIMIT_LOW && !strcmp(tok, "idle"))

			idle_time = val;