Message ID | 20230321161220.418652-2-shikemeng@huaweicloud.com |
---|---|
State | Superseded |
Headers | show |
Series | Some fixes and cleanup to mballoc | expand |
On Wed, Mar 22, 2023 at 12:12:13AM +0800, Kemeng Shi wrote: > NRL_CHECK_SIZE will compare input req and size, so req and size should > be in same unit. Input req "fe_len" is in cluster unit while input > size "(8<<20)>>bsbits" is in block unit. Convert "fe_len" to block > unit to fix the mismatch. > > Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> > --- > fs/ext4/mballoc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c > index 63a68cee36c6..6318c763a239 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -4056,7 +4056,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, > start_off = ((loff_t)ac->ac_o_ex.fe_logical >> > (22 - bsbits)) << 22; > size = 4 * 1024 * 1024; > - } else if (NRL_CHECK_SIZE(ac->ac_o_ex.fe_len, > + } else if (NRL_CHECK_SIZE(EXT4_C2B(sbi, ac->ac_o_ex.fe_len), > (8<<20)>>bsbits, max, 8 * 1024)) { > start_off = ((loff_t)ac->ac_o_ex.fe_logical >> > (23 - bsbits)) << 23; > -- > 2.30.0 > Hi Kemeng, So I ran xfstests with bigalloc on Powerpc (64k pagesize/64k blocksize & 64k pagesize/4k blocksize) and everything looks good. Feel free to add: Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Regards, ojaswin
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 63a68cee36c6..6318c763a239 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4056,7 +4056,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, start_off = ((loff_t)ac->ac_o_ex.fe_logical >> (22 - bsbits)) << 22; size = 4 * 1024 * 1024; - } else if (NRL_CHECK_SIZE(ac->ac_o_ex.fe_len, + } else if (NRL_CHECK_SIZE(EXT4_C2B(sbi, ac->ac_o_ex.fe_len), (8<<20)>>bsbits, max, 8 * 1024)) { start_off = ((loff_t)ac->ac_o_ex.fe_logical >> (23 - bsbits)) << 23;
NRL_CHECK_SIZE will compare input req and size, so req and size should be in same unit. Input req "fe_len" is in cluster unit while input size "(8<<20)>>bsbits" is in block unit. Convert "fe_len" to block unit to fix the mismatch. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)