From: Dennis Zhou <dennis@kernel.org>
To: Josef Bacik <josef@toxicpanda.com>
Cc: Dennis Zhou <dennis@kernel.org>, David Sterba <dsterba@suse.com>,
Chris Mason <clm@fb.com>, Omar Sandoval <osandov@osandov.com>,
kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 03/22] btrfs: keep track of which extents have been discarded
Date: Mon, 11 Nov 2019 12:20:16 -0500 [thread overview]
Message-ID: <20191111172016.GA79848@dennisz-mbp> (raw)
In-Reply-To: <20191108190502.yutl2muwbgdjdqbt@macbook-pro-91.dhcp.thefacebook.com>
On Fri, Nov 08, 2019 at 02:05:03PM -0500, Josef Bacik wrote:
> On Wed, Oct 23, 2019 at 06:52:57PM -0400, Dennis Zhou wrote:
> > Async discard will use the free space cache as backing knowledge for
> > which extents to discard. This patch plumbs knowledge about which
> > extents need to be discarded into the free space cache from
> > unpin_extent_range().
> >
> > An untrimmed extent can merge with everything as this is a new region.
> > Absorbing trimmed extents is a tradeoff to for greater coalescing which
> > makes life better for find_free_extent(). Additionally, it seems the
> > size of a trim isn't as problematic as the trim io itself.
> >
> > When reading in the free space cache from disk, if sync is set, mark all
> > extents as trimmed. The current code ensures at transaction commit that
> > all free space is trimmed when sync is set, so this reflects that.
> >
> > Signed-off-by: Dennis Zhou <dennis@kernel.org>
> > ---
> > fs/btrfs/extent-tree.c | 15 +++++++---
> > fs/btrfs/free-space-cache.c | 60 ++++++++++++++++++++++++++++++++-----
> > fs/btrfs/free-space-cache.h | 17 ++++++++++-
> > fs/btrfs/inode-map.c | 13 ++++----
> > 4 files changed, 87 insertions(+), 18 deletions(-)
> >
> > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> > index 77a5904756c5..6a40bba3cb19 100644
> > --- a/fs/btrfs/extent-tree.c
> > +++ b/fs/btrfs/extent-tree.c
> > @@ -2783,6 +2783,7 @@ fetch_cluster_info(struct btrfs_fs_info *fs_info,
> >
> > static int unpin_extent_range(struct btrfs_fs_info *fs_info,
> > u64 start, u64 end,
> > + enum btrfs_trim_state trim_state,
> > const bool return_free_space)
> > {
> > struct btrfs_block_group_cache *cache = NULL;
> > @@ -2816,7 +2817,9 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
> > if (start < cache->last_byte_to_unpin) {
> > len = min(len, cache->last_byte_to_unpin - start);
> > if (return_free_space)
> > - btrfs_add_free_space(cache, start, len);
> > + __btrfs_add_free_space(fs_info,
> > + cache->free_space_ctl,
> > + start, len, trim_state);
> > }
> >
> > start += len;
> > @@ -2894,6 +2897,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
> >
> > while (!trans->aborted) {
> > struct extent_state *cached_state = NULL;
> > + enum btrfs_trim_state trim_state = BTRFS_TRIM_STATE_UNTRIMMED;
> >
> > mutex_lock(&fs_info->unused_bg_unpin_mutex);
> > ret = find_first_extent_bit(unpin, 0, &start, &end,
> > @@ -2903,12 +2907,14 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
> > break;
> > }
> >
> > - if (btrfs_test_opt(fs_info, DISCARD_SYNC))
> > + if (btrfs_test_opt(fs_info, DISCARD_SYNC)) {
> > ret = btrfs_discard_extent(fs_info, start,
> > end + 1 - start, NULL);
> > + trim_state = BTRFS_TRIM_STATE_TRIMMED;
> > + }
> >
> > clear_extent_dirty(unpin, start, end, &cached_state);
> > - unpin_extent_range(fs_info, start, end, true);
> > + unpin_extent_range(fs_info, start, end, trim_state, true);
> > mutex_unlock(&fs_info->unused_bg_unpin_mutex);
> > free_extent_state(cached_state);
> > cond_resched();
> > @@ -5512,7 +5518,8 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)
> > int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,
> > u64 start, u64 end)
> > {
> > - return unpin_extent_range(fs_info, start, end, false);
> > + return unpin_extent_range(fs_info, start, end,
> > + BTRFS_TRIM_STATE_UNTRIMMED, false);
> > }
> >
> > /*
> > diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> > index d54dcd0ab230..d7f0cb961496 100644
> > --- a/fs/btrfs/free-space-cache.c
> > +++ b/fs/btrfs/free-space-cache.c
> > @@ -747,6 +747,14 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
> > goto free_cache;
> > }
> >
> > + /*
> > + * Sync discard ensures that the free space cache is always
> > + * trimmed. So when reading this in, the state should reflect
> > + * that.
> > + */
> > + if (btrfs_test_opt(fs_info, DISCARD_SYNC))
> > + e->trim_state = BTRFS_TRIM_STATE_TRIMMED;
> > +
>
> BTRFS_TRIM_STATE_TRIMMED == 0, so if we don't have DISCARD_SYNC set, we'll still
> end up with TRIMMED. Which means we'll end up with weirdness later because
> unpinned extents will come back as UNTRIMMED in the !DISCARD_SYNC case. I'm
> thinking about spinning rust here where we'll never have discard, so we should
> either always treat the free space as trimmed, or always treat it as untrimmed,
> so we don't end up with different allocator behavior for the undiscardable
> devices. Thanks,
>
Ah, that is a good catch. I think having everything be treated as
untrimmed should be fine. I moved BTRFS_TRIM_STATE_UNTRIMMED to be 0 in
the enum.
Thanks,
Dennis
next prev parent reply other threads:[~2019-11-11 17:20 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 22:52 [PATCH v2 00/22] btrfs: async discard support Dennis Zhou
2019-10-23 22:52 ` [PATCH 01/22] bitmap: genericize percpu bitmap region iterators Dennis Zhou
2019-10-23 22:52 ` [PATCH 02/22] btrfs: rename DISCARD opt to DISCARD_SYNC Dennis Zhou
2019-10-23 22:52 ` [PATCH 03/22] btrfs: keep track of which extents have been discarded Dennis Zhou
2019-11-08 19:05 ` Josef Bacik
2019-11-11 17:20 ` Dennis Zhou [this message]
2019-10-23 22:52 ` [PATCH 04/22] btrfs: keep track of cleanliness of the bitmap Dennis Zhou
2019-11-08 19:12 ` Josef Bacik
2019-10-23 22:52 ` [PATCH 05/22] btrfs: add the beginning of async discard, discard workqueue Dennis Zhou
2019-11-11 18:49 ` David Sterba
2019-10-23 22:53 ` [PATCH 06/22] btrfs: handle empty block_group removal Dennis Zhou
2019-11-08 19:19 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 07/22] btrfs: discard one region at a time in async discard Dennis Zhou
2019-11-08 19:27 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 08/22] btrfs: add removal calls for sysfs debug/ Dennis Zhou
2019-11-08 19:28 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 09/22] btrfs: make UUID/debug have its own kobject Dennis Zhou
2019-11-08 19:29 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 10/22] btrfs: add discard sysfs directory Dennis Zhou
2019-11-08 19:29 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 11/22] btrfs: track discardable extents for async discard Dennis Zhou
2019-10-23 22:53 ` [PATCH 12/22] btrfs: keep track of discardable_bytes Dennis Zhou
2019-11-08 19:31 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 13/22] btrfs: calculate discard delay based on number of extents Dennis Zhou
2019-10-23 22:53 ` [PATCH 14/22] btrfs: add bps discard rate limit Dennis Zhou
2019-11-08 19:41 ` Josef Bacik
2019-11-15 17:28 ` David Sterba
2019-10-23 22:53 ` [PATCH 15/22] btrfs: limit max discard size for async discard Dennis Zhou
2019-10-23 22:53 ` [PATCH 16/22] btrfs: make max async discard size tunable Dennis Zhou
2019-10-23 22:53 ` [PATCH 17/22] btrfs: have multiple discard lists Dennis Zhou
2019-11-08 19:44 ` Josef Bacik
2019-10-23 22:53 ` [PATCH 18/22] btrfs: only keep track of data extents for async discard Dennis Zhou
2019-11-08 19:46 ` Josef Bacik
2019-11-08 20:14 ` Dennis Zhou
2019-11-15 17:31 ` David Sterba
2019-10-23 22:53 ` [PATCH 19/22] btrfs: keep track of discard reuse stats Dennis Zhou
2019-10-23 22:53 ` [PATCH 20/22] btrfs: add async discard header Dennis Zhou
2019-10-23 22:53 ` [PATCH 21/22] btrfs: increase the metadata allowance for the free_space_cache Dennis Zhou
2019-10-23 22:53 ` [PATCH 22/22] btrfs: make smaller extents more likely to go into bitmaps Dennis Zhou
2019-11-15 17:40 ` [PATCH v2 00/22] btrfs: async discard support David Sterba
2019-11-20 21:50 [PATCH v3 " Dennis Zhou
2019-11-20 21:51 ` [PATCH 03/22] btrfs: keep track of which extents have been discarded Dennis Zhou
2019-11-25 19:46 [PATCH v4 00/22] btrfs: async discard support Dennis Zhou
2019-11-25 19:46 ` [PATCH 03/22] btrfs: keep track of which extents have been discarded Dennis Zhou
2019-12-09 19:45 [PATCH v5 00/22] btrfs: async discard support Dennis Zhou
2019-12-09 19:45 ` [PATCH 03/22] btrfs: keep track of which extents have been discarded Dennis Zhou
2019-12-14 0:22 [PATCH v6 00/22] btrfs: async discard support Dennis Zhou
2019-12-14 0:22 ` [PATCH 03/22] btrfs: keep track of which extents have been discarded Dennis Zhou
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=20191111172016.GA79848@dennisz-mbp \
--to=dennis@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=osandov@osandov.com \
/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).