Re: [PATCH] Revert "blk-throttle: Fix IO hang for a corner case"

[Yu Kuai]

在 2024/10/11 9:47, Xiuhong Wang 写道:
> This reverts commit 5b7048b89745c3c5fb4b3080fb7bced61dba2a2b.
>
> The throtl_adjusted_limit function was removed after
> commit bf20ab538c81 ("blk-throttle: remove
> CONFIG_BLK_DEV_THROTTLING_LOW"), so the problem of not being
> able to scale after setting bps or iops to 1 will not occur.
> So revert this commit that bps/iops can be set to 1.
>
> Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
> Cc: Yu Kuai <yukuai3@xxxxxxxxxx>
> Signed-off-by: Xiuhong Wang <xiuhong.wang@xxxxxxxxxx>
> Signed-off-by: Zhiguo Niu <zhiguo.niu@xxxxxxxxxx>
> ---
>   block/blk-throttle.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
LGRM
Reviewed-by: Yu Kuai <yukuai3@xxxxxxxxxx>

> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 2c4192e12efa..443d1f47c2ce 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -1485,13 +1485,13 @@ static ssize_t tg_set_limit(struct kernfs_open_file *of,
>   			goto out_finish;
>   
>   		ret = -EINVAL;
> -		if (!strcmp(tok, "rbps") && val > 1)
> +		if (!strcmp(tok, "rbps"))
>   			v[0] = val;
> -		else if (!strcmp(tok, "wbps") && val > 1)
> +		else if (!strcmp(tok, "wbps"))
>   			v[1] = val;
> -		else if (!strcmp(tok, "riops") && val > 1)
> +		else if (!strcmp(tok, "riops"))
>   			v[2] = min_t(u64, val, UINT_MAX);
> -		else if (!strcmp(tok, "wiops") && val > 1)
> +		else if (!strcmp(tok, "wiops"))
>   			v[3] = min_t(u64, val, UINT_MAX);
>   		else
>   			goto out_finish;