From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 10/20] btrfs: add flushing states for handling data reservations
Date: Wed, 29 Jan 2020 18:50:14 -0500 [thread overview]
Message-ID: <20200129235024.24774-11-josef@toxicpanda.com> (raw)
In-Reply-To: <20200129235024.24774-1-josef@toxicpanda.com>
Currently the way we do data reservations is by seeing if we have enough
space in our space_info. If we do not and we're a normal inode we'll
1) Attempt to force a chunk allocation.
2) If that fails we'll flush delalloc, then commit the transaction, then
run the delayed iputs.
If we are a free space inode we're only allowed to force a chunk
allocation. In order to use the normal flushing mechanism we need to
encode this into a flush state array for each flush type, so add the two
different flush types we'll need and add their respective states that
are valid for trying to make a data reservation.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/ctree.h | 2 ++
fs/btrfs/space-info.c | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 6afa0885a9bb..865b24a1759e 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2526,6 +2526,8 @@ enum btrfs_reserve_flush_enum {
*/
BTRFS_RESERVE_FLUSH_LIMIT,
BTRFS_RESERVE_FLUSH_EVICT,
+ BTRFS_RESERVE_FLUSH_DATA,
+ BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE,
BTRFS_RESERVE_FLUSH_ALL,
};
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 5a92851af2b3..066471c0f47c 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -854,6 +854,17 @@ static const enum btrfs_flush_state evict_flush_states[] = {
COMMIT_TRANS,
};
+static const enum btrfs_flush_state data_flush_states[] = {
+ ALLOC_CHUNK_FORCE,
+ FLUSH_DELALLOC_WAIT,
+ COMMIT_TRANS,
+ RUN_DELAYED_IPUTS,
+};
+
+static const enum btrfs_flush_state free_space_inode_flush_states[] = {
+ ALLOC_CHUNK_FORCE,
+};
+
static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *space_info,
struct reserve_ticket *ticket,
--
2.24.1
next prev parent reply other threads:[~2020-01-29 23:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 23:50 [PATCH 00/20][RFC] Convert data reservations to the ticketing infrastructure Josef Bacik
2020-01-29 23:50 ` [PATCH 01/20] btrfs: change nr to u64 in btrfs_start_delalloc_roots Josef Bacik
2020-01-30 12:06 ` Nikolay Borisov
2020-01-31 15:07 ` Josef Bacik
2020-01-31 15:13 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 02/20] btrfs: remove orig from shrink_delalloc Josef Bacik
2020-01-30 11:44 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 03/20] btrfs: handle U64_MAX for shrink_delalloc Josef Bacik
2020-01-30 11:46 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 04/20] btrfs: make shrink_delalloc take space_info as an arg Josef Bacik
2020-01-30 12:15 ` Nikolay Borisov
2020-01-30 12:35 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 05/20] btrfs: make ALLOC_CHUNK use the space info flags Josef Bacik
2020-01-30 13:19 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 06/20] btrfs: call btrfs_try_granting_tickets when freeing reserved bytes Josef Bacik
2020-01-31 11:16 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 07/20] btrfs: call btrfs_try_granting_tickets when unpinning anything Josef Bacik
2020-01-31 11:25 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 08/20] btrfs: call btrfs_try_granting_tickets when reserving space Josef Bacik
2020-01-31 11:37 ` Nikolay Borisov
2020-01-29 23:50 ` [PATCH 09/20] btrfs: use the btrfs_space_info_free_bytes_may_use helper for delalloc Josef Bacik
2020-01-31 11:56 ` Nikolay Borisov
2020-01-29 23:50 ` Josef Bacik [this message]
2020-01-29 23:50 ` [PATCH 11/20] btrfs: add btrfs_reserve_data_bytes and use it Josef Bacik
2020-01-29 23:50 ` [PATCH 12/20] btrfs: use ticketing for data space reservations Josef Bacik
2020-01-29 23:50 ` [PATCH 13/20] btrfs: run delayed iputs before committing the transaction for data Josef Bacik
2020-01-29 23:50 ` [PATCH 14/20] btrfs: flush delayed refs when trying to reserve data space Josef Bacik
2020-01-29 23:50 ` [PATCH 15/20] btrfs: serialize data reservations if we are flushing Josef Bacik
2020-01-29 23:50 ` [PATCH 16/20] btrfs: rework chunk allocate for data reservations Josef Bacik
2020-01-29 23:50 ` [PATCH 17/20] btrfs: drop the commit_cycles stuff " Josef Bacik
2020-01-29 23:50 ` [PATCH 18/20] btrfs: use the same helper for data and metadata reservations Josef Bacik
2020-01-29 23:50 ` [PATCH 19/20] btrfs: do async reclaim for data reservations Josef Bacik
2020-01-29 23:50 ` [PATCH 20/20] btrfs: kill the priority_reclaim_space helper Josef Bacik
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=20200129235024.24774-11-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.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