Four patches for the blk-mq debugfs code
cover Four patches for the blk-mq debugfs code
Hello Jens,
Please consider the four patches in this series for kernel v4.11.
Thanks,
Bart.
Bart Van Assche (4):
blk-mq-debugfs: Add missing __acquires() / __releases() annotations
blk-mq-debug: Avoid that sparse complains about req_flags_t usage
blk-mq-debug: Make show() operations interruptible
blk-mq-debug: Introduce debugfs_create_files()
block/blk-mq-debugfs.c | 75 +++++++++++++++++++++++++++++++++----------------- block/elevator.c | 2 +- 2 files changed, 50 insertions(+), 27 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/4 blk-mq-debugfs: Add missing __acquires() / __releases() annotations
This patch avoids that sparse complains about lock imbalances.
--- block/blk-mq-debugfs.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-mq-debugfs.c +4 -0
@@ -95,6 +95,7 @@ static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v) }static void *hctx_dispatch_start (struct seq_file *m,loff_t *pos) + __acquires(&hctx->lock) {struct blk_mq_hw_ctx *hctx = m->private;
@@ -110,6 +111,7 @@ static void *hctx_dispatch_next(struct seq_file *m, void *v, loff_t *pos) }static void hctx_dispatch_stop (struct seq_file *m,void *v) + __releases(&hctx->lock) {struct blk_mq_hw_ctx *hctx = m->private;
@@ -482,6 +484,7 @@ static const struct file_operations hctx_active_fops = { };static void *ctx_rq_list_start (struct seq_file *m,loff_t *pos) + __acquires(&ctx->lock) {struct blk_mq_ctx *ctx = m->private;
@@ -497,6 +500,7 @@ static void *ctx_rq_list_next(struct seq_file *m, void *v, loff_t *pos) }static void ctx_rq_list_stop (struct seq_file *m,void *v) + __releases(&ctx->lock) {struct blk_mq_ctx *ctx = m->private;
Signature · 1 line
2.11.0
Re: [PATCH 1/4] blk-mq-debugfs: Add missing __acquires() / __releases() annotations
Quoted 1 line · Bart Van Assche
This patch avoids that sparse complains about lock imbalances.
Quoted 5 lines
Signed-off-by Bart Van Assche <[email protected]>Cc Omar Sandoval <[email protected]>--- block/blk-mq-debugfs.c | 4 ++++ 1 file changed, 4 insertions(+)
PATCH 2/4 blk-mq-debug: Avoid that sparse complains about req_flags_t usage
In reply to Bart Van AsscheAvoid that sparse reports the following complaints:
block/elevator.c:541:29: warning: incorrect type in assignment (different base types)block/elevator.c:541:29: expected bool [unsigned] [usertype] next_sortedblock/elevator.c:541:29: got restricted req_flags_t
block/blk-mq-debugfs.c:92:54: warning: cast from restricted req_flags_t
--- block/blk-mq-debugfs.c | 3 ++- block/elevator.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
block/blk-mq-debugfs.c +2 -1
@@ -89,7 +89,8 @@ static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v)struct request *rq =list_entry_rq (v);seq_printf (m,"%p {.cmd_type=%u, .cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n" , - rq, rq->cmd_type, rq->cmd_flags, (unsigned int )rq->rq_flags, + rq, rq->cmd_type, rq->cmd_flags, + (__force unsigned int )rq->rq_flags, rq->tag, rq->internal_tag);return 0 ; }
block/elevator.c +1 -1
@@ -538,7 +538,7 @@ void elv_merge_requests(struct request_queue *q, struct request *rq,if (e->uses_mq && e->type->ops.mq.requests_merged) e->type->ops.mq.requests_merged (q, rq, next);else if (e->type->ops.sq.elevator_merge_req_fn) { - next_sorted = next->rq_flags &RQF_SORTED ; + next_sorted = (__force bool )(next->rq_flags &RQF_SORTED );if (next_sorted) e->type->ops.sq.elevator_merge_req_fn (q, rq, next); }
Signature · 1 line
2.11.0
Re: [PATCH 2/4] blk-mq-debug: Avoid that sparse complains about req_flags_t usage
Quoted 7 lines · Bart Van Assche
Avoid that sparse reports the following complaints:
block/elevator.c:541:29: warning: incorrect type in assignment (different base types)block/elevator.c:541:29: expected bool [unsigned] [usertype]next_sortedblock/elevator.c:541:29: got restrictedreq_flags_t
block/blk-mq-debugfs.c:92:54: warning: cast from restrictedreq_flags_t
Quoted 6 lines
Signed-off-by Bart Van Assche <[email protected]>Cc Omar Sandoval <[email protected]>--- block/blk-mq-debugfs.c | 3 ++- block/elevator.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
PATCH 3/4 blk-mq-debug: Make show() operations interruptible
In reply to Bart Van AsscheAllow users to interrupt show operations instead of making a user space process unkillable if ownership of q->sysfs_lock cannot be obtained.
--- block/blk-mq-debugfs.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-)
block/blk-mq-debugfs.c +26 -8
@@ -179,13 +179,17 @@ static int hctx_tags_show(struct seq_file *m, void *v) {struct blk_mq_hw_ctx *hctx = m->private;struct request_queue *q = hctx->queue; +int res; -mutex_lock (&q->sysfs_lock); + res =mutex_lock_interruptible (&q->sysfs_lock); +if (res) + goto out;if (hctx->tags)blk_mq_debugfs_tags_show (m, hctx->tags);mutex_unlock (&q->sysfs_lock); -return 0 ; +out: +return res; }static int hctx_tags_open (struct inode *inode,struct file *file)
@@ -204,12 +208,17 @@ static int hctx_tags_bitmap_show(struct seq_file *m, void *v) {struct blk_mq_hw_ctx *hctx = m->private;struct request_queue *q = hctx->queue; +int res; -mutex_lock (&q->sysfs_lock); + res =mutex_lock_interruptible (&q->sysfs_lock); +if (res) + goto out;if (hctx->tags)sbitmap_bitmap_show (&hctx->tags->bitmap_tags.sb, m);mutex_unlock (&q->sysfs_lock); -return 0 ; + +out: +return res; }static int hctx_tags_bitmap_open (struct inode *inode,struct file *file)
@@ -228,13 +237,17 @@ static int hctx_sched_tags_show(struct seq_file *m, void *v) {struct blk_mq_hw_ctx *hctx = m->private;struct request_queue *q = hctx->queue; +int res; -mutex_lock (&q->sysfs_lock); + res =mutex_lock_interruptible (&q->sysfs_lock); +if (res) + goto out;if (hctx->sched_tags)blk_mq_debugfs_tags_show (m, hctx->sched_tags);mutex_unlock (&q->sysfs_lock); -return 0 ; +out: +return res; }static int hctx_sched_tags_open (struct inode *inode,struct file *file)
@@ -253,12 +266,17 @@ static int hctx_sched_tags_bitmap_show(struct seq_file *m, void *v) {struct blk_mq_hw_ctx *hctx = m->private;struct request_queue *q = hctx->queue; +int res; -mutex_lock (&q->sysfs_lock); + res =mutex_lock_interruptible (&q->sysfs_lock); +if (res) + goto out;if (hctx->sched_tags)sbitmap_bitmap_show (&hctx->sched_tags->bitmap_tags.sb, m);mutex_unlock (&q->sysfs_lock); -return 0 ; + +out: +return res; }static int hctx_sched_tags_bitmap_open (struct inode *inode,struct file *file)
Signature · 1 line
2.11.0
Re: [PATCH 3/4] blk-mq-debug: Make show() operations interruptible
Quoted 3 lines · Bart Van Assche
Allow users to interrupt show operations instead of making a user space process unkillable if ownership of
q->sysfs_lockcannot be obtained.
Quoted 5 lines
Signed-off-by Bart Van Assche <[email protected]>Cc Omar Sandoval <[email protected]>--- block/blk-mq-debugfs.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-)
PATCH 4/4 blk-mq-debug: Introduce debugfs_create_files()
In reply to Bart Van AsscheReplace the two debugfs_create_file() loops by a call to the new debugfs_create_files() function. Add an empty element at the end of the two attribute arrays such that the array size does not have to be passed to debugfs_create_files().
--- block/blk-mq-debugfs.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
block/blk-mq-debugfs.c +17 -17
@@ -653,6 +653,7 @@ static const struct blk_mq_debugfs_attr blk_mq_debugfs_hctx_attrs[] = { {"queued", 0600, &hctx_queued_fops}, {"run", 0600, &hctx_run_fops}, {"active", 0400, &hctx_active_fops}, + {}, }; static const struct blk_mq_debugfs_attr blk_mq_debugfs_ctx_attrs[] = {
@@ -660,6 +661,7 @@ static const struct blk_mq_debugfs_attr blk_mq_debugfs_ctx_attrs[] = { {"dispatched", 0600, &ctx_dispatched_fops}, {"merged", 0600, &ctx_merged_fops}, {"completed", 0600, &ctx_completed_fops}, + {}, };int blk_mq_debugfs_register (struct request_queue *q,const char *name)
@@ -688,27 +690,31 @@ void blk_mq_debugfs_unregister(struct request_queue *q) q->debugfs_dir =NULL ; } +static bool debugfs_create_files (struct dentry *parent,void *data, +const struct blk_mq_debugfs_attr *attr) +{ +for (; attr->name; attr++) { +if (!debugfs_create_file (attr->name, attr->mode, parent, + data, attr->fops)) +return false; + } +return true; +} +static int blk_mq_debugfs_register_ctx (struct request_queue *q,struct blk_mq_ctx *ctx,struct dentry *hctx_dir) {struct dentry *ctx_dir;char name[20 ]; -int i;snprintf (name,sizeof (name),"cpu%u" , ctx->cpu); ctx_dir =debugfs_create_dir (name, hctx_dir);if (!ctx_dir)return -ENOMEM ; -for (i =0 ; i <ARRAY_SIZE (blk_mq_debugfs_ctx_attrs); i++) { -const struct blk_mq_debugfs_attr *attr; - - attr = &blk_mq_debugfs_ctx_attrs[i]; -if (!debugfs_create_file (attr->name, attr->mode, ctx_dir, ctx, - attr->fops)) -return -ENOMEM ; - } +if (!debugfs_create_files (ctx_dir, ctx, blk_mq_debugfs_ctx_attrs)) +return -ENOMEM ;return 0 ; }
@@ -726,14 +732,8 @@ static int blk_mq_debugfs_register_hctx(struct request_queue *q,if (!hctx_dir)return -ENOMEM ; -for (i =0 ; i <ARRAY_SIZE (blk_mq_debugfs_hctx_attrs); i++) { -const struct blk_mq_debugfs_attr *attr; - - attr = &blk_mq_debugfs_hctx_attrs[i]; -if (!debugfs_create_file (attr->name, attr->mode, hctx_dir, hctx, - attr->fops)) -return -ENOMEM ; - } +if (!debugfs_create_files (hctx_dir, hctx, blk_mq_debugfs_hctx_attrs)) +return -ENOMEM ;hctx_for_each_ctx (hctx, ctx, i) {if (blk_mq_debugfs_register_ctx (q, ctx, hctx_dir))
Signature · 1 line
2.11.0
Re: [PATCH 4/4] blk-mq-debug: Introduce debugfs_create_files()
Quoted 4 lines · Bart Van Assche
Replace the two
debugfs_create_file()loops by a call to the newdebugfs_create_files()function. Add an empty element at the end of the two attribute arrays such that the array size does not have to be passed todebugfs_create_files().
Quoted 5 lines
Signed-off-by Bart Van Assche <[email protected]>Cc Omar Sandoval <[email protected]>--- block/blk-mq-debugfs.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
Jens Axboe
maintainerQuoted 3 lines · Bart Van Assche
Hello Jens,
Please consider the four patches in this series for kernel v4.11.
Added, thanks Bart.
Signature · 1 line
Jens Axboe