Skip to content

Commit 5d1935a

Browse files
LiBaokun96tytso
authored andcommitted
ext4: avoid online resizing failures due to oversized flex bg
When we online resize an ext4 filesystem with a oversized flexbg_size, mkfs.ext4 -F -G 67108864 $dev -b 4096 100M mount $dev $dir resize2fs $dev 16G the following WARN_ON is triggered: ================================================================== WARNING: CPU: 0 PID: 427 at mm/page_alloc.c:4402 __alloc_pages+0x411/0x550 Modules linked in: sg(E) CPU: 0 PID: 427 Comm: resize2fs Tainted: G E 6.6.0-rc5+ #314 RIP: 0010:__alloc_pages+0x411/0x550 Call Trace: <TASK> __kmalloc_large_node+0xa2/0x200 __kmalloc+0x16e/0x290 ext4_resize_fs+0x481/0xd80 __ext4_ioctl+0x1616/0x1d90 ext4_ioctl+0x12/0x20 __x64_sys_ioctl+0xf0/0x150 do_syscall_64+0x3b/0x90 ================================================================== This is because flexbg_size is too large and the size of the new_group_data array to be allocated exceeds MAX_ORDER. Currently, the minimum value of MAX_ORDER is 8, the minimum value of PAGE_SIZE is 4096, the corresponding maximum number of groups that can be allocated is: (PAGE_SIZE << MAX_ORDER) / sizeof(struct ext4_new_group_data) ≈ 21845 And the value that is down-aligned to the power of 2 is 16384. Therefore, this value is defined as MAX_RESIZE_BG, and the number of groups added each time does not exceed this value during resizing, and is added multiple times to complete the online resizing. The difference is that the metadata in a flex_bg may be more dispersed. Signed-off-by: Baokun Li <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent b099eb8 commit 5d1935a

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

fs/ext4/resize.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,17 @@ struct ext4_new_flex_group_data {
218218
in the flex group */
219219
__u16 *bg_flags; /* block group flags of groups
220220
in @groups */
221+
ext4_group_t resize_bg; /* number of allocated
222+
new_group_data */
221223
ext4_group_t count; /* number of groups in @groups
222224
*/
223225
};
224226

227+
/*
228+
* Avoiding memory allocation failures due to too many groups added each time.
229+
*/
230+
#define MAX_RESIZE_BG 16384
231+
225232
/*
226233
* alloc_flex_gd() allocates a ext4_new_flex_group_data with size of
227234
* @flexbg_size.
@@ -236,14 +243,18 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned int flexbg_size)
236243
if (flex_gd == NULL)
237244
goto out3;
238245

239-
flex_gd->count = flexbg_size;
240-
flex_gd->groups = kmalloc_array(flexbg_size,
246+
if (unlikely(flexbg_size > MAX_RESIZE_BG))
247+
flex_gd->resize_bg = MAX_RESIZE_BG;
248+
else
249+
flex_gd->resize_bg = flexbg_size;
250+
251+
flex_gd->groups = kmalloc_array(flex_gd->resize_bg,
241252
sizeof(struct ext4_new_group_data),
242253
GFP_NOFS);
243254
if (flex_gd->groups == NULL)
244255
goto out2;
245256

246-
flex_gd->bg_flags = kmalloc_array(flexbg_size, sizeof(__u16),
257+
flex_gd->bg_flags = kmalloc_array(flex_gd->resize_bg, sizeof(__u16),
247258
GFP_NOFS);
248259
if (flex_gd->bg_flags == NULL)
249260
goto out1;
@@ -1602,8 +1613,7 @@ static int ext4_flex_group_add(struct super_block *sb,
16021613

16031614
static int ext4_setup_next_flex_gd(struct super_block *sb,
16041615
struct ext4_new_flex_group_data *flex_gd,
1605-
ext4_fsblk_t n_blocks_count,
1606-
unsigned int flexbg_size)
1616+
ext4_fsblk_t n_blocks_count)
16071617
{
16081618
struct ext4_sb_info *sbi = EXT4_SB(sb);
16091619
struct ext4_super_block *es = sbi->s_es;
@@ -1627,7 +1637,7 @@ static int ext4_setup_next_flex_gd(struct super_block *sb,
16271637
BUG_ON(last);
16281638
ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &last);
16291639

1630-
last_group = group | (flexbg_size - 1);
1640+
last_group = group | (flex_gd->resize_bg - 1);
16311641
if (last_group > n_group)
16321642
last_group = n_group;
16331643

@@ -2130,8 +2140,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
21302140
/* Add flex groups. Note that a regular group is a
21312141
* flex group with 1 group.
21322142
*/
2133-
while (ext4_setup_next_flex_gd(sb, flex_gd, n_blocks_count,
2134-
flexbg_size)) {
2143+
while (ext4_setup_next_flex_gd(sb, flex_gd, n_blocks_count)) {
21352144
if (time_is_before_jiffies(last_update_time + HZ * 10)) {
21362145
if (last_update_time)
21372146
ext4_msg(sb, KERN_INFO,

0 commit comments

Comments
 (0)