Skip to content

Commit a41a11b

Browse files
gerald-schaeferAlexander Gordeev
authored andcommitted
s390/dcssblk: fix deadlock when adding a DCSS
After the rework from commit 1ebe2e5 ("block: remove GENHD_FL_EXT_DEVT"), when calling device_add_disk(), dcssblk will end up in disk_scan_partitions(), and not break out early w/o GENHD_FL_NO_PART. This will trigger implicit open/release via blkdev_get/put_whole() later. dcssblk_release() will then deadlock on dcssblk_devices_sem semaphore, which is already held from dcssblk_add_store() when calling device_add_disk(). dcssblk does not support partitions (DCSSBLK_MINORS_PER_DISK == 1), and never scanned partitions before. Therefore restore the previous behavior, and explicitly disallow partition scanning by setting the GENHD_FL_NO_PART flag. This will also prevent this deadlock scenario. Fixes: 1ebe2e5 ("block: remove GENHD_FL_EXT_DEVT") Cc: <[email protected]> # 5.17+ Signed-off-by: Gerald Schaefer <[email protected]> Acked-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent 30d17fa commit a41a11b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/s390/block/dcssblk.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
636636
dev_info->gd->minors = DCSSBLK_MINORS_PER_DISK;
637637
dev_info->gd->fops = &dcssblk_devops;
638638
dev_info->gd->private_data = dev_info;
639+
dev_info->gd->flags |= GENHD_FL_NO_PART;
639640
blk_queue_logical_block_size(dev_info->gd->queue, 4096);
640641
blk_queue_flag_set(QUEUE_FLAG_DAX, dev_info->gd->queue);
641642

0 commit comments

Comments
 (0)