blk-mq: Remove the hctx 'run' debugfs attribute

Commit Message

Bart Van Assche Jan. 17, 2024, 8:36 p.m. UTC

Nobody uses the debugfs hctx 'run' attribute. Hence remove this
attribute and also the code that updates the corresponding member
variable.

Suggested-by: Jens Axboe <[e-mail]>
Cc: Gabriel Ryan <[e-mail]>
Signed-off-by: Bart Van Assche <[e-mail]>
---
 block/blk-mq-debugfs.c | 18 ------------------
 block/blk-mq-sched.c   |  2 --
 include/linux/blk-mq.h |  3 ---
 3 files changed, 23 deletions(-)

Comments

Jens Axboe Jan. 17, 2024, 9:17 p.m. UTC | #1

On Wed, 17 Jan 2024 12:36:09 -0800, Bart Van Assche wrote:
> Nobody uses the debugfs hctx 'run' attribute. Hence remove this
> attribute and also the code that updates the corresponding member
> variable.
> 
> 

Applied, thanks!

[1/1] blk-mq: Remove the hctx 'run' debugfs attribute
      commit: 49e60333d743ae32db3bdde2f93bc818482dd741

Best regards,

Hannes Reinecke Jan. 18, 2024, 6:13 a.m. UTC | #2

On 1/17/24 21:36, Bart Van Assche wrote:
> Nobody uses the debugfs hctx 'run' attribute. Hence remove this
> attribute and also the code that updates the corresponding member
> variable.
> 
> Suggested-by: Jens Axboe <[e-mail]>
> Cc: Gabriel Ryan <[e-mail]>
> Signed-off-by: Bart Van Assche <[e-mail]>
> ---
>   block/blk-mq-debugfs.c | 18 ------------------
>   block/blk-mq-sched.c   |  2 --
>   include/linux/blk-mq.h |  3 ---
>   3 files changed, 23 deletions(-)
> 
Reviewed-by: Hannes Reinecke <[e-mail]>

Cheers,

Hannes

Patch

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 5cbeb9344f2f..94668e72ab09 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -479,23 +479,6 @@  static int hctx_sched_tags_bitmap_show(void *data, struct seq_file *m)
 	return res;
 }
 
-static int hctx_run_show(void *data, struct seq_file *m)
-{
-	struct blk_mq_hw_ctx *hctx = data;
-
-	seq_printf(m, "%lu\n", hctx->run);
-	return 0;
-}
-
-static ssize_t hctx_run_write(void *data, const char __user *buf, size_t count,
-			      loff_t *ppos)
-{
-	struct blk_mq_hw_ctx *hctx = data;
-
-	hctx->run = 0;
-	return count;
-}
-
 static int hctx_active_show(void *data, struct seq_file *m)
 {
 	struct blk_mq_hw_ctx *hctx = data;
@@ -624,7 +607,6 @@  static const struct blk_mq_debugfs_attr blk_mq_debugfs_hctx_attrs[] = {
 	{"tags_bitmap", 0400, hctx_tags_bitmap_show},
 	{"sched_tags", 0400, hctx_sched_tags_show},
 	{"sched_tags_bitmap", 0400, hctx_sched_tags_bitmap_show},
-	{"run", 0600, hctx_run_show, hctx_run_write},
 	{"active", 0400, hctx_active_show},
 	{"dispatch_busy", 0400, hctx_dispatch_busy_show},
 	{"type", 0400, hctx_type_show},
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 67c95f31b15b..451a2c1f1f32 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -324,8 +324,6 @@  void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
 	if (unlikely(blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q)))
 		return;
 
-	hctx->run++;
-
 	/*
 	 * A return of -EAGAIN is an indication that hctx->dispatch is not
 	 * empty and we must run again in order to avoid starving flushes.
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index a676e116085f..7a8150a5f051 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -391,9 +391,6 @@  struct blk_mq_hw_ctx {
 	 */
 	struct blk_mq_tags	*sched_tags;
 
-	/** @run: Number of dispatched requests. */
-	unsigned long		run;
-
 	/** @numa_node: NUMA node the storage adapter has been connected to. */
 	unsigned int		numa_node;
 	/** @queue_num: Index of this hardware queue. */