From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: tytso@mit.edu, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca,
snitzer@redhat.com, jack@suse.cz, ebiggers@google.com,
riteshh@linux.ibm.com, krisman@collabora.com, surajjs@amazon.com,
ktkhai@virtuozzo.com, dmonakhov@gmail.com,
mbobrowski@mbobrowski.org, enwlinux@gmail.com, sblbir@amazon.com,
khazhy@google.com, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH RFC 4/5] ext4: Prepare ext4_mb_discard_preallocations() for handling EXT4_MB_HINT_GOAL_ONLY
Date: Wed, 26 Feb 2020 16:41:10 +0300 [thread overview]
Message-ID: <158272447070.281342.755800197684231698.stgit@localhost.localdomain> (raw)
In-Reply-To: <158272427715.281342.10873281294835953645.stgit@localhost.localdomain>
EXT4_MB_HINT_GOAL_ONLY is currently unused. This patch teaches
ext4_mb_discard_preallocations() to discard only that preallocated
range, which contains a specified block, in case of the flag is set.
Otherwise, a preallocated range is not discarded.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
fs/ext4/mballoc.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 51a78eb65f3c..b1b3c5526d1a 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3894,8 +3894,8 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
* 1) how many requested
*/
static noinline_for_stack int
-ext4_mb_discard_group_preallocations(struct super_block *sb,
- ext4_group_t group, int needed)
+ext4_mb_discard_group_preallocations(struct super_block *sb, ext4_group_t group,
+ int needed, ext4_fsblk_t goal)
{
struct ext4_group_info *grp = ext4_get_group_info(sb, group);
struct buffer_head *bitmap_bh = NULL;
@@ -3947,6 +3947,12 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
continue;
}
+ if (goal != (ext4_fsblk_t)-1 &&
+ (goal < pa->pa_pstart || goal >= pa->pa_pstart + pa->pa_len)) {
+ spin_unlock(&pa->pa_lock);
+ continue;
+ }
+
/* seems this one can be freed ... */
pa->pa_deleted = 1;
@@ -4462,15 +4468,23 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac)
return 0;
}
-static int ext4_mb_discard_preallocations(struct super_block *sb, int needed)
+static int ext4_mb_discard_preallocations(struct super_block *sb,
+ struct ext4_allocation_context *ac)
{
- ext4_group_t i, ngroups = ext4_get_groups_count(sb);
+ ext4_group_t i = 0, ngroups = ext4_get_groups_count(sb);
+ int needed = ac->ac_o_ex.fe_len;
+ ext4_fsblk_t goal = (ext4_fsblk_t)-1;
int ret;
int freed = 0;
+ if (ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY) {
+ i = ac->ac_o_ex.fe_group;
+ ngroups = i + 1;
+ goal = ext4_grp_offs_to_block(ac->ac_sb, &ac->ac_g_ex);
+ }
trace_ext4_mb_discard_preallocations(sb, needed);
- for (i = 0; i < ngroups && needed > 0; i++) {
- ret = ext4_mb_discard_group_preallocations(sb, i, needed);
+ for (; i < ngroups && needed > 0; i++) {
+ ret = ext4_mb_discard_group_preallocations(sb, i, needed, goal);
freed += ret;
needed -= ret;
}
@@ -4585,7 +4599,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
ar->len = ac->ac_b_ex.fe_len;
}
} else {
- freed = ext4_mb_discard_preallocations(sb, ac->ac_o_ex.fe_len);
+ freed = ext4_mb_discard_preallocations(sb, ac);
if (freed)
goto repeat;
*errp = -ENOSPC;
next prev parent reply other threads:[~2020-02-26 13:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 13:40 [PATCH RFC 0/5] fs, ext4: Physical blocks placement hint for fallocate(0): fallocate2(). TP defrag Kirill Tkhai
2020-02-26 13:40 ` [PATCH RFC 1/5] fs: Add new argument to file_operations::fallocate() Kirill Tkhai
2020-02-26 13:41 ` [PATCH RFC 2/5] fs: Add new argument to vfs_fallocate() Kirill Tkhai
2020-02-26 13:41 ` [PATCH RFC 3/5] fs: Add fallocate2() syscall Kirill Tkhai
2020-02-26 13:41 ` Kirill Tkhai [this message]
2020-02-26 13:41 ` [PATCH RFC 5/5] ext4: Add fallocate2() support Kirill Tkhai
2020-02-26 15:55 ` Christoph Hellwig
2020-02-26 20:05 ` Kirill Tkhai
2020-02-26 21:51 ` Andreas Dilger
2020-02-27 12:24 ` Kirill Tkhai
2020-02-28 15:35 ` Andreas Dilger
2020-02-28 21:16 ` Dave Chinner
2020-02-29 20:12 ` Andreas Dilger
2020-03-01 0:06 ` Dave Chinner
2020-03-02 10:33 ` Kirill Tkhai
2020-03-02 11:07 ` Kirill Tkhai
2020-02-27 6:59 ` Konstantin Khlebnikov
2020-02-27 10:42 ` Kirill Tkhai
2020-02-27 7:33 ` Dave Chinner
2020-02-27 11:12 ` Kirill Tkhai
2020-02-27 21:56 ` Dave Chinner
2020-02-28 12:41 ` Kirill Tkhai
2020-02-29 22:41 ` Dave Chinner
2020-03-02 10:17 ` Kirill Tkhai
2020-02-27 10:39 ` [PATCH RFC 0/5] fs, ext4: Physical blocks placement hint for fallocate(0): fallocate2(). TP defrag Ritesh Harjani
2020-02-28 7:07 ` xiaohui li
2020-02-28 12:46 ` Kirill Tkhai
2020-03-02 16:56 ` Theodore Y. Ts'o
2020-03-03 9:57 ` Kirill Tkhai
2020-03-03 16:55 ` Theodore Y. Ts'o
2020-03-03 17:36 ` Kirill Tkhai
2020-03-11 19:26 ` Andreas Dilger
2020-03-11 20:29 ` Kirill Tkhai
2020-03-12 0:31 ` Andreas Dilger
2020-03-12 9:23 ` Kirill Tkhai
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=158272447070.281342.755800197684231698.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=adilger.kernel@dilger.ca \
--cc=dmonakhov@gmail.com \
--cc=ebiggers@google.com \
--cc=enwlinux@gmail.com \
--cc=jack@suse.cz \
--cc=khazhy@google.com \
--cc=krisman@collabora.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mbobrowski@mbobrowski.org \
--cc=riteshh@linux.ibm.com \
--cc=sblbir@amazon.com \
--cc=snitzer@redhat.com \
--cc=surajjs@amazon.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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).