block: cleanup q->srcu

Ming Lei · axboe · commit 850fd2abbe02 · 2022-01-17T07:24:45.000-07:00
srcu structure has to be cleanup via cleanup_srcu_struct(), so fix it. Reported-by: syzbot+4f789823c1abc5accf13@syzkaller.appspotmail.com Fixes: 704b914 ("blk-mq: move srcu from blk_mq_hw_ctx to request_queue") Signed-off-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20220111123401.520192-1-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,9 @@ static void blk_release_queue(struct kobject *kobj)`
`811`	`811`
`812`	`812`	`bioset_exit(&q->bio_split);`
`813`	`813`
	`814`	`+ if (blk_queue_has_srcu(q))`
	`815`	`+ cleanup_srcu_struct(q->srcu);`
	`816`	`+`
`814`	`817`	`ida_simple_remove(&blk_queue_ida, q->id);`
`815`	`818`	`call_rcu(&q->rcu_head, blk_free_queue_rcu);`
`816`	`819`	`}`