Btrfs: fix hang on snapshot creation after RWF_NOWAIT write
PATCH 1/4 Btrfs: fix hang on snapshot creation after RWF_NOWAIT write
From: Filipe Manana <[email protected]>
If we do a successful RWF_NOWAIT write we end up locking the snapshot lock of the inode, through a call to check_can_nocow(), but we never unlock it.
This means the next attempt to create a snapshot on the subvolume will hang forever.
Trivial reproducer:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt
$ touch /mnt/foobar $ chattr +C /mnt/foobar $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foobar $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe 0 64K" /mnt/foobar
$ btrfs subvolume snapshot -r /mnt /mnt/snap
--> hangsFix this by unlocking the snapshot lock if check_can_nocow() returned success.
--- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/file.c +2 -0
@@ -1914,6 +1914,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,inode_unlock (inode);return -EAGAIN ; } +/* check_can_nocow() locks the snapshot lock on success */ +btrfs_drew_write_unlock (&root->snapshot_lock); } current->backing_dev_info =inode_to_bdi (inode);
Signature · 1 line
2.26.2
Quoted 36 lines · On Mon, Jun 15, 2020 at 06:46:01PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
If we do a successful
RWF_NOWAITwrite we end up locking the snapshot lock of the inode, through a call tocheck_can_nocow(), but we never unlock it.This means the next attempt to create a snapshot on the subvolume will hang forever.
Trivial reproducer:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt$ touch /mnt/foobar $ chattr +C /mnt/foobar $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foobar $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe 0 64K" /mnt/foobar$ btrfs subvolume snapshot -r /mnt /mnt/snap --> hangsFix this by unlocking the snapshot lock if
check_can_nocow()returned success.Fixes edf064e7c6fec3 ("btrfs: nowait aio support")CC [email protected] # 4.13+Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/file.c +0
-0
fs/btrfs/file.c static ssize_t btrfs_file_write_iter(struct kiocb *iocb, · line 1918
Quoted 5 lines
fs/btrfs/file.c +2
-0@@ -1914,6 +1914,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,inode_unlock (inode);return -EAGAIN ; } +/* check_can_nocow() locks the snapshot lock on success */ +btrfs_drew_write_unlock (&root->snapshot_lock);
That's quite ugly that the locking semantics of check_can_nocow is hidden, this should be cleaned up too.
The whole condition
1909 if (!(BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
1910 BTRFS_INODE_PREALLOC)) ||
1911 check_can_nocow(BTRFS_I(inode), pos, &count) <= 0)
has 2 parts and it's not obvious from the context when the lock actually is taken. The flags check could be pushed down to check_can_nocow, the same but negated condition can be found in btrfs_file_write_iter so this would make it something like:
if (check_can_nocow(inode, pos, &count) <= 0) {
/* fallback */
return ...;
}
/*
* the lock is taken and needs to be unlocked at the right time
*/Suggestions to rename check_can_nocow welcome too.
Quoted 5 lines
fs/btrfs/file.c +0
-0} current->backing_dev_info =inode_to_bdi (inode);Signature · 1 line
2.26.2
Quoted 66 lines · David Sterba
Quoted 36 lines · On Mon, Jun 15, 2020 at 06:46:01PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
If we do a successful
RWF_NOWAITwrite we end up locking the snapshot lock of the inode, through a call tocheck_can_nocow(), but we never unlock it.This means the next attempt to create a snapshot on the subvolume will hang forever.
Trivial reproducer:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt$ touch /mnt/foobar $ chattr +C /mnt/foobar $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foobar $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe 0 64K" /mnt/foobar$ btrfs subvolume snapshot -r /mnt /mnt/snap --> hangsFix this by unlocking the snapshot lock if
check_can_nocow()returned success.Fixes edf064e7c6fec3 ("btrfs: nowait aio support")CC [email protected] # 4.13+Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/file.c +0
-0fs/btrfs/file.c static ssize_t btrfs_file_write_iter(struct kiocb *iocb, · line 1918
Quoted 5 lines
fs/btrfs/file.c +2
-0@@ -1914,6 +1914,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,inode_unlock (inode);return -EAGAIN ; } +/* check_can_nocow() locks the snapshot lock on success */ +btrfs_drew_write_unlock (&root->snapshot_lock);That's quite ugly that the locking semantics of
check_can_nocowis hidden, this should be cleaned up too.The whole condition
1909 if (!(BTRFS_I(inode)->flags & (
BTRFS_INODE_NODATACOW|
1910BTRFS_INODE_PREALLOC)) ||
1911check_can_nocow(BTRFS_I(inode), pos, &count)<= 0)has 2 parts and it's not obvious from the context when the lock actually is taken. The flags check could be pushed down to
check_can_nocow, the same but negated condition can be found inbtrfs_file_write_iterso this would make it something like:if (check_can_nocow(inode, pos, &count) <= 0) { /* fallback */ return ...; } /* * the lock is taken and needs to be unlocked at the right time */
Quoted 1 line
Suggestions to rename
check_can_nocowwelcome too.
Sure, I can understand it may look not obvious on first sight at least.
Here I'm only focusing on functional problems and kept this fix as small as possible to backport to stable releases,
as this is a bug that directly impacts user experience.
Thanks.
Quoted 7 lines
Quoted 7 lines
fs/btrfs/file.c +0
-1} current->backing_dev_info =inode_to_bdi (inode); --2.26.2
Quoted 34 lines · Filipe Manana
Quoted 33 lines · David Sterba
fs/btrfs/file.c static ssize_t btrfs_file_write_iter(struct kiocb *iocb, · line 1918
Quoted 9 lines · On Mon, Jun 15, 2020 at 06:46:01PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
fs/btrfs/file.c +2
-0@@ -1914,6 +1914,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,inode_unlock (inode);return -EAGAIN ; } +/* check_can_nocow() locks the snapshot lock on success */ +btrfs_drew_write_unlock (&root->snapshot_lock);That's quite ugly that the locking semantics of
check_can_nocowis hidden, this should be cleaned up too.The whole condition
1909 if (!(BTRFS_I(inode)->flags & (
BTRFS_INODE_NODATACOW|
1910BTRFS_INODE_PREALLOC)) ||
1911check_can_nocow(BTRFS_I(inode), pos, &count)<= 0)has 2 parts and it's not obvious from the context when the lock actually is taken. The flags check could be pushed down to
check_can_nocow, the same but negated condition can be found inbtrfs_file_write_iterso this would make it something like:if (check_can_nocow(inode, pos, &count) <= 0) { /* fallback */ return ...; } /* * the lock is taken and needs to be unlocked at the right time */
Quoted 7 lines
Quoted 1 line
Suggestions to rename
check_can_nocowwelcome too.Sure, I can understand it may look not obvious on first sight at least.
Here I'm only focusing on functional problems and kept this fix as small as possible to backport to stable releases,
as this is a bug that directly impacts user experience.
Ok that makes sense of course, I'll add the four patches to misc-next and queue them for rc. Thanks.
Quoted 21 lines · On 6/15/20 1:46 PM, [email protected] wrote:
From: Filipe Manana <[email protected]>
If we do a successful
RWF_NOWAITwrite we end up locking the snapshot lock of the inode, through a call tocheck_can_nocow(), but we never unlock it.This means the next attempt to create a snapshot on the subvolume will hang forever.
Trivial reproducer:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt$ touch /mnt/foobar $ chattr +C /mnt/foobar $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foobar $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe 0 64K" /mnt/foobar$ btrfs subvolume snapshot -r /mnt /mnt/snap --> hangs
Quoted 6 lines
Fix this by unlocking the snapshot lock if
check_can_nocow()returned success.Fixes edf064e7c6fec3 ("btrfs: nowait aio support")CC [email protected] # 4.13+Signed-off-by Filipe Manana <[email protected]>
Thanks,
Josef