From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E6C9C433EF for ; Thu, 23 Sep 2021 11:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3168610D1 for ; Thu, 23 Sep 2021 11:49:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240681AbhIWLv3 (ORCPT ); Thu, 23 Sep 2021 07:51:29 -0400 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:17614 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240645AbhIWLv1 (ORCPT ); Thu, 23 Sep 2021 07:51:27 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01424;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0UpKskVP_1632397782; Received: from B-P7TQMD6M-0146.local(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0UpKskVP_1632397782) by smtp.aliyun-inc.com(127.0.0.1); Thu, 23 Sep 2021 19:49:44 +0800 Date: Thu, 23 Sep 2021 19:49:42 +0800 From: Gao Xiang To: Yue Hu Cc: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org, huyue2@yulong.com, zhangwen@yulong.com, zbestahu@163.com Subject: Re: [PATCH] erofs: fix compacted_2b if compacted_4b_initial > totalidx Message-ID: References: <20210914035915.1190-1-zbestahu@gmail.com> <20210914125748.00003cd2.zbestahu@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210914125748.00003cd2.zbestahu@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 14, 2021 at 12:57:48PM +0800, Yue Hu wrote: > On Tue, 14 Sep 2021 12:37:14 +0800 > Gao Xiang wrote: > > > On Tue, Sep 14, 2021 at 11:59:15AM +0800, Yue Hu wrote: > > > From: Yue Hu > > > > > > Currently, the whole indexes will only be compacted 4B if > > > compacted_4b_initial > totalidx. So, the calculated compacted_2b > > > is worthless for that case. It may waste CPU resources. > > > > > > No need to update compacted_4b_initial as mkfs since it's used to > > > fulfill the alignment of the 1st compacted_2b pack and would handle > > > the case above. > > > > > > We also need to clarify compacted_4b_end here. It's used for the > > > last lclusters which aren't fitted in the previous compacted_2b > > > packs. > > > > > > Some messages are from Xiang. > > > > > > Signed-off-by: Yue Hu > > > > Looks good to me, > > Reviewed-by: Gao Xiang > > > > (although I think the subject title would be better changed into > > "clear compacted_2b if compacted_4b_initial > totalidx" > > Yeah, 'clear' is much better for this change. > > Thanks. > > > since 'fix'-likewise words could trigger some AI bot for stable > > kernel backporting..) > > > > Thanks, > > Gao Xiang > > > > > --- > > > fs/erofs/zmap.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c > > > index 9fb98d8..aeed404 100644 > > > --- a/fs/erofs/zmap.c > > > +++ b/fs/erofs/zmap.c > > > @@ -369,7 +369,8 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, > > > if (compacted_4b_initial == 32 / 4) > > > compacted_4b_initial = 0; > > > > > > - if (vi->z_advise & Z_EROFS_ADVISE_COMPACTED_2B) > > > + if ((vi->z_advise & Z_EROFS_ADVISE_COMPACTED_2B) && > > > + compacted_4b_initial <= totalidx) { btw, I've fixed up the build error due to redundant brace '{' when applying... Thanks, Gao Xiang > > > compacted_2b = rounddown(totalidx - compacted_4b_initial, 16); > > > else > > > compacted_2b = 0; > > > -- > > > 1.9.1