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=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 44EADC433E2 for ; Mon, 14 Sep 2020 14:21:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F34A92074B for ; Mon, 14 Sep 2020 14:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600093269; bh=cQyjucVY8CZsvRzxCHhH1L4lHDaLKcIcO8qKgRX20JI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AC5MAXAURrlpus5Zc6zGZ7xmLw8cIvMH+4ddwmqpZR0CyJS/O8MyuAwIxDZF+EZc1 ZXUc58+6yuMI9Lt6UlBmqEZW7KVeoBrZA8qxPxO6uQGCBltzd5amnugvZvQzFUEcFa EFQe6wS6bblam5Bz855/IoTEsEWF/m5vblipyxkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726820AbgINOUx (ORCPT ); Mon, 14 Sep 2020 10:20:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:60276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726689AbgINNGw (ORCPT ); Mon, 14 Sep 2020 09:06:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5FB9322283; Mon, 14 Sep 2020 13:05:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088740; bh=cQyjucVY8CZsvRzxCHhH1L4lHDaLKcIcO8qKgRX20JI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vNccOxXDI4kvh5tfXXhsPEAM6b3TZ9x7JHUvEPG+pugzyO04bg/AQmpeVE2+ijtC5 RImXK/NW9M4MH6e3CWKb8aZltJrfReKcsQaEDTRpoBCfLH67J/bEDaRJ88WmAV7di6 qT22CZ/JLO2DZHqpmP46cK0qvFaJXRFRM8oertR0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sahitya Tummala , Chao Yu , Jaegeuk Kim , Sasha Levin , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH AUTOSEL 4.14 11/15] f2fs: fix indefinite loop scanning for free nid Date: Mon, 14 Sep 2020 09:05:22 -0400 Message-Id: <20200914130526.1804913-11-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130526.1804913-1-sashal@kernel.org> References: <20200914130526.1804913-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sahitya Tummala [ Upstream commit e2cab031ba7b5003cd12185b3ef38f1a75e3dae8 ] If the sbi->ckpt->next_free_nid is not NAT block aligned and if there are free nids in that NAT block between the start of the block and next_free_nid, then those free nids will not be scanned in scan_nat_page(). This results into mismatch between nm_i->available_nids and the sum of nm_i->free_nid_count of all NAT blocks scanned. And nm_i->available_nids will always be greater than the sum of free nids in all the blocks. Under this condition, if we use all the currently scanned free nids, then it will loop forever in f2fs_alloc_nid() as nm_i->available_nids is still not zero but nm_i->free_nid_count of that partially scanned NAT block is zero. Fix this to align the nm_i->next_scan_nid to the first nid of the corresponding NAT block. Signed-off-by: Sahitya Tummala Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index e7b8e2b35e226..f8006f62c5467 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -2011,6 +2011,9 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount) if (unlikely(nid >= nm_i->max_nid)) nid = 0; + if (unlikely(nid % NAT_ENTRY_PER_BLOCK)) + nid = NAT_BLOCK_OFFSET(nid) * NAT_ENTRY_PER_BLOCK; + /* Enough entries */ if (nm_i->nid_cnt[FREE_NID_LIST] >= NAT_ENTRY_PER_BLOCK) return; -- 2.25.1