ext4: Fix stripe-unaligned allocations
Jan Kara
reviewerPATCH 1/2 ext4: Fix stripe-unaligned allocations
When a filesystem is created using:
mkfs.ext4 -b 4096 -E stride=512 <dev>
and we try to allocate 64MB extent, we will end up directly in ext4_mb_complex_scan_group(). This is because the request is detected as power-of-two allocation (so we start in ext4_mb_regular_allocator() with ac_criteria == 0) however the check before ext4_mb_simple_scan_group() refuses the direct buddy scan because the allocation request is too large. Since cr == 0, the check whether we should use ext4_mb_scan_aligned() fails as well and we fall back to ext4_mb_complex_scan_group().
Fix the problem by checking for upper limit on power-of-two requests directly when detecting them.
--- fs/ext4/mballoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +4 -2
@@ -2136,8 +2136,10 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)* We search using buddy data only if the order of the request * is greater than equal to the sbi_s_mb_order2_reqs * You can tune it via /sys/fs/ext4/<partition>/mb_order2_req +* We also support searching for power-of-two requests only for +* requests upto maximum buddy size we have constructed. */ -if (i >= sbi->s_mb_order2_reqs) { +if (i >= sbi->s_mb_order2_reqs && i <= sb->s_blocksize_bits +2 ) {/* * This should tell if fe_len is exactly power of 2 */
@@ -2207,7 +2209,7 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) } ac->ac_groups_scanned++; -if (cr ==0 && ac->ac_2order < sb->s_blocksize_bits+2 ) +if (cr ==0 )ext4_mb_simple_scan_group (ac, &e4b);else if (cr ==1 && sbi->s_stripe && !(ac->ac_g_ex.fe_len % sbi->s_stripe))
Signature · 1 line
2.10.2
Jan Kara
reviewerPATCH 2/2 ext4: Do not use stripe_with if it is not set
Avoid using stripe_width for sbi->s_stripe value if it is not actually set. It prevents using the stride for sbi->s_stripe.
--- fs/ext4/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ext4/super.c +2 -2
@@ -2619,9 +2619,9 @@ static unsigned long ext4_get_stripe_size(struct ext4_sb_info *sbi)if (sbi->s_stripe && sbi->s_stripe <= sbi->s_blocks_per_group) ret = sbi->s_stripe; -else if (stripe_width <= sbi->s_blocks_per_group) +else if (stripe_width && stripe_width <= sbi->s_blocks_per_group) ret = stripe_width; -else if (stride <= sbi->s_blocks_per_group) +else if (stride && stride <= sbi->s_blocks_per_group) ret = stride;else ret =0 ;
Signature · 1 line
2.10.2
Re: [PATCH 2/2] ext4: Do not use stripe_with if it is not set
Quoted 4 lines · Jan Kara
Avoid using
stripe_widthforsbi->s_stripevalue if it is not actually set. It prevents using the stride forsbi->s_stripe.Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted
Re: [PATCH 2/2] ext4: Do not use stripe_with if it is not set
In reply to Jan KaraQuoted 4 lines · Jan Kara
Avoid using
stripe_widthforsbi->s_stripevalue if it is not actually set. It prevents using the stride forsbi->s_stripe.Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted
Quoted 13 lines · Jan Kara
When a filesystem is created using:
mkfs.ext4 -b 4096 -E stride=512 <dev>
and we try to allocate 64MB extent, we will end up directly in
ext4_mb_complex_scan_group(). This is because the request is detected as power-of-two allocation (so we start inext4_mb_regular_allocator()withac_criteria== 0) however the check beforeext4_mb_simple_scan_group()refuses the direct buddy scan because the allocation request is too large. Since cr == 0, the check whether we should useext4_mb_scan_aligned()fails as well and we fall back toext4_mb_complex_scan_group().
Quoted 5 lines
Fix the problem by checking for upper limit on power-of-two requests directly when detecting them.
Reported-by Ross Zwisler <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted