Enable inode preallocation support for aligned allocations. Inode
preallocation will only be used if the preallocated blocks are able to
satisfy the length and alignment requirements of the allocations, else
we disable preallocation for this particular allocation and proceed as
usual. Disabling inode preallocation is required otherwise we might end
up with overlapping preallocated ranges which can trigger a BUG() later.
Further, during normalizing, we usually try to round it up to a power of
2 which can still give us aligned allocation. We also make sure not
change the goal start so aligned allocation is more straightforward. If for
whatever reason the goal is not power of 2 or doesn't contain the original
request, then we throw a warning and proceed as normal.
For now, group preallocation is disabled for aligned allocations.
Signed-off-by: Ojaswin Mujoo <ojaswin@xxxxxxxxxxxxx>
---
fs/ext4/mballoc.c | 96 +++++++++++++++++++++++++++++++----------------
1 file changed, 63 insertions(+), 33 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 9763349598e9..a500a561c47d 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2178,8 +2178,6 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac,
* space in a special descriptor.
*/
if (ac->ac_o_ex.fe_len < ac->ac_b_ex.fe_len) {
- /* Aligned allocation doesn't have preallocation support */
- WARN_ON(ac->ac_flags & EXT4_MB_HINT_ALIGNED);
ext4_mb_new_preallocation(ac);
}
@@ -3027,8 +3025,7 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
WARN_ON_ONCE(!is_power_of_2(len));
WARN_ON_ONCE(start % len);
- /* We don't support preallocation yet */
- WARN_ON_ONCE(ac->ac_b_ex.fe_len != ac->ac_o_ex.fe_len);
+ WARN_ON_ONCE(ac->ac_b_ex.fe_len < ac->ac_o_ex.fe_len);
}
exit:
@@ -4479,13 +4476,6 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
if (ac->ac_flags & EXT4_MB_HINT_NOPREALLOC)
return;
- /*
- * caller may have strict alignment requirements. In this case, avoid
- * normalization since it is not alignment aware.
- */
- if (ac->ac_flags & EXT4_MB_HINT_ALIGNED)
- return;
-
if (ac->ac_flags & EXT4_MB_HINT_GROUP_ALLOC) {
ext4_mb_normalize_group_request(ac);
return ;
@@ -4542,6 +4532,21 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
size = (loff_t) EXT4_C2B(sbi,
ac->ac_o_ex.fe_len) << bsbits;
}
+
+ /*
+ * For aligned allocations, we need to ensure 2 things:
+ *
+ * 1. The start should remain same as original start so that finding
+ * aligned physical blocks for it is straight forward.
+ *
+ * 2. The new_size should not be less than the original len. This
+ * can sometimes happen due to the way we predict size above.
+ */
+ if (ac->ac_flags & EXT4_MB_HINT_ALIGNED) {
+ start_off = ac->ac_o_ex.fe_logical << bsbits;
+ size = max_t(loff_t, size,
+ EXT4_C2B(sbi, ac->ac_o_ex.fe_len) << bsbits);
+ }
size = size >> bsbits;
start = start_off >> bsbits;
@@ -4792,32 +4797,46 @@ ext4_mb_check_group_pa(ext4_fsblk_t goal_block,
}
/*
- * check if found pa meets EXT4_MB_HINT_GOAL_ONLY
+ * check if found pa meets EXT4_MB_HINT_GOAL_ONLY or EXT4_MB_HINT_ALIGNED
*/
static bool
-ext4_mb_pa_goal_check(struct ext4_allocation_context *ac,
+ext4_mb_pa_check(struct ext4_allocation_context *ac,
struct ext4_prealloc_space *pa)
{
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
ext4_fsblk_t start;
- if (likely(!(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY)))
+ if (likely(!(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY ||
+ ac->ac_flags & EXT4_MB_HINT_ALIGNED)))
return true;
- /*
- * If EXT4_MB_HINT_GOAL_ONLY is set, ac_g_ex will not be adjusted
- * in ext4_mb_normalize_request and will keep same with ac_o_ex
- * from ext4_mb_initialize_context. Choose ac_g_ex here to keep
- * consistent with ext4_mb_find_by_goal.
- */
- start = pa->pa_pstart +
- (ac->ac_g_ex.fe_logical - pa->pa_lstart);
- if (ext4_grp_offs_to_block(ac->ac_sb, &ac->ac_g_ex) != start)
- return false;
+ if (ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY) {
+ /*
+ * If EXT4_MB_HINT_GOAL_ONLY is set, ac_g_ex will not be adjusted
+ * in ext4_mb_normalize_request and will keep same with ac_o_ex
+ * from ext4_mb_initialize_context. Choose ac_g_ex here to keep
+ * consistent with ext4_mb_find_by_goal.
+ */
+ start = pa->pa_pstart +
+ (ac->ac_g_ex.fe_logical - pa->pa_lstart);
+ if (ext4_grp_offs_to_block(ac->ac_sb, &ac->ac_g_ex) != start)
+ return false;
- if (ac->ac_g_ex.fe_len > pa->pa_len -
- EXT4_B2C(sbi, ac->ac_g_ex.fe_logical - pa->pa_lstart))
- return false;
+ if (ac->ac_g_ex.fe_len >
+ pa->pa_len - EXT4_B2C(sbi, ac->ac_g_ex.fe_logical -
+ pa->pa_lstart))
+ return false;
+ } else if (ac->ac_flags & EXT4_MB_HINT_ALIGNED) {
+ start = pa->pa_pstart +
+ (ac->ac_g_ex.fe_logical - pa->pa_lstart);
+ if (start % EXT4_C2B(sbi, ac->ac_g_ex.fe_len))
+ return false;
+
+ if (EXT4_C2B(sbi, ac->ac_g_ex.fe_len) >
+ (EXT4_C2B(sbi, pa->pa_len) -
+ (ac->ac_g_ex.fe_logical - pa->pa_lstart)))
+ return false;
+ }
return true;
}
@@ -4840,10 +4859,6 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac)
if (!(ac->ac_flags & EXT4_MB_HINT_DATA))
return false;
- /* using preallocated blocks is not alignment aware. */
- if (ac->ac_flags & EXT4_MB_HINT_ALIGNED)
- return false;
-
/*
* first, try per-file preallocation by searching the inode pa rbtree.
*
@@ -4949,7 +4964,7 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac)
goto try_group_pa;
}
- if (tmp_pa->pa_free && likely(ext4_mb_pa_goal_check(ac, tmp_pa))) {
+ if (tmp_pa->pa_free && likely(ext4_mb_pa_check(ac, tmp_pa))) {
atomic_inc(&tmp_pa->pa_count);
ext4_mb_use_inode_pa(ac, tmp_pa);
spin_unlock(&tmp_pa->pa_lock);
@@ -4984,6 +4999,19 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac)
* pa_free == 0.
*/
WARN_ON_ONCE(tmp_pa->pa_free == 0);
+
+ /*
+ * If, for any reason, we reach here then we need to disable PA
+ * because otherwise ext4_mb_normalize_request() will try to
+ * allocate a new PA for this logical range where another PA
+ * already exists. This is not allowed and will trigger BUG_ONs.
+ * Hence, as a workaround we disable PA.
+ *
+ * NOTE: ideally we would want to have some logic to take care
+ * of the unusable PA. Maybe a more fine grained discard logic
+ * that could allow us to discard only specific PAs.
+ */
+ ac->ac_flags |= EXT4_MB_HINT_NOPREALLOC;
}
spin_unlock(&tmp_pa->pa_lock);
try_group_pa:
@@ -5790,6 +5818,7 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
int bsbits = ac->ac_sb->s_blocksize_bits;
loff_t size, isize;
bool inode_pa_eligible, group_pa_eligible;
+ bool is_aligned = (ac->ac_flags & EXT4_MB_HINT_ALIGNED);
if (!(ac->ac_flags & EXT4_MB_HINT_DATA))
return;
@@ -5797,7 +5826,8 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY))
return;
- group_pa_eligible = sbi->s_mb_group_prealloc > 0;
+ /* Aligned allocation does not support group pa */
+ group_pa_eligible = (!is_aligned && sbi->s_mb_group_prealloc > 0);
inode_pa_eligible = true;
size = extent_logical_end(sbi, &ac->ac_o_ex);
isize = (i_size_read(ac->ac_inode) + ac->ac_sb->s_blocksize - 1)
--
2.43.5
