wake up s_wait_unfrozen when ->freeze_fs fails
PATCH 1/1 wake up s_wait_unfrozen when ->freeze_fs fails
dd slept infinitely when fsfeeze failed because of EIO. To fix this problem, if ->freeze_fs fails, freeze_super() wakes up the tasks waiting for the filesystem to become unfrozen.
When s_frozen isn't SB_UNFROZEN in __generic_file_aio_write(), the function sleeps until FITHAW ioctl wakes up s_wait_unfrozen.
However, if ->freeze_fs fails, s_frozen is set to SB_UNFROZEN and then freeze_super() returns an error number. In this case, FITHAW ioctl returns EINVAL because s_frozen is already SB_UNFROZEN. There is no way to wake up s_wait_unfrozen, so __generic_file_aio_write() sleeps infinitely.
--- fs/super.c | 2 ++ 1 file changed, 2 insertions(+)
fs/super.c +2 -0
@@ -1161,6 +1161,8 @@ int freeze_super(struct super_block *sb)printk (KERN_ERR "VFS:Filesystem freeze failed\n" ); sb->s_frozen =SB_UNFROZEN ; +smp_wmb (); +wake_up (&sb->s_wait_unfrozen);deactivate_locked_super (sb);return ret; }
Quoted 11 lines · Kazuya Mio
dd slept infinitely when fsfeeze failed because of EIO. To fix this problem, if ->freeze_fs fails,
freeze_super()wakes up the tasks waiting for the filesystem to become unfrozen.When
s_frozenisn'tSB_UNFROZENin__generic_file_aio_write(), the function sleeps until FITHAW ioctl wakes ups_wait_unfrozen.However, if ->freeze_fs fails,
s_frozenis set toSB_UNFROZENand thenfreeze_super()returns an error number. In this case, FITHAW ioctl returns EINVAL becauses_frozenis alreadySB_UNFROZEN. There is no way to wake ups_wait_unfrozen, so__generic_file_aio_write()sleeps infinitely.
Looks good,
You don't happen to have testcase (e.g. by using dm-fauly or XFS error injection) that we could add to xfstests for this?
Quoted 13 lines · Christoph Hellwig
Quoted 11 lines · Kazuya Mio
dd slept infinitely when fsfeeze failed because of EIO. To fix this problem, if ->freeze_fs fails,
freeze_super()wakes up the tasks waiting for the filesystem to become unfrozen.When
s_frozenisn'tSB_UNFROZENin__generic_file_aio_write(), the function sleeps until FITHAW ioctl wakes ups_wait_unfrozen.However, if ->freeze_fs fails,
s_frozenis set toSB_UNFROZENand thenfreeze_super()returns an error number. In this case, FITHAW ioctl returns EINVAL becauses_frozenis alreadySB_UNFROZEN. There is no way to wake ups_wait_unfrozen, so__generic_file_aio_write()sleeps infinitely.
Quoted 6 lines
Looks good,
Reviewed-by Christoph Hellwig<[email protected]>You don't happen to have testcase (e.g. by using dm-fauly or XFS error injection) that we could add to xfstests for this?
The problem can be reproduced by the following steps:
1. make faulty md device with mdadm
# mdadm -B /dev/md1000 -l faulty -n 1 -R <device>
2. mkfs and mount filesystem
# mkfs.ext4 /dev/md1000 # mount /dev/md1000 <mount point>
3. run 1000 dd commands in the background to create one 10MB file
# for NO in {1..1000} ; do dd if=/dev/zero of=<mount point>/testfile \
bs=1M count=10 ;done4. sleep three seconds for the adjustment with the time of fault injection
# sleep 3
5. inject the md device with fault in the background
# mdadm -G /dev/md1000 -l faulty -p wp1 &
6. freeze filesystem with fsfreeze (and it fails because of EIO)
# freeze -f <mount point>
As a result, dd executed in step 3 sleeps forever.
Regards,
Kazuya Mio