btrfs: Make balance cancelling response faster
cover btrfs: Make balance cancelling response faster
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.
With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfs
umount $mnt &> /dev/null
umount $dev &> /dev/null
mkfs.btrfs -f $dev
mount $dev -o nospace_cache $mnt
dd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!
sleep 3
kill -KILL $dd_pid
sync
btrfs balance start --bg --full $mnt & sleep 1
echo "cancel request" >> /dev/kmsg
time btrfs balance cancel $mnt
umount $mnt
It takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs uses btrfs_fs_info::balance_cancel_req to record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.
That behavior is far from optimal to provide a faster cancelling.
[FIX]
This patchset will add more cancelling check points, to make cancelling faster.
And also, introduce a new error injection points to cover these newly introduced and future check points.
Qu Wenruo (4):
btrfs: relocation: Introduce error injection points for cancelling
balance
btrfs: relocation: Check cancel request after each data page read
btrfs: relocation: Check cancel request after each extent found
btrfs: relocation: Work around dead relocation stage loop
fs/btrfs/ctree.h | 1 + fs/btrfs/relocation.c | 23 +++++++++++++++++++++++ fs/btrfs/volumes.c | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-)
Signature · 1 line
2.24.0
PATCH 1/4 btrfs: relocation: Introduce error injection points for cancelling balance
Introduce a new error injection point, should_cancel_balance().
It's just a wrapper of atomic_read(&fs_info->balance_cancel_req), but allows us to override the return value.
Currently there are only one locations using this function:
- btrfs_balance()
It checks cancel before each block group.
There are other locations checking fs_info->balance_cancel_req, but they are not used as an indicator to exit, so there is no need to use the wrapper.
But there will be more locations coming, and some locations can cause kernel panic if not handled properly.
So introduce this error injection to provide better test interface.
--- fs/btrfs/ctree.h | 1 + fs/btrfs/relocation.c | 11 +++++++++++ fs/btrfs/volumes.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-)
fs/btrfs/ctree.h +1 -0
@@ -3352,6 +3352,7 @@ void btrfs_reloc_pre_snapshot(struct btrfs_pending_snapshot *pending, u64 *bytes_to_reserve);int btrfs_reloc_post_snapshot (struct btrfs_trans_handle *trans,struct btrfs_pending_snapshot *pending); +int should_cancel_balance (struct btrfs_fs_info *fs_info);/* scrub.c */ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
fs/btrfs/relocation.c +11 -0
@@ -9,6 +9,7 @@#include <linux/blkdev.h> #include <linux/rbtree.h> #include <linux/slab.h> +#include <linux/error-injection.h> #include "ctree.h" #include "disk-io.h" #include "transaction.h"
@@ -3223,6 +3224,16 @@ int setup_extent_mapping(struct inode *inode, u64 start, u64 end,return ret; } +/* +* This wrapper is to allow error injection to fully test all cancel +* call sites. +*/ +int should_cancel_balance (struct btrfs_fs_info *fs_info) +{ +return atomic_read (&fs_info->balance_cancel_req); +} +ALLOW_ERROR_INJECTION (should_cancel_balance, TRUE); +static int relocate_file_extent_cluster (struct inode *inode,struct file_extent_cluster *cluster) {
fs/btrfs/volumes.c +1 -1
@@ -3856,7 +3856,7 @@ int btrfs_balance(struct btrfs_fs_info *fs_info,if (btrfs_fs_closing (fs_info) ||atomic_read (&fs_info->balance_pause_req) || -atomic_read (&fs_info->balance_cancel_req)) { +should_cancel_balance (fs_info)) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.24.0
Re: [PATCH 1/4] btrfs: relocation: Introduce error injection points for cancelling balance
Looks good,
PATCH 2/4 btrfs: relocation: Check cancel request after each data page read
In reply to Qu WenruoWhen relocating a data extents with large large data extents, we spend most of our time in relocate_file_extent_cluster() at stage "moving data extents":
1) | btrfs_relocate_block_group [btrfs]() {
1) | relocate_file_extent_cluster [btrfs]() {
1) $ 6586769 us | }
1) + 18.260 us | relocate_file_extent_cluster [btrfs]();
1) + 15.770 us | relocate_file_extent_cluster [btrfs]();
1) $ 8916340 us | }
1) | btrfs_relocate_block_group [btrfs]() {
1) | relocate_file_extent_cluster [btrfs]() {
1) $ 11611586 us | }
1) + 16.930 us | relocate_file_extent_cluster [btrfs]();
1) + 15.870 us | relocate_file_extent_cluster [btrfs]();
1) $ 14986130 us | }So to make data relocation cancelling quicker, here add extra balance cancelling check after each page read in relocate_file_extent_cluster().
--- fs/btrfs/relocation.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/relocation.c +4 -0
@@ -3355,6 +3355,10 @@ static int relocate_file_extent_cluster(struct inode *inode,btrfs_delalloc_release_extents (BTRFS_I (inode),PAGE_SIZE );balance_dirty_pages_ratelimited (inode->i_mapping);btrfs_throttle (fs_info); +if (should_cancel_balance (fs_info)) { + ret = -ECANCELED ; + goto out; + } }WARN_ON (nr != cluster->nr); out:
Signature · 1 line
2.24.0
PATCH 3/4 btrfs: relocation: Check cancel request after each extent found
In reply to Qu WenruoWhen relocating data block groups with tons of small extents, or large metadata block groups, there can be over 200,000 extents.
We will iterate all extents of such block group in relocate_block_group(), where iteration itself can be kinda time-consuming.
So when user want to cancel the balance, the extent iteration loop can be another target.
This patch will add the cancelling check in the extent iteration loop of relocate_block_group() to make balance cancelling faster.
--- fs/btrfs/relocation.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/relocation.c +4 -0
@@ -4140,6 +4140,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)break ; } } +if (should_cancel_balance (fs_info)) { + err = -ECANCELED ; +break ; + } }if (trans && progress && err == -ENOSPC ) { ret =btrfs_force_chunk_alloc (trans, rc->block_group->flags);
Signature · 1 line
2.24.0
PATCH 4/4 btrfs: relocation: Work around dead relocation stage loop
In reply to Qu WenruoThere are some reports of dead relocation stage loop, where dmesg is flooded by "Found X extents".
The root cause of it is still uncertain, but we can work around such bug by checking cancelling request so user can at least cancel such dead loop.
--- fs/btrfs/relocation.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/relocation.c +4 -0
@@ -4417,6 +4417,10 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)btrfs_info (fs_info,"found %llu extents" , rc->extents_found); +if (should_cancel_balance (fs_info)) { + err = -ECANCELED ; + goto out; + } }WARN_ON (rc->block_group->pinned >0 );
Signature · 1 line
2.24.0
Quoted 31 lines · Qu Wenruo
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfsumount $mnt &>
/dev/null
umount $dev &>/dev/nullmkfs.btrfs -f $dev
mount $dev -onospace_cache$mntdd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!sleep 3
kill -KILL $dd_pid
syncbtrfs balance start --bg --full $mnt & sleep 1echo "cancel request" >>
/dev/kmsg
time btrfs balance cancel $mnt
umount $mnt
Quoted 8 lines
It takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs usesbtrfs_fs_info::balance_cancel_reqto record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.
Yes that's the reason why it takes so long to cancel. Adding more cancellation points is fine, but I don't know what exactly happens when the block group relocation is not finished. There's code to merge the reloc inode and commit that, but that's only a high-level view of the thing.
Quoted 41 lines · David Sterba
Quoted 31 lines · Qu Wenruo
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfsumount $mnt &>
/dev/null
umount $dev &>/dev/nullmkfs.btrfs -f $dev
mount $dev -onospace_cache$mntdd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!sleep 3
kill -KILL $dd_pid
syncbtrfs balance start --bg --full $mnt & sleep 1echo "cancel request" >>
/dev/kmsg
time btrfs balance cancel $mnt
umount $mntQuoted 8 lines
It takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs usesbtrfs_fs_info::balance_cancel_reqto record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.
Quoted 5 lines
Yes that's the reason why it takes so long to cancel. Adding more cancellation points is fine, but I don't know what exactly happens when the block group relocation is not finished. There's code to merge the reloc inode and commit that, but that's only a high-level view of the thing.
When cancelled, we still merge the reloc roots with its source (if possible, as we still do the check for last_snapshot generation).
That means, if balance is canceled halfway, we still merge what is relocated. Then do the regular cleanup (cleanup the reloc tree).
I see no problem doing faster canceling here.
Or do you have any extra concern?
Thanks,
Qu
Quoted 50 lines · Qu Wenruo
Quoted 41 lines · David Sterba
Quoted 31 lines · Qu Wenruo
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfsumount $mnt &>
/dev/null
umount $dev &>/dev/nullmkfs.btrfs -f $dev
mount $dev -onospace_cache$mntdd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!sleep 3
kill -KILL $dd_pid
syncbtrfs balance start --bg --full $mnt & sleep 1echo "cancel request" >>
/dev/kmsg
time btrfs balance cancel $mnt
umount $mntQuoted 8 lines
It takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs usesbtrfs_fs_info::balance_cancel_reqto record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.Quoted 5 lines
Yes that's the reason why it takes so long to cancel. Adding more cancellation points is fine, but I don't know what exactly happens when the block group relocation is not finished. There's code to merge the reloc inode and commit that, but that's only a high-level view of the thing.
Quoted 5 lines
When cancelled, we still merge the reloc roots with its source (if possible, as we still do the check for
last_snapshotgeneration).That means, if balance is canceled halfway, we still merge what is relocated. Then do the regular cleanup (cleanup the reloc tree).
My bad, that's not the case. But it doesn't matter anyway.
Since we error out by setting @err to -ECANCELD, we won't go through the merge part.
We just mark all related reloc roots as orphan, then go through the cleanup path without doing the merge.
That's the existing error handling code, and we should have experienced quite some of them for the random data reloc tree csum mismatch bug.
At least the error handling part looks pretty solid.
I'll add this explanation into the cover letter of next version.
Thanks,
Qu
Quoted 8 lines
I see no problem doing faster canceling here.
Or do you have any extra concern?
Thanks,
Qu
Quoted 40 lines · Qu Wenruo
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfsumount $mnt &>
/dev/null
umount $dev &>/dev/nullmkfs.btrfs -f $dev
mount $dev -onospace_cache$mntdd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!sleep 3
kill -KILL $dd_pid
syncbtrfs balance start --bg --full $mnt & sleep 1echo "cancel request" >>
/dev/kmsg
time btrfs balance cancel $mnt
umount $mntIt takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs usesbtrfs_fs_info::balance_cancel_reqto record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.
Quoted 5 lines
That behavior is far from optimal to provide a faster cancelling.
[FIX]
This patchset will add more cancelling check points, to make cancelling faster.
Nice! I look forward to using this in the future!
Does this cover device delete/resize as well? I think there needs to be a check added for fatal signals for those to work, as they don't respond to balance cancel.
Quoted 18 lines
And also, introduce a new error injection points to cover these newly introduced and future check points.
Qu Wenruo (4):
btrfs: relocation: Introduce error injection points for cancelling
balance
btrfs: relocation: Check cancel request after each data page read
btrfs: relocation: Check cancel request after each extent found
btrfs: relocation: Work around dead relocation stage loopfs/btrfs/ctree.h | 1 + fs/btrfs/relocation.c | 23 +++++++++++++++++++++++ fs/btrfs/volumes.c | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-)Signature · 1 line
2.24.0
Quoted 43 lines · Zygo Blaxell
Quoted 42 lines · Qu Wenruo
[PROBLEM]
There are quite some users reporting that 'btrfs balance cancel' slow to cancel current running balance, or even doesn't work for certain dead balance loop.With the following script showing how long it takes to fully stop a balance:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfsumount $mnt &>
/dev/null
umount $dev &>/dev/nullmkfs.btrfs -f $dev
mount $dev -onospace_cache$mntdd if=/dev/zero bs=1M of=$mnt/large &
dd_pid=$!sleep 3
kill -KILL $dd_pid
syncbtrfs balance start --bg --full $mnt & sleep 1echo "cancel request" >>
/dev/kmsg
time btrfs balance cancel $mnt
umount $mntIt takes around 7~10s to cancel the running balance in my test environment.
[CAUSE]
Btrfs usesbtrfs_fs_info::balance_cancel_reqto record how many cancel request are queued.
However that cancelling request is only checked after relocating a block group.That behavior is far from optimal to provide a faster cancelling.
Quoted 7 lines
Quoted 3 lines
[FIX]
This patchset will add more cancelling check points, to make cancelling faster.Nice! I look forward to using this in the future!
Does this cover device delete/resize as well?
Shrink also takes use of balance, so I see no reason why it won't work on such use cases.
Quoted 3 lines
I think there needs to be
a check added for fatal signals for those to work, as they don't respond to balance cancel.
That's a good extra idea.
Since we have that wrapper, it would be easier to add in the future.
Thanks,
Qu
Quoted 19 lines
Quoted 19 lines
And also, introduce a new error injection points to cover these newly introduced and future check points.
Qu Wenruo (4):
btrfs: relocation: Introduce error injection points for cancelling
balance
btrfs: relocation: Check cancel request after each data page read
btrfs: relocation: Check cancel request after each extent found
btrfs: relocation: Work around dead relocation stage loopfs/btrfs/ctree.h | 1 + fs/btrfs/relocation.c | 23 +++++++++++++++++++++++ fs/btrfs/volumes.c | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-)Signature · 1 line
2.24.0