Skip to content

Commit f8665f5

Browse files
LiBaokun96Sasha Levin
authored andcommitted
ext4: regenerate buddy after block freeing failed if under fc replay
[ Upstream commit c9b528c ] This mostly reverts commit 6bd97bf ("ext4: remove redundant mb_regenerate_buddy()") and reintroduces mb_regenerate_buddy(). Based on code in mb_free_blocks(), fast commit replay can end up marking as free blocks that are already marked as such. This causes corruption of the buddy bitmap so we need to regenerate it in that case. Reported-by: Jan Kara <jack@suse.cz> Fixes: 6bd97bf ("ext4: remove redundant mb_regenerate_buddy()") Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20240104142040.2835097-4-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent eb3e299 commit f8665f5

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

fs/ext4/mballoc.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,24 @@ void ext4_mb_generate_buddy(struct super_block *sb,
12321232
atomic64_add(period, &sbi->s_mb_generation_time);
12331233
}
12341234

1235+
static void mb_regenerate_buddy(struct ext4_buddy *e4b)
1236+
{
1237+
int count;
1238+
int order = 1;
1239+
void *buddy;
1240+
1241+
while ((buddy = mb_find_buddy(e4b, order++, &count)))
1242+
mb_set_bits(buddy, 0, count);
1243+
1244+
e4b->bd_info->bb_fragments = 0;
1245+
memset(e4b->bd_info->bb_counters, 0,
1246+
sizeof(*e4b->bd_info->bb_counters) *
1247+
(e4b->bd_sb->s_blocksize_bits + 2));
1248+
1249+
ext4_mb_generate_buddy(e4b->bd_sb, e4b->bd_buddy,
1250+
e4b->bd_bitmap, e4b->bd_group, e4b->bd_info);
1251+
}
1252+
12351253
/* The buddy information is attached the buddy cache inode
12361254
* for convenience. The information regarding each group
12371255
* is loaded via ext4_mb_load_buddy. The information involve
@@ -1920,6 +1938,8 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
19201938
ext4_mark_group_bitmap_corrupted(
19211939
sb, e4b->bd_group,
19221940
EXT4_GROUP_INFO_BBITMAP_CORRUPT);
1941+
} else {
1942+
mb_regenerate_buddy(e4b);
19231943
}
19241944
goto done;
19251945
}

0 commit comments

Comments
 (0)