From patchwork Mon Oct 24 11:33:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp459207wru; Mon, 24 Oct 2022 06:39:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5goIqlqRN8QOCDfl2+5JtiNaHbG9so3fRGYAhk1xG9xMWXvyHZ79zUTEmEW+3/Hzq+NzxH X-Received: by 2002:a17:907:845:b0:731:2f6c:6dbd with SMTP id ww5-20020a170907084500b007312f6c6dbdmr27454326ejb.551.1666618745632; Mon, 24 Oct 2022 06:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618745; cv=none; d=google.com; s=arc-20160816; b=kd5LITLkJ/igHzvDrkATNs8LwCfDcjsXbz9/Cf1cVhR/iGt+DI4WUM0gbqb6qZhuz7 t5PWS4c6YV7C2QLp1briIu0nj70IUx4KeoBRdMS3cpOZ4miUrXDsfieNNELj/WsyHX5t 87sZ/eMYCRwBtK1b9iJH+nYE1fVupMcA7u3mFitfAfctMg6CylLmUAeBHFC4J06yOdU8 q3ReQKwrhpn1uBP70f4BfUTu8eAJ2KSiPrYNu/lehI2+Oo/Zia1TK2SKCy5x9xWkgj5s 6ORV9Mnee0vzvhu218URT9Wr1lDB3w2fciLqkemyVs2b1QvSQbEpNeTPC1YM+Yk5ABMs KdOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PdXM0tSEvd7XBL3vR0Mie5ix/q5kIs0QcGP8p+Cjp0Q=; b=dn7nFn3AdEl4zhXnkjVchJEl7BElaGYpxNMWaiRZAIb3evdswjgjtUYDh+EgcOd0Xr Jt+3rzu80Jj1HGvFDI0l5SOcrBVQzsMePYLChyS1Y4ajwsmCuN4cM7Od1mspKZm+58/W D+nwpK7oZZYmx3nd8i+KmcQSL+McKigj2J6azjflJjG9W9B0eHYLZnzWhSIcvkdMmcMN L5TgcNQsDTtmWKNdLLlrK2qJhX9BN/h9YewIvguCnkNQ52cM6HpwoiLxzulREwawlbRb sCn9+CRjIEbyvKmQaIx64MxHSrp1NLjA3iHcqJULE9lHwpvMSPf7FjNBk+Hj80WWdlL5 6Qvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WmWeM7kM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dz13-20020a0564021d4d00b00453a0393deasi33133877edb.368.2022.10.24.06.38.41; Mon, 24 Oct 2022 06:39:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WmWeM7kM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231947AbiJXNfh (ORCPT + 99 others); Mon, 24 Oct 2022 09:35:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236348AbiJXNaw (ORCPT ); Mon, 24 Oct 2022 09:30:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C2733FD7B; Mon, 24 Oct 2022 05:33:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 32F6261313; Mon, 24 Oct 2022 12:33:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4313DC433C1; Mon, 24 Oct 2022 12:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614793; bh=nqodhHA0fSZ4fj1OvI0ZHU49pSobUpzwzF2u4uXB7xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WmWeM7kMrNSs60bZEc8Kp0bKjGRZP1MJ8vSa5vpqHbejGK2/Lpk7GlmFJTd9ukR7O IDNEmJznIubNE5VcVSpwx+lxdtHCzvyoPvbt4RF/B/EY3b/MBqeIl0HwnJKGVaR/XF NY+nEc6ouubAx13hGBMMzvwvJPiwj1e0Ac7gGd1g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim Subject: [PATCH 5.10 389/390] f2fs: fix wrong condition to trigger background checkpoint correctly Date: Mon, 24 Oct 2022 13:33:06 +0200 Message-Id: <20221024113039.529510342@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747576417980591820?= X-GMAIL-MSGID: =?utf-8?q?1747576417980591820?= From: Chao Yu commit cd6d697a6e2013a0a85f8b261b16c8cfd50c1f5f upstream. In f2fs_balance_fs_bg(), it needs to check both NAT_ENTRIES and INO_ENTRIES memory usage to decide whether we should skip background checkpoint, otherwise we may always skip checking INO_ENTRIES memory usage, so that INO_ENTRIES may potentially cause high memory footprint. Fixes: 493720a48543 ("f2fs: fix to avoid REQ_TIME and CP_TIME collision") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -550,7 +550,7 @@ void f2fs_balance_fs_bg(struct f2fs_sb_i goto do_sync; /* checkpoint is the only way to shrink partial cached entries */ - if (f2fs_available_free_memory(sbi, NAT_ENTRIES) || + if (f2fs_available_free_memory(sbi, NAT_ENTRIES) && f2fs_available_free_memory(sbi, INO_ENTRIES)) return;