From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/7] btrfs: defrag: introduce a helper to defrag a continuous range
Date: Fri, 28 May 2021 10:28:18 +0800 [thread overview]
Message-ID: <20210528022821.81386-5-wqu@suse.com> (raw)
In-Reply-To: <20210528022821.81386-1-wqu@suse.com>
Intrudouce a helper, defrag_one_target(), to defrag one continuous range
by:
- Lock and read the page
- Set the extent range defrag
- Set the involved page range dirty
There is a special note here, since the target range may be a hole now,
we use btrfs_set_extent_delalloc() with EXTENT_DEFRAG as @extra_bits,
other than set_extent_defrag().
This would properly add EXTENT_DELALLOC_NEW bit to make inode nbytes
updated properly, and still handle regular extents without any problem.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/ioctl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 1e57293a05f2..cd7650bcc70c 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1486,6 +1486,82 @@ static int defrag_collect_targets(struct btrfs_inode *inode,
return ret;
}
+#define CLUSTER_SIZE (SZ_256K)
+static int defrag_one_target(struct btrfs_inode *inode,
+ struct file_ra_state *ra, u64 start, u32 len)
+{
+ struct btrfs_fs_info *fs_info = inode->root->fs_info;
+ struct extent_changeset *data_reserved = NULL;
+ struct extent_state *cached_state = NULL;
+ struct page **pages;
+ const u32 sectorsize = inode->root->fs_info->sectorsize;
+ unsigned long last_index = (start + len - 1) >> PAGE_SHIFT;
+ unsigned long start_index = start >> PAGE_SHIFT;
+ unsigned int nr_pages = last_index - start_index + 1;
+ int ret = 0;
+ int i;
+
+ ASSERT(nr_pages <= CLUSTER_SIZE / PAGE_SIZE);
+ ASSERT(IS_ALIGNED(start, sectorsize) && IS_ALIGNED(len, sectorsize));
+
+ pages = kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS);
+ if (!pages)
+ return -ENOMEM;
+
+ /* Kick in readahead */
+ if (ra)
+ page_cache_sync_readahead(inode->vfs_inode.i_mapping, ra, NULL,
+ start_index, nr_pages);
+
+ /* Prepare all pages */
+ for (i = 0; i < nr_pages; i++) {
+ pages[i] = defrag_prepare_one_page(inode, start_index + i);
+ if (IS_ERR(pages[i])) {
+ ret = PTR_ERR(pages[i]);
+ pages[i] = NULL;
+ goto free_pages;
+ }
+ }
+ ret = btrfs_delalloc_reserve_space(inode, &data_reserved, start, len);
+ if (ret < 0)
+ goto free_pages;
+
+ /* Lock the extent bits and update the extent bits*/
+ lock_extent_bits(&inode->io_tree, start, start + len - 1,
+ &cached_state);
+ clear_extent_bit(&inode->io_tree, start, start + len - 1,
+ EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
+ 0, 0, &cached_state);
+
+ /*
+ * Since the target list is gathered without inode nor extent lock, we
+ * may get a range which is now a hole.
+ * In that case, we have to set it with DELALLOC_NEW as if we're
+ * writing a new data, or inode nbytes will mismatch.
+ */
+ ret = btrfs_set_extent_delalloc(inode, start, start + len - 1,
+ EXTENT_DEFRAG, &cached_state);
+ /* Update the page status */
+ for (i = 0; i < nr_pages; i++) {
+ ClearPageChecked(pages[i]);
+ btrfs_page_clamp_set_dirty(fs_info, pages[i], start, len);
+ }
+ unlock_extent_cached(&inode->io_tree, start, start + len - 1,
+ &cached_state);
+ btrfs_delalloc_release_extents(inode, len);
+ extent_changeset_free(data_reserved);
+
+free_pages:
+ for (i = 0; i < nr_pages; i++) {
+ if (pages[i]) {
+ unlock_page(pages[i]);
+ put_page(pages[i]);
+ }
+ }
+ kfree(pages);
+ return ret;
+}
+
/*
* Btrfs entrace for defrag.
*
--
2.31.1
next prev parent reply other threads:[~2021-05-28 2:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 2:28 [PATCH 0/7] btrfs: defrag: rework to support sector perfect defrag Qu Wenruo
2021-05-28 2:28 ` [PATCH 1/7] btrfs: defrag: pass file_ra_state instead of file for btrfs_defrag_file() Qu Wenruo
2021-05-28 9:46 ` Johannes Thumshirn
2021-05-28 2:28 ` [PATCH 2/7] btrfs: defrag: extract the page preparation code into one helper Qu Wenruo
2021-05-28 10:23 ` Johannes Thumshirn
2021-05-28 10:36 ` Qu Wenruo
2021-05-28 10:38 ` Johannes Thumshirn
2021-05-28 2:28 ` [PATCH 3/7] btrfs: defrag: introduce a new helper to collect target file extents Qu Wenruo
2021-05-28 2:28 ` Qu Wenruo [this message]
2021-05-28 9:07 ` [PATCH 4/7] btrfs: defrag: introduce a helper to defrag a continuous range Filipe Manana
2021-05-28 10:27 ` Qu Wenruo
2021-05-28 2:28 ` [PATCH 5/7] btrfs: defrag: introduce a new helper to defrag one cluster Qu Wenruo
2021-05-28 2:28 ` [PATCH 6/7] btrfs: defrag: use defrag_one_cluster() to implement btrfs_defrag_file() Qu Wenruo
2021-05-28 2:28 ` [PATCH 7/7] btrfs: defrag: remove the old infrastructure Qu Wenruo
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=20210528022821.81386-5-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).