From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 2/4] btrfs: relocation: Check cancel request after each data page read
Date: Tue, 11 Feb 2020 13:37:27 +0800 [thread overview]
Message-ID: <20200211053729.20807-3-wqu@suse.com> (raw)
In-Reply-To: <20200211053729.20807-1-wqu@suse.com>
When 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().
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/relocation.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 475479d50cc3..23b279872641 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3396,6 +3396,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:
--
2.25.0
next prev parent reply other threads:[~2020-02-11 5:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 5:37 [PATCH v2 0/4] btrfs: Make balance cancelling response faster Qu Wenruo
2020-02-11 5:37 ` [PATCH v2 1/4] btrfs: relocation: Introduce error injection points for cancelling balance Qu Wenruo
2020-02-13 20:00 ` Josef Bacik
2020-02-11 5:37 ` Qu Wenruo [this message]
2020-02-13 20:03 ` [PATCH v2 2/4] btrfs: relocation: Check cancel request after each data page read Josef Bacik
2020-02-14 17:10 ` David Sterba
2020-02-11 5:37 ` [PATCH v2 3/4] btrfs: relocation: Check cancel request after each extent found Qu Wenruo
2020-02-13 20:05 ` Josef Bacik
2020-02-11 5:37 ` [PATCH v2 4/4] btrfs: relocation: Work around dead relocation stage loop Qu Wenruo
2020-02-13 20:08 ` Josef Bacik
2020-02-14 0:33 ` Qu Wenruo
2020-02-14 17:12 ` [PATCH v2 0/4] btrfs: Make balance cancelling response faster David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200211053729.20807-3-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).