From patchwork Thu Mar 23 21:39:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 74244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:560c:0:0:0:0:0 with SMTP id l12csp39417wrv; Thu, 23 Mar 2023 14:51:54 -0700 (PDT) X-Google-Smtp-Source: AKy350bgGo2uGJrFzLGJ6tzpV21A+Lqiqs/FOkCDP9U/rhQ/viJF3gK7zmOo+Q05LMw+o2bbd4IN X-Received: by 2002:a17:906:d8d0:b0:932:3688:ae81 with SMTP id re16-20020a170906d8d000b009323688ae81mr519423ejb.9.1679608314332; Thu, 23 Mar 2023 14:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679608314; cv=none; d=google.com; s=arc-20160816; b=m8pAtrPgrVdTlGDDIYCh6jpKKfy1t21VvIfjgrsn8giYmBkooHMes0hNmHl4SWtJW3 Zvj4N/MvgRFBFfX3nTTGqg6pUyRrRNvrkgaL7rveAjuEBh/LUfhg95IiJ5Q/g4jv16m0 MLlNGFkTFaMzolRB+z+aXGoj7p9lYoZxWgI7jETOoOJeLYG/DzUBfwmuc+Tyjzx/0qn6 VfSym7nYf3Itz8y5D+P34IyLe+r1SQYtrDMXd95ot5Zy4Fg14+Tn9oNqEeauaVCpm2V1 sm8zI+taDfyGy3IA5l55fLHGbTa9lduLI+zE7n86xWVlb+gTKG3sCQvuE8s+aoqtgQ1I MKNA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=yybaM4YIcDzuIhMj6qlTkhcBm4Gw0gal0LIhlGtgFh8=; b=FPOu6Eqgmm3TOGSKwM4CUK2WuYhzyby2nUrWFkff/PS2rdp0/SBLnxEKlZOYVALO93 gAfw68SJc6nh2GHY7grrBvvEbPTsq622LJYNKFrawOq1cMIhyuOISocghI5PzyuKCGWc c6Gs2qUIJzWvI5B+ZapKjfZlfCdT0vYhPFn4HYprgpOzS+pL3cxfIY9Ow2RH0SbwauTs L6rUsPAEy27v4sVOz+y/7Ssw7ZyiXnzw648EJAd4VPMarp15+SV18Hil3EV0NVIh1ITE Gy+rLgjfDXhyW0Y7e7s2+PHlkGhXSIN4lhxq/Uvjs1S2LZRt9grbTs5hS3KFraGNBxXK xfFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VgfIv3JL; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q6-20020a1709060f8600b009318c913c59si19227135ejj.525.2023.03.23.14.51.29; Thu, 23 Mar 2023 14:51:54 -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=@kernel.org header.s=k20201202 header.b=VgfIv3JL; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231515AbjCWVjo (ORCPT + 99 others); Thu, 23 Mar 2023 17:39:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231307AbjCWVj1 (ORCPT ); Thu, 23 Mar 2023 17:39:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B1A7212B9; Thu, 23 Mar 2023 14:39:22 -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 A5736628D9; Thu, 23 Mar 2023 21:39:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F247AC433D2; Thu, 23 Mar 2023 21:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679607561; bh=2wm98QIcutJIPgtolx5FVuBVp/ZTzCYN6ELSU1GVJ+E=; h=From:To:Cc:Subject:Date:From; b=VgfIv3JLWTq1Cz8h4wTsFvDi6OnP3/tmT4HLn/sDHRSwuw1Lh9uv94rv3Uk6+Gg2x vdpEUmUvTnYVYjoYEQQwgs3zUDGQGN+cJAdX64WlTWAtSdz9iuCCGnPRYT7+w7FhDV YmFMz8UlLL1t00HS+ZDBRTDUDNUY67y9ZHsbXXoG0Z3fVs42+xUfN24H3zjXlyEp2w ahesitRXao4kQ9t2c0tl6w+nGOu4h/fVQRi+b2tR67EUc0PoTR0Wf0jzXA4sfKVj89 OsYxSqKzOiLUjPMTOVwmniCt6Ozt6O8DOFZmaDBww0V4LCP6GRzqgMuHERN44zIUNg yFnMpSuswvY6g== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim , stable@vger.kernel.org Subject: [PATCH] f2fs: get out of a repeat loop when getting a locked data page Date: Thu, 23 Mar 2023 14:39:19 -0700 Message-Id: <20230323213919.1876157-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog MIME-Version: 1.0 X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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?1761196967606414692?= X-GMAIL-MSGID: =?utf-8?q?1761196967606414692?= https://bugzilla.kernel.org/show_bug.cgi?id=216050 Somehow we're getting a page which has a different mapping. Let's avoid the infinite loop. Cc: Signed-off-by: Jaegeuk Kim Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index bf51e6e4eb64..80702c93e885 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1329,18 +1329,14 @@ struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index, { struct address_space *mapping = inode->i_mapping; struct page *page; -repeat: + page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL); if (IS_ERR(page)) return page; /* wait for read completion */ lock_page(page); - if (unlikely(page->mapping != mapping)) { - f2fs_put_page(page, 1); - goto repeat; - } - if (unlikely(!PageUptodate(page))) { + if (unlikely(page->mapping != mapping || !PageUptodate(page))) { f2fs_put_page(page, 1); return ERR_PTR(-EIO); }