diff mbox series

block,bfq: fix the timeout calculation in bfq_bfqq_charge_time

Message ID 20210324023341.1545234-1-wu-yan@tcl.com (mailing list archive)
State New, archived
Headers show
Series block,bfq: fix the timeout calculation in bfq_bfqq_charge_time | expand

Commit Message

Rokudo Yan March 24, 2021, 2:33 a.m. UTC
in bfq_bfqq_charge_time, timeout_ms is calculated with global
constant bfq_timeout(HZ/8), which is not correct. It should be
bfqd->bfq_timeout here as per-device bfq_timeout can be modified
through /sys/block/<disk/queue/iosched/timeout_sync.

Signed-off-by: Rokudo Yan <wu-yan@tcl.com>
---
 block/bfq-wf2q.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paolo Valente April 2, 2021, 10:18 a.m. UTC | #1
> Il giorno 24 mar 2021, alle ore 03:33, Rokudo Yan <wu-yan@tcl.com> ha scritto:
> 
> in bfq_bfqq_charge_time, timeout_ms is calculated with global
> constant bfq_timeout(HZ/8), which is not correct. It should be
> bfqd->bfq_timeout here as per-device bfq_timeout can be modified
> through /sys/block/<disk/queue/iosched/timeout_sync.
> 

Hi,
thanks for spotting this.

Reviewed-by: Paolo Valente <paolo.valente@linaro.org>

> Signed-off-by: Rokudo Yan <wu-yan@tcl.com>
> ---
> block/bfq-wf2q.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
> index 070e34a7feb1..48f540a5ee6a 100644
> --- a/block/bfq-wf2q.c
> +++ b/block/bfq-wf2q.c
> @@ -872,7 +872,7 @@ void bfq_bfqq_charge_time(struct bfq_data *bfqd, struct bfq_queue *bfqq,
> 			  unsigned long time_ms)
> {
> 	struct bfq_entity *entity = &bfqq->entity;
> -	unsigned long timeout_ms = jiffies_to_msecs(bfq_timeout);
> +	unsigned long timeout_ms = jiffies_to_msecs(bfqd->bfq_timeout);
> 	unsigned long bounded_time_ms = min(time_ms, timeout_ms);
> 	int serv_to_charge_for_time =
> 		(bfqd->bfq_max_budget * bounded_time_ms) / timeout_ms;
> -- 
> 2.25.1
>
diff mbox series

Patch

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 070e34a7feb1..48f540a5ee6a 100644
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -872,7 +872,7 @@  void bfq_bfqq_charge_time(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 			  unsigned long time_ms)
 {
 	struct bfq_entity *entity = &bfqq->entity;
-	unsigned long timeout_ms = jiffies_to_msecs(bfq_timeout);
+	unsigned long timeout_ms = jiffies_to_msecs(bfqd->bfq_timeout);
 	unsigned long bounded_time_ms = min(time_ms, timeout_ms);
 	int serv_to_charge_for_time =
 		(bfqd->bfq_max_budget * bounded_time_ms) / timeout_ms;