loop: Don't change loop device under exclusive opener
Subsystems (2)
Jan Kara
reviewerPATCH 1/1 loop: Don't change loop device under exclusive opener
Loop module allows calling LOOP_SET_FD while there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev() lo_ioctl()
udf_fill_super()
udf_load_vrs()
sb_set_blocksize() - sets desired block size B
udf_tread()
sb_bread()
__bread_gfp(bdev, block, B)
loop_set_fd()
set_blocksize()
- now __getblk_slow() indefinitely loops because B != bdev
block sizeFix the problem by disallowing LOOP_SET_FD ioctl when there are exclusive openers of a loop device.
[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
Alternatively we could change getblk() code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.
Honza
drivers/block/loop.c +17 -1
@@ -945,9 +945,20 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,if (!file) goto out; +/* +* If we don't hold exclusive handle for the device, upgrade to it +* here to avoid changing device under exclusive owner. +*/ +if (!(mode &FMODE_EXCL )) { +bdgrab (bdev); + error =blkdev_get (bdev, mode |FMODE_EXCL , loop_set_fd); +if (error) + goto out_putf; + } + error =mutex_lock_killable (&loop_ctl_mutex);if (error) - goto out_putf; + goto out_bdev; error = -EBUSY ;if (lo->lo_state != Lo_unbound)
@@ -1012,10 +1023,15 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,mutex_unlock (&loop_ctl_mutex);if (partscan)loop_reread_partitions (lo, bdev); +if (!(mode &FMODE_EXCL )) +blkdev_put (bdev, mode |FMODE_EXCL );return 0 ; out_unlock:mutex_unlock (&loop_ctl_mutex); +out_bdev: +if (!(mode &FMODE_EXCL )) +blkdev_put (bdev, mode |FMODE_EXCL ); out_putf:fput (file); out:
Signature · 1 line
2.16.4
Jens Axboe
maintainerQuoted 29 lines · Jan Kara
Loop module allows calling
LOOP_SET_FDwhile there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev()lo_ioctl()
udf_fill_super()udf_load_vrs() sb_set_blocksize() - sets desired block size B udf_tread() sb_bread() __bread_gfp(bdev, block, B) loop_set_fd() set_blocksize() - now __getblk_slow() indefinitely loops because B != bdev block sizeFix the problem by disallowing
LOOP_SET_FDioctl when there are exclusive openers of a loop device.[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
Reported-and-tested-by [email protected]Signed-off-by Jan Kara <[email protected]>--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
Quoted 6 lines
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
I also have a hard time thinking about valid cases where this would be a problem. I think, in the end, that fixing the issue is more important than a potentially hypothetical use case.
Quoted 4 lines
Alternatively we could change
getblk()code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.
I think your solution here is saner.
Signature · 1 line
Jens Axboe
Jan Kara
reviewerQuoted 41 lines · Jens Axboe
Quoted 29 lines · Jan Kara
Loop module allows calling
LOOP_SET_FDwhile there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev()lo_ioctl()
udf_fill_super()udf_load_vrs() sb_set_blocksize() - sets desired block size B udf_tread() sb_bread() __bread_gfp(bdev, block, B) loop_set_fd() set_blocksize() - now __getblk_slow() indefinitely loops because B != bdev block sizeFix the problem by disallowing
LOOP_SET_FDioctl when there are exclusive openers of a loop device.[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
Reported-and-tested-by [email protected]Signed-off-by Jan Kara <[email protected]>--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)Quoted 6 lines
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
I also have a hard time thinking about valid cases where this would be a problem. I think, in the end, that fixing the issue is more important than a potentially hypothetical use case.
Quoted 6 lines
Quoted 4 lines
Alternatively we could change
getblk()code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.I think your solution here is saner.
Will you pick up the patch please? I cannot find it in your tree... Thanks!
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jens Axboe
maintainerQuoted 42 lines · Jan Kara
Quoted 41 lines · Jens Axboe
Quoted 29 lines · Jan Kara
Loop module allows calling
LOOP_SET_FDwhile there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev()lo_ioctl()
udf_fill_super()udf_load_vrs() sb_set_blocksize() - sets desired block size B udf_tread() sb_bread() __bread_gfp(bdev, block, B) loop_set_fd() set_blocksize() - now __getblk_slow() indefinitely loops because B != bdev block sizeFix the problem by disallowing
LOOP_SET_FDioctl when there are exclusive openers of a loop device.[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
Reported-and-tested-by [email protected]Signed-off-by Jan Kara <[email protected]>--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)Quoted 6 lines
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
I also have a hard time thinking about valid cases where this would be a problem. I think, in the end, that fixing the issue is more important than a potentially hypothetical use case.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Alternatively we could change
getblk()code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.I think your solution here is saner.
Will you pick up the patch please? I cannot find it in your tree... Thanks!
Done!
Signature · 1 line
Jens Axboe
Hi Jan,
Quoted 48 lines · Jens Axboe
Quoted 47 lines · Jan Kara
Quoted 46 lines · Jens Axboe
Quoted 29 lines · Jan Kara
Loop module allows calling
LOOP_SET_FDwhile there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev()lo_ioctl()
udf_fill_super()udf_load_vrs() sb_set_blocksize() - sets desired block size B udf_tread() sb_bread() __bread_gfp(bdev, block, B) loop_set_fd() set_blocksize() - now __getblk_slow() indefinitely loops because B != bdev block sizeFix the problem by disallowing
LOOP_SET_FDioctl when there are exclusive openers of a loop device.[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
Reported-and-tested-by [email protected]Signed-off-by Jan Kara <[email protected]>--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)Quoted 6 lines
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
I also have a hard time thinking about valid cases where this would be a problem. I think, in the end, that fixing the issue is more important than a potentially hypothetical use case.
Quoted 4 lines
Alternatively we could change
getblk()code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
I think your solution here is saner.
Will you pick up the patch please? I cannot find it in your tree... Thanks!
Done!
This patch introduced a regression [1].
A reproducer can be found at [2].
[1] https://bugs.launchpad.net/bugs/1836914
[2] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1836914/comments/4
Kai-Heng
Quoted 3 lines
Signature · 2 lines
-- Jens Axboe
Jan Kara
reviewerQuoted 58 lines · Kai-Heng Feng
Hi Jan,
Quoted 54 lines · Jens Axboe
Quoted 52 lines · Jan Kara
Quoted 42 lines · Jens Axboe
Quoted 30 lines · Jan Kara
Loop module allows calling
LOOP_SET_FDwhile there are other openers of the loop device. Even exclusive ones. This can lead to weird consequences such as kernel deadlocks like:
mount_bdev()lo_ioctl()
udf_fill_super()udf_load_vrs() sb_set_blocksize() - sets desired block size B udf_tread() sb_bread() __bread_gfp(bdev, block, B) loop_set_fd() set_blocksize() - now __getblk_slow() indefinitely loops because B != bdev block sizeFix the problem by disallowing
LOOP_SET_FDioctl when there are exclusive openers of a loop device.[Deliberately chosen not to CC stable as a user with priviledges to trigger this race has other means of taking the system down and this has a potential of breaking some weird userspace setup]
Reported-and-tested-by:
[email protected]Signed-off-by Jan Kara <[email protected]>--- drivers/block/loop.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)Quoted 6 lines
Hi Jens!
What do you think about this patch? It fixes the problem but it also changes user visible behavior so there are chances it breaks some existing setup (although I have hard time coming up with a realistic scenario where it would matter).
I also have a hard time thinking about valid cases where this would be a problem. I think, in the end, that fixing the issue is more important than a potentially hypothetical use case.
Quoted 6 lines
Quoted 4 lines
Alternatively we could change
getblk()code handle changing block size. That would fix the particular issue syzkaller found as well but I'm not sure what else is broken when block device changes while fs driver is working with it.I think your solution here is saner.
Will you pick up the patch please? I cannot find it in your tree... Thanks!
Quoted 7 lines
Quoted 1 line
Done!
This patch introduced a regression [1].
A reproducer can be found at [2].[1] https://bugs.launchpad.net/bugs/1836914
[2] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1836914/comments/4
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash /mnt/$i &
done
So all mount(8) commands will run in parallel and race to setup loop devices with LOOP_SET_FD and mount them. However util-linux (at least in the current version) seems to handle EBUSY from LOOP_SET_FD just fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
done
Quoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Jan Kara
reviewerQuoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.
Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num = ioctl(LOOP_CTL_GET_FREE)
num = ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OK
ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- acquires exclusine loop$num
referencemount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
It is a bug in the scheme I've chosen that racing LOOP_SET_FD can block perfectly valid mount. I'll think how to fix this...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerQuoted 38 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
Quoted 7 lines
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and failsIt is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...
So how about attached patch? It fixes the regression for me.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
From 5069263402e9daef5df1ee02576107e11bd138a6 Mon Sep 17 00:00:00 2001
From: Jan Kara <[email protected]>
Date: Tue, 30 Jul 2019 13:10:14 +0200
Subject: [PATCH] loop: Fix mount(2) failure due to race with LOOP_SET_FD
Commit 33ec3e53e7b1 ("loop: Don't change loop device under exclusive opener") made LOOP_SET_FD ioctl acquire exclusive block device reference while it updates loop device binding. However this can make perfectly valid mount(2) fail with EBUSY due to racing LOOP_SET_FD holding temporarily the exclusive bdev reference in cases like this:
for i in {a..z}{a..z}; do
dd if=/dev/zero of=$i.image bs=1k count=0 seek=1024
mkfs.ext2 $i.image
mkdir mnt$idone
echo "Run"
for i in {a..z}{a..z}; do
mount -o loop -t ext2 $i.image mnt$i &
done
Fix the problem by not getting full exclusive bdev reference in LOOP_SET_FD but instead just mark the bdev as being claimed while we update the binding information. This just blocks new exclusive openers instead of failing them with EBUSY thus fixing the problem.
--- drivers/block/loop.c | 16 +++++----- fs/block_dev.c | 83 ++++++++++++++++++++++++++++++++++++---------------- include/linux/fs.h | 6 ++++ 3 files changed, 73 insertions(+), 32 deletions(-)
drivers/block/loop.c +9 -7
@@ -924,6 +924,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,struct file *file;struct inode *inode;struct address_space *mapping; +struct block_device *claimed_bdev =NULL ;int lo_flags =0 ;int error;loff_t size;
@@ -942,10 +943,11 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,* here to avoid changing device under exclusive owner. */ if (!(mode &FMODE_EXCL )) { -bdgrab (bdev); - error =blkdev_get (bdev, mode |FMODE_EXCL , loop_set_fd); -if (error) + claimed_bdev =bd_start_claiming (bdev, loop_set_fd); +if (IS_ERR (claimed_bdev)) { + error =PTR_ERR (claimed_bdev); goto out_putf; + } } error =mutex_lock_killable (&loop_ctl_mutex);
@@ -1015,15 +1017,15 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,mutex_unlock (&loop_ctl_mutex);if (partscan)loop_reread_partitions (lo, bdev); -if (!(mode &FMODE_EXCL )) -blkdev_put (bdev, mode |FMODE_EXCL ); +if (claimed_bdev) +bd_abort_claiming (bdev, claimed_bdev, loop_set_fd);return 0 ; out_unlock:mutex_unlock (&loop_ctl_mutex); out_bdev: -if (!(mode &FMODE_EXCL )) -blkdev_put (bdev, mode |FMODE_EXCL ); +if (claimed_bdev) +bd_abort_claiming (bdev, claimed_bdev, loop_set_fd); out_putf:fput (file); out:
fs/block_dev.c +58 -25
101 lines not on this page · raw message
include/linux/fs.h +6 -0
@@ -2598,6 +2598,12 @@ extern struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, void *holder);extern struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder); +extern struct block_device *bd_start_claiming (struct block_device *bdev, +void *holder); +extern void bd_finish_claiming (struct block_device *bdev, +struct block_device *whole,void *holder); +extern void bd_abort_claiming (struct block_device *bdev, +struct block_device *whole,void *holder);extern void blkdev_put (struct block_device *bdev,fmode_t mode);extern int __blkdev_reread_part (struct block_device *bdev);extern int blkdev_reread_part (struct block_device *bdev);
Signature · 1 line
2.16.4
Kai-Heng Feng
Tested-byQuoted 43 lines · Jan Kara
Quoted 42 lines · Jan Kara
Quoted 16 lines · John Lenton
Quoted 8 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Quoted 6 lines
Honza
Signature · 3 lines
Jan Kara <[email protected]> SUSE Labs, CR <0001-loop-Fix-mount-2-failure-due-to-race-with-LOOP_SET_F.patch>
Jens Axboe
maintainerQuoted 44 lines · Jan Kara
Quoted 43 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Jan, I've applied this patch - and also marked it for stable, so it'll end up in 5.2-stable. Thanks.
Signature · 1 line
Jens Axboe
Quoted 3 lines · Jens Axboe
Jan, I've applied this patch - and also marked it for stable, so it'll end up in 5.2-stable. Thanks.
thank you all!
Jan Kara
reviewerQuoted 45 lines · Jens Axboe
Quoted 44 lines · Jan Kara
Quoted 43 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Jan, I've applied this patch - and also marked it for stable, so it'll end up in 5.2-stable. Thanks.
Thanks Jens!
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 44 lines · Jan Kara
Quoted 43 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Hi Jan,
A new kernel warning is triggered by blktests block/001 that did not happen without this patch. Reverting commit 89e524c04fa9 ("loop: Fix mount(2) failure due to race with LOOP_SET_FD") makes that kernel warning disappear. Is this reproducible on your setup?
Thanks,
Bart.
kernel: sr 10:0:0:0: [sr1] scsi-1 drive
kernel: scsi host9: scsi_runtime_resume
kernel: sr 10:0:0:0: Attached scsi CD-ROM sr1
kernel: driver: 'sr': driver_bound: bound to device '10:0:0:0'
kernel: bus: 'scsi': really_probe: bound device 10:0:0:0 to driver sr
kernel: scsi 9:0:0:0: CD-ROM Linux scsi_debug 0188 PQ: 0 ANSI: 7
kernel: WARNING: CPU: 5 PID: 907 at fs/block_dev.c:1899 __blkdev_put+0x396/0x3a0
systemd-udevd[906]: Process 'cdrom_id --lock-media /dev/sr2' failed with exit code 1.
kernel: bus: 'scsi': driver_probe_device: matched device 9:0:0:0 with driver sr
kernel: Modules linked in: scsi_debug crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 glue_helper crypto_simd joydev cryptd virtio_balloon virtio_console serio_raw qemu_fw_cfg iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi ip_tables x_tables autofs4 hid_generic usbhid virtio_net psmouse hid ahci net_failover libahci i2c_piix4 floppy virtio_blk virtio_scsi failover pata_acpi [last unloaded: scsi_debug]
kernel: bus: 'scsi': really_probe: probing driver sr with device 9:0:0:0
kernel: sr 10:0:0:0: Attached scsi generic sg2 type 5
kernel: CPU: 5 PID: 907 Comm: systemd-udevd Not tainted 5.3.0-rc3-dbg+ #5
kernel: Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014
kernel: RIP: 0010:__blkdev_put+0x396/0x3a0
kernel: Code: 49 8d 7d 08 e8 6b c8 f4 ff 49 8b 45 08 48 85 c0 0f 84 9c fe ff ff 8b b5 64 ff ff ff 48 8b bd 70 ff ff ff ff d0 e9 88 fe ff ff <0f> 0b e9 54 fd ff ff 0f 1f 00 0f 1f 44 00 00 55 48 89 e5 41 57 41
kernel: RSP: 0018:ffff8881111afd18 EFLAGS: 00010202
kernel: RAX: 0000000000000000 RBX: ffff888035472e00 RCX: ffffffff814a4783
kernel: RDX: 0000000000000002 RSI: dffffc0000000000 RDI: ffff888035472ea8
kernel: RBP: ffff8881111afde0 R08: ffffed1006a8e5c4 R09: ffffed1006a8e5c4
kernel: R10: ffff8881111afd08 R11: ffff888035472e1f R12: 0000000000000000
kernel: R13: 00000000080a005d R14: ffff888035472e18 R15: ffff888115e5f028
kernel: sr 9:0:0:0: Power-on or device reset occurred
kernel: FS: 00007f113411d8c0(0000) GS:ffff88811b740000(0000) knlGS:0000000000000000
kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
systemd-udevd[1257]: Process '/usr/bin/sg_inq --export /dev/sr1' failed with exit code 15.
systemd-udevd[1257]: Process 'cdrom_id --lock-media /dev/sr1' failed with exit code 1.
systemd-udevd[906]: Process '/usr/bin/sg_inq --export /dev/sr3' failed with exit code 15.
systemd-udevd[906]: Process 'cdrom_id --lock-media /dev/sr3' failed with exit code 1.
kernel: sr 9:0:0:0: [sr2] scsi-1 drive kernel: CR2: 00007ffc4ac7fc98 CR3: 000000011127a001 CR4: 0000000000360ee0 kernel: debugfs: Directory 'sr2' with parent 'block' already present! kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 kernel: DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 kernel: Call Trace: kernel: ? __kasan_check_write+0x14/0x20 kernel: sr 9:0:0:0: Attached scsi CD-ROM sr2 kernel: ? __mutex_unlock_slowpath+0xbd/0x400 kernel: ? bd_set_size+0x70/0x70 kernel: ? preempt_count_sub+0x18/0xc0 kernel: blkdev_put+0x62/0x200 kernel: blkdev_close+0x49/0x50 kernel: __fput+0x15c/0x390 kernel: driver: 'sr': driver_bound: bound to device '9:0:0:0' systemd-udevd[913]: Process '/usr/bin/sg_inq --export /dev/sr1' failed with exit code 15. kernel: ____fput+0xe/0x10 kernel: task_work_run+0xc3/0xf0 kernel: bus: 'scsi': really_probe: bound device 9:0:0:0 to driver sr kernel: exit_to_usermode_loop+0xee/0xf0
systemd-udevd[913]: Process 'cdrom_id --lock-media /dev/sr1' failed with exit code 1.
kernel: sr 9:0:0:0: Attached scsi generic sg2 type 5
kernel: do_syscall_64+0x213/0x270
systemd-udevd[1004]: Process '/usr/bin/sg_inq --export /dev/sr2' failed with exit code 15.
systemd-udevd[906]: Process '/usr/bin/sg_inq --export /dev/sr1' failed with exit code 15.
kernel: entry_SYSCALL_64_after_hwframe+0x49/0xbe
kernel: RIP: 0033:0x7f11343a0674
kernel: Code: eb 8d e8 bf 1b 02 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 8d 05 69 cd 0d 00 8b 00 85 c0 75 13 b8 03 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3c c3 0f 1f 00 53 89 fb 48 83 ec 10 e8 44 e7
kernel: RSP: 002b:00007ffc4ac80d78 EFLAGS: 00000246 ORIG_RAX: 0000000000000003
kernel: RAX: 0000000000000000 RBX: 0000000000000006 RCX: 00007f11343a0674
kernel: RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000006
kernel: RBP: 00007f113411d7e0 R08: 000055f286c9f4b0 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000002
kernel: R13: 00000000000061b0 R14: 000055f287600fd0 R15: 000055f28757f3d0
kernel: irq event stamp: 2072492
kernel: hardirqs last enabled at (2072491): [<ffffffff81ef8b1c>] _raw_spin_unlock_irq+0x2c/0x50
kernel: hardirqs last disabled at (2072492): [<ffffffff8100291a>] trace_hardirqs_off_thunk+0x1a/0x20
kernel: softirqs last enabled at (2069158): [<ffffffff81043a03>] fpu__copy+0xe3/0x470
kernel: softirqs last disabled at (2069156): [<ffffffff81043975>] fpu__copy+0x55/0x470
kernel: ---[ end trace 352d17ea465743b6 ]---
systemd-udevd[1004]: Process 'cdrom_id --lock-media /dev/sr2' failed with exit code 1.
Quoted 7 lines · Bart Van Assche
Hi Jan,
A new kernel warning is triggered by blktests block/001 that did not happen without this patch. Reverting commit
89e524c04fa9("loop: Fix mount(2) failure due to race withLOOP_SET_FD") makes that kernel warning disappear. Is this reproducible on your setup?
Quoted 5 lines
Thanks,
Bart.
kernel: WARNING: CPU: 5 PID: 907 at
fs/block_dev.c:1899__blkdev_put+0x396/0x3a0
Hmm, this is reported as below one.
WARNING in __blkdev_put (2)
https://syzkaller.appspot.com/bug?id=1ac7a7a8440522302ccb634ba69f8e1e6f203902
Jan Kara
reviewerQuoted 45 lines · Bart Van Assche
Quoted 44 lines · Jan Kara
Quoted 43 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and fails
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Hi Bart,
Quoted 4 lines
A new kernel warning is triggered by blktests block/001 that did not happen without this patch. Reverting commit
89e524c04fa9("loop: Fix mount(2) failure due to race withLOOP_SET_FD") makes that kernel warning disappear. Is this reproducible on your setup?
Thanks for report! Hum, no, it seems the warning doesn't trigger in my test VM. But reviewing the mentioned commit with fresh head, I can see where I did a mistake during my conversion of blkdev_get(). Does attached patch fix the warning for you?
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
From c4cd39244088d8de548264bc33dc9fb8f0f1db2d Mon Sep 17 00:00:00 2001
From: Jan Kara <[email protected]>
Date: Wed, 7 Aug 2019 11:36:47 +0200
Subject: [PATCH] bdev: Fixup error handling in blkdev_get()
Commit 89e524c04fa9 ("loop: Fix mount(2) failure due to race with LOOP_SET_FD") converted blkdev_get() to use the new helpers for finishing claiming of a block device. However the conversion botched the error handling in blkdev_get() and thus the bdev has been marked as held even in case __blkdev_get() returned error. This led to occasional warnings with block/001 test from blktests like:
kernel: WARNING: CPU: 5 PID: 907 at fs/block_dev.c:1899 __blkdev_put+0x396/0x3a0
Correct the error handling.
--- fs/block_dev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/block_dev.c +4 -1
@@ -1754,7 +1754,10 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder)/* finish claiming */ mutex_lock (&bdev->bd_mutex); -bd_finish_claiming (bdev, whole, holder); +if (!res) +bd_finish_claiming (bdev, whole, holder); +else +bd_abort_claiming (bdev, whole, holder);/* * Block event polling for write claims if requested. Any * write holder makes the write_holder state stick until
Signature · 1 line
2.16.4
Quoted 10 lines · Jan Kara
Quoted 4 lines · Bart Van Assche
A new kernel warning is triggered by blktests block/001 that did not happen without this patch. Reverting commit
89e524c04fa9("loop: Fix mount(2) failure due to race withLOOP_SET_FD") makes that kernel warning disappear. Is this reproducible on your setup?Thanks for report! Hum, no, it seems the warning doesn't trigger in my test VM. But reviewing the mentioned commit with fresh head, I can see where I did a mistake during my conversion of
blkdev_get(). Does attached patch fix the warning for you?
Hi Jan,
That patch indeed fixes the warning. Feel free to add my Tested-by.
Thanks,
Bart.
Quoted 58 lines · Jan Kara
Quoted 45 lines · Bart Van Assche
Quoted 44 lines · Jan Kara
Quoted 43 lines · Jan Kara
Quoted 17 lines · John Lenton
Quoted 9 lines · Jan Kara
Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
doneQuoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.Quoted 8 lines
We've observed this in arch with util-linux 2.34, and ubuntu 19.10 (eoan ermine) with util-linux 2.33.
just to be clear, the initial reports didn't involve a zany loop of mounts, but were triggered by effectively the same thing as systemd booted a system with a lot of snaps. The reroducer tries to makes things simpler to reproduce :-). FWIW, systemd versions were 244 and 242 for those systems, respectively.
Thanks for info! So I think I see what's going on. The two mounts race like:
MOUNT1 MOUNT2
num =ioctl(LOOP_CTL_GET_FREE)
num =ioctl(LOOP_CTL_GET_FREE)ioctl("/dev/loop$num", LOOP_SET_FD, ..)
- returns OKioctl("/dev/loop$num", LOOP_SET_FD, ..) - acquires exclusine loop$num reference
mount("/dev/loop$num", ...)
- sees exclusive reference from MOUNT2 and fails
- sees loop device is already bound and failsQuoted 4 lines
Quoted 4 lines
Quoted 2 lines
It is a bug in the scheme I've chosen that racing
LOOP_SET_FDcan block perfectly valid mount. I'll think how to fix this...So how about attached patch? It fixes the regression for me.
Hi Bart,
Quoted 4 lines
A new kernel warning is triggered by blktests block/001 that did not happen without this patch. Reverting commit
89e524c04fa9("loop: Fix mount(2) failure due to race withLOOP_SET_FD") makes that kernel warning disappear. Is this reproducible on your setup?
Quoted 4 lines
Thanks for report! Hum, no, it seems the warning doesn't trigger in my test VM. But reviewing the mentioned commit with fresh head, I can see where I did a mistake during my conversion of
blkdev_get(). Does attached patch fix the warning for you?
I've queued this up, Jan. Thanks for taking a look at it.
Signature · 1 line
Jens Axboe
Quoted 14 lines · Jan Kara
Quoted 5 lines
This patch introduced a regression [1].
A reproducer can be found at [2].[1] https://bugs.launchpad.net/bugs/1836914
[2] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1836914/comments/4Thanks for the notice and the references. What's your version of util-linux? What your test script does is indeed racy. You have there:
echo Running:
for i in {a..z}{a..z}; do
mount $i.squash/mnt/$i&
done
Quoted 6 lines
So all mount(8) commands will run in parallel and race to setup loop devices with
LOOP_SET_FDand mount them. However util-linux (at least in the current version) seems to handle EBUSY fromLOOP_SET_FDjust fine and retries with the new loop device. So at this point I don't see why the patch makes difference... I guess I'll need to reproduce and see what's going on in detail.
Firstly, why not to check the return value of blkdev_get() ? EBUSY is not the only error code blkdev_get() might return.
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner. */
if (!(mode & FMODE_EXCL)) {
bdgrab(bdev);
error = blkdev_get(bdev, mode | FMODE_EXCL, loop_set_fd);
- if (error)
+ if (error) {
+ printk("loop_set_fd: %d\n", error);
goto out_putf;
+ }
}
And try finding which line is returning an error (like https://marc.info/?l=linux-xfs&m=156437221703110 does).