[PATCH] block: cleanup q->srcu

[PATCH] block: cleanup q->srcu

[Ming Lei]

srcu structure has to be cleanup via cleanup_srcu_struct(), so fix it.

Reported-by: syzbot+4f789823c1abc5accf13@syzkaller.appspotmail.com
Fixes: 704b914f15fb ("blk-mq: move srcu from blk_mq_hw_ctx to request_queue")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/blk-sysfs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index e20eadfcf5c8..8d8549f71311 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -811,6 +811,9 @@ static void blk_release_queue(struct kobject *kobj)
 
 	bioset_exit(&q->bio_split);
 
+	if (blk_queue_has_srcu(q))
+		cleanup_srcu_struct(q->srcu);
+
 	ida_simple_remove(&blk_queue_ida, q->id);
 	call_rcu(&q->rcu_head, blk_free_queue_rcu);
 }
-- 
2.31.1

Re: [PATCH] block: cleanup q->srcu

[Ming Lei]

On Tue, Jan 11, 2022 at 08:34:01PM +0800, Ming Lei wrote:
> srcu structure has to be cleanup via cleanup_srcu_struct(), so fix it.
> 
> Reported-by: syzbot+4f789823c1abc5accf13@syzkaller.appspotmail.com
> Fixes: 704b914f15fb ("blk-mq: move srcu from blk_mq_hw_ctx to request_queue")
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
>  block/blk-sysfs.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index e20eadfcf5c8..8d8549f71311 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -811,6 +811,9 @@ static void blk_release_queue(struct kobject *kobj)
>  
>  	bioset_exit(&q->bio_split);
>  
> +	if (blk_queue_has_srcu(q))
> +		cleanup_srcu_struct(q->srcu);
> +
>  	ida_simple_remove(&blk_queue_ida, q->id);
>  	call_rcu(&q->rcu_head, blk_free_queue_rcu);

Hello Jens,

Can we make it into mainline to fix the recent syzbot report?


Thanks,
Ming

Re: [PATCH] block: cleanup q->srcu

[Christoph Hellwig]

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] block: cleanup q->srcu

[Jens Axboe]

On Tue, 11 Jan 2022 20:34:01 +0800, Ming Lei wrote:
> srcu structure has to be cleanup via cleanup_srcu_struct(), so fix it.
> 
> 

Applied, thanks!

[1/1] block: cleanup q->srcu
      commit: 850fd2abbe02eb2b52cbb1550adbcc89b36d65de

Best regards,
-- 
Jens Axboe