diff mbox series

blk-iocost: fix queue stats accounting

Message ID 20230804070609.31623-1-chengming.zhou@linux.dev (mailing list archive)
State New, archived
Headers show
Series blk-iocost: fix queue stats accounting | expand

Commit Message

Chengming Zhou Aug. 4, 2023, 7:06 a.m. UTC 
From: Chengming Zhou <zhouchengming@bytedance.com>

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 <zhouchengming@bytedance.com>
---
 block/blk-iocost.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Tejun Heo Aug. 7, 2023, 6:35 p.m. UTC | #1 
On Fri, Aug 04, 2023 at 03:06:09PM +0800, chengming.zhou@linux.dev wrote:
> From: Chengming Zhou <zhouchengming@bytedance.com>
> 
> 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 <zhouchengming@bytedance.com>

Acked-by: Tejun Heo <tj@kernel.org>

Thanks.
Jens Axboe Aug. 8, 2023, 9:42 p.m. UTC | #2 
On Fri, 04 Aug 2023 15:06:09 +0800, chengming.zhou@linux.dev 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,
diff mbox series

Patch

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;
 	}