Skip to content

Commit 0558ce0

Browse files
OGAWAHirofumigregkh
authored andcommitted
loop: Fix ABBA locking race
[ Upstream commit b491255 ] Current loop calls vfs_statfs() while holding the q->limits_lock. If FS takes some locking in vfs_statfs callback, this may lead to ABBA locking bug (at least, FAT fs has this issue actually). So this patch calls vfs_statfs() outside q->limits_locks instead, because looks like no reason to hold q->limits_locks while getting discord configs. Chain exists of: &sbi->fat_lock --> &q->q_usage_counter(io)#17 --> &q->limits_lock Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&q->limits_lock); lock(&q->q_usage_counter(io)#17); lock(&q->limits_lock); lock(&sbi->fat_lock); *** DEADLOCK *** Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=a5d8c609c02f508672cc Reviewed-by: Ming Lei <[email protected]> Signed-off-by: OGAWA Hirofumi <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Stable-dep-of: f5c84ef ("loop: Add sanity check for read/write_iter") Signed-off-by: Sasha Levin <[email protected]>
1 parent 722f6de commit 0558ce0

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

drivers/block/loop.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -694,12 +694,11 @@ static void loop_sysfs_exit(struct loop_device *lo)
694694
&loop_attribute_group);
695695
}
696696

697-
static void loop_config_discard(struct loop_device *lo,
698-
struct queue_limits *lim)
697+
static void loop_get_discard_config(struct loop_device *lo,
698+
u32 *granularity, u32 *max_discard_sectors)
699699
{
700700
struct file *file = lo->lo_backing_file;
701701
struct inode *inode = file->f_mapping->host;
702-
u32 granularity = 0, max_discard_sectors = 0;
703702
struct kstatfs sbuf;
704703

705704
/*
@@ -712,24 +711,17 @@ static void loop_config_discard(struct loop_device *lo,
712711
if (S_ISBLK(inode->i_mode)) {
713712
struct block_device *bdev = I_BDEV(inode);
714713

715-
max_discard_sectors = bdev_write_zeroes_sectors(bdev);
716-
granularity = bdev_discard_granularity(bdev);
714+
*max_discard_sectors = bdev_write_zeroes_sectors(bdev);
715+
*granularity = bdev_discard_granularity(bdev);
717716

718717
/*
719718
* We use punch hole to reclaim the free space used by the
720719
* image a.k.a. discard.
721720
*/
722721
} else if (file->f_op->fallocate && !vfs_statfs(&file->f_path, &sbuf)) {
723-
max_discard_sectors = UINT_MAX >> 9;
724-
granularity = sbuf.f_bsize;
722+
*max_discard_sectors = UINT_MAX >> 9;
723+
*granularity = sbuf.f_bsize;
725724
}
726-
727-
lim->max_hw_discard_sectors = max_discard_sectors;
728-
lim->max_write_zeroes_sectors = max_discard_sectors;
729-
if (max_discard_sectors)
730-
lim->discard_granularity = granularity;
731-
else
732-
lim->discard_granularity = 0;
733725
}
734726

735727
struct loop_worker {
@@ -915,6 +907,7 @@ static int loop_reconfigure_limits(struct loop_device *lo, unsigned int bsize)
915907
struct inode *inode = file->f_mapping->host;
916908
struct block_device *backing_bdev = NULL;
917909
struct queue_limits lim;
910+
u32 granularity = 0, max_discard_sectors = 0;
918911

919912
if (S_ISBLK(inode->i_mode))
920913
backing_bdev = I_BDEV(inode);
@@ -924,6 +917,8 @@ static int loop_reconfigure_limits(struct loop_device *lo, unsigned int bsize)
924917
if (!bsize)
925918
bsize = loop_default_blocksize(lo, backing_bdev);
926919

920+
loop_get_discard_config(lo, &granularity, &max_discard_sectors);
921+
927922
lim = queue_limits_start_update(lo->lo_queue);
928923
lim.logical_block_size = bsize;
929924
lim.physical_block_size = bsize;
@@ -933,7 +928,12 @@ static int loop_reconfigure_limits(struct loop_device *lo, unsigned int bsize)
933928
lim.features |= BLK_FEAT_WRITE_CACHE;
934929
if (backing_bdev && !bdev_nonrot(backing_bdev))
935930
lim.features |= BLK_FEAT_ROTATIONAL;
936-
loop_config_discard(lo, &lim);
931+
lim.max_hw_discard_sectors = max_discard_sectors;
932+
lim.max_write_zeroes_sectors = max_discard_sectors;
933+
if (max_discard_sectors)
934+
lim.discard_granularity = granularity;
935+
else
936+
lim.discard_granularity = 0;
937937
return queue_limits_commit_update(lo->lo_queue, &lim);
938938
}
939939

0 commit comments

Comments
 (0)