ext4: fix ext4_init_block_bitmap() for metablock block group
PATCH 1/1 ext4: fix ext4_init_block_bitmap() for metablock block group
When meta_bg feature is enabled and s_first_meta_bg != 0, ext4_init_block_bitmap() miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)
This patch fix it by using ext4_bg_num_gdb()
--- fs/ext4/balloc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
fs/ext4/balloc.c +1 -6
@@ -121,12 +121,7 @@ unsigned ext4_init_block_bitmap(struct sle16_to_cpu (sbi->s_es->s_reserved_gdt_blocks); } }else {/* For META_BG_BLOCK_GROUPS */ -int group_rel = (block_group - -le32_to_cpu (sbi->s_es->s_first_meta_bg)) % -EXT4_DESC_PER_BLOCK (sb); -if (group_rel ==0 || group_rel ==1 || - (group_rel ==EXT4_DESC_PER_BLOCK (sb) -1 )) - bit_max +=1 ; + bit_max +=ext4_bg_num_gdb (sb, block_group); }if (block_group == sbi->s_groups_count -1 ) {
Quoted 3 lines · Akinobu Mita
When
meta_bgfeature is enabled ands_first_meta_bg!= 0,ext4_init_block_bitmap()miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)
Can you please clarify why the calculation is incorrect? I admit that I didn't test with META_BG enabled, so it could well be wrong, but looking at the code I can't understand why it is incorrect.
Review unsigned ext4_init_block_bitmap(struct s
Quoted 1 line
(quoted diff) +0
-0@@ -121,12 +121,7 @@ unsigned ext4_init_block_bitmap(struct s
if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) *
sbi->s_desc_per_block) {
if (bit_max) {
bit_max += ext4_bg_num_gdb(sb, block_group);
bit_max +=fs/ext4/balloc.c unsigned ext4_init_block_bitmap(struct s · line 125
Quoted 11 lines
fs/ext4/balloc.c +1
-6le16_to_cpu (sbi->s_es->s_reserved_gdt_blocks); } }else {/* For META_BG_BLOCK_GROUPS */ -int group_rel = (block_group - -le32_to_cpu (sbi->s_es->s_first_meta_bg)) % -EXT4_DESC_PER_BLOCK (sb); -if (group_rel ==0 || group_rel ==1 || - (group_rel ==EXT4_DESC_PER_BLOCK (sb) -1 )) - bit_max +=1 ; + bit_max +=ext4_bg_num_gdb (sb, block_group); }
As you can see, the "if" checks if the block group is before s_first_meta_bg to treat it as a "normal" group, and only uses the "else" once beyond the start of the s_first_meta_bg limit.
It definitely is less complex to use ext4_bg_num_gdb(), and this could further be simplified by using ext4_bg_gdb_meta() in the "else" clause. In fact, the whole if/else could be replaced with ext4_bg_num_gdb() if it weren't for s_reserved_gdt_blocks.
Maybe it makes sense (cleaner code, less chance for bugs) to change the ext4_bg_num_gdb() function to take a parameter on whether it should include the s_reserved_gdt_blocks or not:
static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb, int group,
int reserved)
{
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) &&
!ext4_group_sparse(group))
return 0;
return EXT4_SB(sb)->s_gdb_count +
reserved ? EXT4_SB(sb)->s_reserved_gdt_blocks : 0;
}unsigned long ext4_bg_num_gdb(struct super_block *sb, int group, int reserved)
{
unsigned long first_meta_bg =
le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);
if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) ||
metagroup < first_meta_bg)
return ext4_bg_num_gdb_nometa(sb, group, reserved);
return ext4_bg_num_gdb_meta(sb, group);
}The fewer places in the code that need to understand META_BG, the less chance of having a bug. Now the code in ext4_init_block_bitmap() can be:
bit_max += ext4_bg_num_gdb(sb, block_group, 1);
Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.
Quoted 8 lines · Andreas Dilger
Quoted 3 lines · Akinobu Mita
When
meta_bgfeature is enabled ands_first_meta_bg!= 0,ext4_init_block_bitmap()miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)Can you please clarify why the calculation is incorrect? I admit that I didn't test with
META_BGenabled, so it could well be wrong, but looking at the code I can't understand why it is incorrect.
group_rel in the original code should be calculated by:
group_rel = block_group % EXT4_DESC_PER_BLOCK(sb);
No need to subtract s_first_meta_bg from brock_group. It will be equivalent what ext4_bg_num_gdb_meta() does
Quoted 56 lines
Review unsigned ext4_init_block_bitmap(struct s
Quoted 1 line
(quoted diff) +0
-0@@ -121,12 +121,7 @@ unsigned ext4_init_block_bitmap(struct sif (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) || block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) * sbi->s_desc_per_block) { if (bit_max) { bit_max += ext4_bg_num_gdb(sb, block_group); bit_max +=Review unsigned ext4_init_block_bitmap(struct s · line 125
Quoted 11 lines
(quoted diff) +1
-6le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks); } } else { /* For META_BG_BLOCK_GROUPS */ - int group_rel = (block_group - - le32_to_cpu(sbi->s_es->s_first_meta_bg)) % - EXT4_DESC_PER_BLOCK(sb); - if (group_rel == 0 || group_rel == 1 || - (group_rel == EXT4_DESC_PER_BLOCK(sb) - 1)) - bit_max += 1; + bit_max += ext4_bg_num_gdb(sb, block_group); }As you can see, the "if" checks if the block group is before
s_first_meta_bgto treat it as a "normal" group, and only uses the "else" once beyond the start of thes_first_meta_bglimit.It definitely is less complex to use
ext4_bg_num_gdb(), and this could further be simplified by usingext4_bg_gdb_meta()in the "else" clause. In fact, the whole if/else could be replaced withext4_bg_num_gdb()if it weren't fors_reserved_gdt_blocks.Maybe it makes sense (cleaner code, less chance for bugs) to change the
ext4_bg_num_gdb()function to take a parameter on whether it should include thes_reserved_gdt_blocksor not:static unsigned long ext4_bg_num_gdb_nometa(struct
super_block*sb, int group,
int reserved){ if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) && !ext4_group_sparse(group)) return 0; return EXT4_SB(sb)->s_gdb_count + reserved ? EXT4_SB(sb)->s_reserved_gdt_blocks : 0; }unsigned long
ext4_bg_num_gdb(struct super_block *sb, int group, int reserved){ unsigned long first_meta_bg = le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg); unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb); if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) || metagroup < first_meta_bg) return ext4_bg_num_gdb_nometa(sb, group, reserved); return ext4_bg_num_gdb_meta(sb, group); }
Quoted 4 lines
The fewer places in the code that need to understand
META_BG, the less chance of having a bug. Now the code inext4_init_block_bitmap()can be:bit_max += ext4_bg_num_gdb(sb, block_group, 1);
Looks good to me. But I'd like to divide into the change into simple bugfix and cleanup patch in order to clarify the each change.
Here is a bugfix only patch.
From: Akinobu Mita <[email protected]>
Subject: ext4: fix ext4_init_block_bitmap() for metablock block group
When meta_bg feature is enabled and s_first_meta_bg != 0, ext4_init_block_bitmap() miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)
group_rel in the original code should be calculated by:
group_rel = block_group % EXT4_DESC_PER_BLOCK(sb);
No need to subtract s_first_meta_bg from brock_group. It will be equivalent what ext4_bg_num_gdb_meta() does
--- fs/ext4/balloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/ext4/balloc.c +2 -3
@@ -121,9 +121,8 @@ unsigned ext4_init_block_bitmap(struct sle16_to_cpu (sbi->s_es->s_reserved_gdt_blocks); } }else {/* For META_BG_BLOCK_GROUPS */ -int group_rel = (block_group - -le32_to_cpu (sbi->s_es->s_first_meta_bg)) % -EXT4_DESC_PER_BLOCK (sb); +int group_rel = block_group %EXT4_DESC_PER_BLOCK (sb); +if (group_rel ==0 || group_rel ==1 || (group_rel ==EXT4_DESC_PER_BLOCK (sb) -1 )) bit_max +=1 ;
Andreas Dilger
Acked-byQuoted 19 lines · Akinobu Mita
Looks good to me. But I'd like to divide into the change into simple bugfix and cleanup patch in order to clarify the each change.
Here is a bugfix only patch.
From: Akinobu Mita <[email protected]>
Subject: ext4: fixext4_init_block_bitmap()for metablock block groupWhen
meta_bgfeature is enabled ands_first_meta_bg!= 0,ext4_init_block_bitmap()miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)
group_relin the original code should be calculated by:group_rel = block_group % EXT4_DESC_PER_BLOCK(sb);No need to subtract
s_first_meta_bgfrombrock_group. It will be equivalent whatext4_bg_num_gdb_meta()does
Quoted 6 lines
Signed-off-by Akinobu Mita <[email protected]>Cc Andrew Morton <[email protected]>Cc Stephen Tweedie <[email protected]>Cc Mingming Cao <[email protected]>Cc Theodore Tso <[email protected]>
Quoted 10 lines
--- fs/ext4/balloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)Index:
2.6-git/fs/ext4/balloc.c
===================================================================fs/ext4/balloc.c +0
-0@@ -121,9 +121,8 @@ unsigned ext4_init_block_bitmap(struct sle16_to_cpu (sbi->s_es->s_reserved_gdt_blocks);
fs/ext4/balloc.c unsigned ext4_init_block_bitmap(struct s · line 128
Quoted 10 lines
fs/ext4/balloc.c +2
-3} }else {/* For META_BG_BLOCK_GROUPS */ -int group_rel = (block_group - -le32_to_cpu (sbi->s_es->s_first_meta_bg)) % -EXT4_DESC_PER_BLOCK (sb); +int group_rel = block_group %EXT4_DESC_PER_BLOCK (sb); +if (group_rel ==0 || group_rel ==1 || (group_rel ==EXT4_DESC_PER_BLOCK (sb) -1 )) bit_max +=1 ;
Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.
Quoted 20 lines · Andreas Dilger
Quoted 19 lines · Akinobu Mita
Looks good to me. But I'd like to divide into the change into simple bugfix and cleanup patch in order to clarify the each change.
Here is a bugfix only patch.
From: Akinobu Mita <[email protected]>
Subject: ext4: fixext4_init_block_bitmap()for metablock block groupWhen
meta_bgfeature is enabled ands_first_meta_bg!= 0,ext4_init_block_bitmap()miscalculates the number of block used by the group descriptor table (0 or 1 for metablock block group)
group_relin the original code should be calculated by:group_rel = block_group % EXT4_DESC_PER_BLOCK(sb);No need to subtract
s_first_meta_bgfrombrock_group. It will be equivalent whatext4_bg_num_gdb_meta()does
Quoted 9 lines
Quoted 6 lines
Signed-off-by Akinobu Mita <[email protected]>Cc Andrew Morton <[email protected]>Cc Stephen Tweedie <[email protected]>Cc Mingming Cao <[email protected]>Cc Theodore Tso <[email protected]>Acked-by Andreas Dilger <[email protected]>
FYI, I have added this patch to patch queue
Mingming
Quoted 27 lines
Quoted 10 lines
--- fs/ext4/balloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)Index:
2.6-git/fs/ext4/balloc.c
===================================================================fs/ext4/balloc.c +0
-0@@ -121,9 +121,8 @@ unsigned ext4_init_block_bitmap(struct sle16_to_cpu (sbi->s_es->s_reserved_gdt_blocks);fs/ext4/balloc.c unsigned ext4_init_block_bitmap(struct s · line 128
Quoted 10 lines
fs/ext4/balloc.c +2
-3} }else {/* For META_BG_BLOCK_GROUPS */ -int group_rel = (block_group - -le32_to_cpu (sbi->s_es->s_first_meta_bg)) % -EXT4_DESC_PER_BLOCK (sb); +int group_rel = block_group %EXT4_DESC_PER_BLOCK (sb); +if (group_rel ==0 || group_rel ==1 || (group_rel ==EXT4_DESC_PER_BLOCK (sb) -1 )) bit_max +=1 ;Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.