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=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 A2D3AC433F5 for ; Thu, 23 Sep 2021 15:13:39 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CD9761029 for ; Thu, 23 Sep 2021 15:13:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0CD9761029 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HFdwK50qYz2yw9 for ; Fri, 24 Sep 2021 01:13:37 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=QzbPTYuE; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=chao@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=QzbPTYuE; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HFdwG4bk6z2xXf for ; Fri, 24 Sep 2021 01:13:34 +1000 (AEST) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E3DE61107; Thu, 23 Sep 2021 15:13:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632410012; bh=mOC7FdQdjTIAxxIgBlh19xNgYctoW/1KW2f4ltIRwOs=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=QzbPTYuE/Ex9WyYsMRH5XreZ9GDgqJZtLVs7qppdnE3vytbbX06zTCivHQSSDGOmv vtfDFdG08lIEwEptWL/PinvZCMgLqCEOPLxeCZ/o3LHWd1mmpBtH277oUXrgKrW1KZ WjsL79EjIEXassRiWyDePshre5rskXK/T5rul5ATD9ygh6XqtM52AFFKHsSb6maU8C fCwMZRmNxV9T0e9W4CO/ph8OsOYof8ms9DycXLzmH/T19FejcF2Km/KFxR6+eExzG8 mDNGkLMW/GVfB2/ofPJCkSDy1wDMiYr25DfCN2Vas7XwrKX2+NUhtuZXB4ilBrF7p3 UfQtnhXUX963Q== Subject: Re: [PATCH] erofs: fix compacted_2b if compacted_4b_initial > totalidx To: Gao Xiang , Yue Hu References: <20210914035915.1190-1-zbestahu@gmail.com> <20210914125748.00003cd2.zbestahu@gmail.com> From: Chao Yu Message-ID: Date: Thu, 23 Sep 2021 23:13:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, zbestahu@163.com, huyue2@yulong.com, linux-erofs@lists.ozlabs.org, zhangwen@yulong.com Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" On 2021/9/23 19:49, Gao Xiang wrote: > 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... It looks good to me after above fix. Reviewed-by: Chao Yu Thanks,