2023-08-04 07:42:50

by Chengming Zhou

Subject: [PATCH] blk-iocost: fix queue stats accounting

From: Chengming Zhou <[email protected]>

The q->stats->accounting is not only used by iocost, but iocost only
increase this counter, never decrease it. So queue stats accounting
will always enabled after using iocost once.

Signed-off-by: Chengming Zhou <[email protected]>
---
block/blk-iocost.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index dd64e2066f01..089fcb9cfce3 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -3301,11 +3301,12 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
if (qos[QOS_MIN] > qos[QOS_MAX])
goto einval;

- if (enable) {
+ if (enable && !ioc->enabled) {
blk_stat_enable_accounting(disk->queue);
blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);
ioc->enabled = true;
- } else {
+ } else if (!enable && ioc->enabled) {
+ blk_stat_disable_accounting(disk->queue);
blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);
ioc->enabled = false;
}
--
2.41.0

2023-08-07 19:42:45

by Tejun Heo

Subject: Re: [PATCH] blk-iocost: fix queue stats accounting

On Fri, Aug 04, 2023 at 03:06:09PM +0800, [email protected] wrote:
> From: Chengming Zhou <[email protected]>
>
> The q->stats->accounting is not only used by iocost, but iocost only
> increase this counter, never decrease it. So queue stats accounting
> will always enabled after using iocost once.
>
> Signed-off-by: Chengming Zhou <[email protected]>

Acked-by: Tejun Heo <[email protected]>

Thanks.

--
tejun

2023-08-08 22:52:58

by Jens Axboe

Subject: Re: [PATCH] blk-iocost: fix queue stats accounting

On Fri, 04 Aug 2023 15:06:09 +0800, [email protected] wrote:
> The q->stats->accounting is not only used by iocost, but iocost only
> increase this counter, never decrease it. So queue stats accounting
> will always enabled after using iocost once.
>
>

Applied, thanks!

[1/1] blk-iocost: fix queue stats accounting
commit: c992226e984b93b316005ae4b12f2dce1e11630c

Best regards,
--
Jens Axboe