]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
blk-cgroup: wait for blkcg cleanup before initializing new disk
authorMing Lei <ming.lei@redhat.com>
Wed, 11 Mar 2026 03:28:37 +0000 (11:28 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 11 Mar 2026 14:30:30 +0000 (08:30 -0600)
commit3dbaacf6ab68f81e3375fe769a2ecdbd3ce386fd
treef5b83097242860abc02d0c5b6dcbdd84b6a7cc36
parentdaa6c79858e9ca75c548452bf71db8a9e61bde42
blk-cgroup: wait for blkcg cleanup before initializing new disk

When a queue is shared across disk rebind (e.g., SCSI unbind/bind), the
previous disk's blkcg state is cleaned up asynchronously via
disk_release() -> blkcg_exit_disk(). If the new disk's blkcg_init_disk()
runs before that cleanup finishes, we may overwrite q->root_blkg while
the old one is still alive, and radix_tree_insert() in blkg_create()
fails with -EEXIST because the old blkg entries still occupy the same
queue id slot in blkcg->blkg_tree. This causes the sd probe to fail
with -ENOMEM.

Fix it by waiting in blkcg_init_disk() for root_blkg to become NULL,
which indicates the previous disk's blkcg cleanup has completed.

Fixes: 1059699f87eb ("block: move blkcg initialization/destroy into disk allocation/release handler")
Cc: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260311032837.2368714-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c