@@ -456,6 +456,7 @@ block_device_operations
prototypes::
int (*open) (struct block_device *, fmode_t);
+ int (*open_finish) (struct block_device *, fmode_t, int);
int (*release) (struct gendisk *, fmode_t);
int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
@@ -473,6 +474,7 @@ locking rules:
ops bd_mutex
======================= ===================
open: yes
+open_finish: no
release: yes
ioctl: no
compat_ioctl: no
@@ -1579,6 +1579,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
int partno;
int perm = 0;
bool first_open;
+ bool need_finish = false;
if (mode & FMODE_READ)
perm |= MAY_READ;
@@ -1635,13 +1636,16 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
put_disk_and_module(disk);
goto restart;
}
+ if ((ret != -ENXIO) &&
+ bdev->bd_disk->fops->open_finish)
+ need_finish = true;
}
if (!ret)
blkdev_init_size(bdev);
blkdev_do_partitions(bdev, ret);
- if (ret)
+ if (ret && !need_finish)
goto out_clear;
} else {
struct block_device *whole;
@@ -1667,14 +1671,18 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
if (bdev->bd_bdi == &noop_backing_dev_info)
bdev->bd_bdi = bdi_get(disk->queue->backing_dev_info);
} else {
+ ret = 0;
if (bdev->bd_contains == bdev) {
- ret = 0;
- if (bdev->bd_disk->fops->open)
+ if (bdev->bd_disk->fops->open) {
ret = bdev->bd_disk->fops->open(bdev, mode);
+ if ((ret != -ERESTARTSYS) && (ret != -ENXIO) &&
+ bdev->bd_disk->fops->open_finish)
+ need_finish = true;
+ }
blkdev_do_partitions(bdev, ret);
- if (ret)
+ if (ret && !need_finish)
goto out_unlock_bdev;
}
}
@@ -1686,6 +1694,17 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
/* only one opener holds refs to the module and disk */
if (!first_open)
put_disk_and_module(disk);
+ if (ret && need_finish) {
+ ret = bdev->bd_disk->fops->open_finish(bdev, mode, ret);
+
+ if (!ret && first_open)
+ blkdev_init_size(bdev);
+ blkdev_do_partitions(bdev, ret);
+ }
+ if (ret) {
+ __blkdev_put(bdev, mode, for_part);
+ return ret;
+ }
return 0;
out_clear:
@@ -1694,6 +1694,7 @@ static inline struct bio_vec *rq_integrity_vec(struct request *rq)
struct block_device_operations {
int (*open) (struct block_device *, fmode_t);
+ int (*open_finish)(struct block_device *bdev, fmode_t mode, int ret);
void (*release) (struct gendisk *, fmode_t);
int (*rw_page)(struct block_device *, sector_t, struct page *, unsigned int);
int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
Opening a block device may require a long operation such as waiting for the cdrom tray to close or disk to spin up. Performing this operation with locks held locks out other attempts to open the device from processes that donn't care about the medium state. To avoid this issue and still be able to perform time-consuming checks at open() the block device driver can provide open_finish(). If it does opening the device proceeds even when an error is returned from open(), bd_mutex is released and open_finish() is called. If open_finish() succeeds the device is now open, if it fails release() is called. When -ERESTARTSYS is returned from open() blkdev_get may loop without calling open_finish(). On -ERESTARTSYS open_finish() is not called. When -ENXIO is returned there is no device to retry opening so this error needs to be honored and open_finish() not called. Move a ret = 0 assignment up in the if/else branching to avoid returning -ENXIO. Previously the return value was ignored on the unhandled branch. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- v2: new patch v4: - fix crash on ENXIO - initialize capacity and partitions after open_finish --- Documentation/filesystems/locking.rst | 2 ++ fs/block_dev.c | 27 +++++++++++++++++++++++---- include/linux/blkdev.h | 1 + 3 files changed, 26 insertions(+), 4 deletions(-)