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 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 701D4CA6019 for ; Fri, 9 Oct 2026 11:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:References:In-Reply-To: Message-ID:Date:To:Sender:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Cd+NjCUZ2JdtiyK+r+0IWXz4KfZca9wSabQJEJ/2LVc=; b=TK7hSeHy8IASkrjareAQ/vtMAi phIamXnW/tgONlMm7xFE8qG+D1mk9p8pjDBR9yLG8MkOFQsI61cS2/D4+4hoCTnSvd7CX20MiZBu9 fVZgsDzoyr9DWnpPBv3Q8MD2JxntOCyLznemi7gIaesMZfOQgni4/9u4HPtj0i/s7Lgk=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1xF8fp-0004lt-HC; Fri, 09 Oct 2026 11:22:01 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1xF8fo-0004le-1T for linux-f2fs-devel@lists.sourceforge.net; Fri, 09 Oct 2026 11:22:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wkKYxpwXQrJN7QJ00Jh4R5X/o+mpVJfA6MnR/Y4L3Yg=; b=YlZhu930Il0h+GiIFPyy/P7t3n yJADzByOyekm87mHSqf242tsz4IHW/8CnokFNdoPNC2uasZhqynsyo4HVR8dcikobbiwMzCaX7Efw pdrvZ+sGw4GFeg0zBRWLj/WMl099OW24pGbLLhMbnyHAJDtgD1My05IS5Pni2lyrLuUs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=wkKYxpwXQrJN7QJ00Jh4R5X/o+mpVJfA6MnR/Y4L3Yg=; b=CwLh0xpzpJJdJoNWQY/jzN6rZs I8S6GJYh/p5usjsvjIBgrpUrXExanOStT65sLkMgE+oJREWsYKqKSBIJ6zrMPZN2xIGACfDjtFz/9 oXN341sS/g2xPOxOUVciOpwYro1gb7AvM5agLhAwPk9ZO0lOYxIp1rLiLlGJrE3v/qQI=; Received: from tor.source.kernel.org ([172.105.4.254]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1xF8fj-0005bR-PH for linux-f2fs-devel@lists.sourceforge.net; Fri, 09 Oct 2026 11:21:59 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 287D960DBE; Fri, 9 Oct 2026 11:21:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 734421F00893; Fri, 9 Oct 2026 11:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791544909; bh=wkKYxpwXQrJN7QJ00Jh4R5X/o+mpVJfA6MnR/Y4L3Yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OPl2TKjSs6yso7zTmbi1JtQbu0Hunkpt+dbV7ockUB21S8Zej/LeecyJrzF2eouCV kXUqXkEPW23IY8pfI7OxwFFN+TBi+C4+6irMosEF4AEslTS1rB5XGno4XQ6CK1p9fI Z4beufHbhlEO5Q6/IZSmX9JaVDzWUg0bvvWigrv+Q2JrwMeAfKVvvSkx/hcTiiZkZq 1W6P1RB28dnmcKKp/PwgvRugNHMeceB/XS1oQWZpcKzmEyr71SWWIAa4xYObbyfhwK WQHef6yVY7aDHgwZuZET5TcCJf6NjCZ87bwzRny3ifTyjm4ZrSL5uYwiLv3WlPEJ+X avggcW9d3bLUw== To: stable@vger.kernel.org Date: Fri, 9 Oct 2026 11:21:39 +0000 Message-ID: <20261009112140.2275137-2-chao@kernel.org> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog In-Reply-To: <20261009112140.2275137-1-chao@kernel.org> References: <20261009112140.2275137-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1xF8fj-0005bR-PH Subject: [f2fs-dev] [PATCH RESEND 6.6.y 2/3] f2fs: fix to shrink gc_lock coverage in f2fs_gc_range() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Chao Yu via Linux-f2fs-devel Reply-To: Chao Yu Cc: Sasha Levin , Daeho Jeong , Greg Kroah-Hartman , linux-f2fs-devel@lists.sourceforge.net, jaegeuk@kernel.org, stable@kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Chao Yu [ Upstream commit 5d49025a4e596c4c9ac0c519ef9f9a2c91396856 ] In f2fs_allocate_pinning_section(), we will hold gc_lock before calling f2fs_gc_range() to migrate section in conventional zone, we may suffer worse case because we may need to traverse and migrate multiple sections if we failed to move blocks in section due to lot of reasons: ENOMEM, fail to migrate block of pinfile, racing on i_gc_rwsem. To avoid hold gc_lock for long time to block checkpoint, let's hold the lock and only try to migrate one section. Cc: stable@kernel.org Fixes: 9703d69d9d15 ("f2fs: support file pinning for zoned devices") Cc: Daeho Jeong Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim [ Chao Yu: backport to 6.6.y: - drop file.c changes as f2fs_ioc_reserve_dev_alias() is not present in 6.6 - use f2fs_{down,up}_write(&sbi->gc_lock) as 6.6 lacks lock tracing - use IS_CURSEC() in gc.c as cursec pinning is not present in 6.6 - pass dry_run_sections == 0 to do_garbage_collect() as in 6.6 ] Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 2 +- fs/f2fs/gc.c | 33 ++++++++++++++++++++++++--------- fs/f2fs/segment.c | 4 +--- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 63d3450f895e..bf6f58c110f2 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3921,7 +3921,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control); void f2fs_build_gc_manager(struct f2fs_sb_info *sbi); int f2fs_gc_range(struct f2fs_sb_info *sbi, unsigned int start_seg, unsigned int end_seg, - bool dry_run, unsigned int dry_run_sections); + bool dry_run, unsigned int dry_run_sections, bool lock); int f2fs_resize_fs(struct file *filp, __u64 block_count); int __init f2fs_create_garbage_collection_cache(void); void f2fs_destroy_garbage_collection_cache(void); diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index ac21950f53cd..8a37461fc278 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -2034,7 +2034,7 @@ void f2fs_build_gc_manager(struct f2fs_sb_info *sbi) int f2fs_gc_range(struct f2fs_sb_info *sbi, unsigned int start_seg, unsigned int end_seg, - bool dry_run, unsigned int dry_run_sections) + bool dry_run, unsigned int dry_run_sections, bool lock) { unsigned int segno; unsigned int gc_secs = dry_run_sections; @@ -2045,29 +2045,44 @@ int f2fs_gc_range(struct f2fs_sb_info *sbi, .ilist = LIST_HEAD_INIT(gc_list.ilist), .iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS), }; + int err = 0; + + if (lock) + f2fs_down_write(&sbi->gc_lock); /* * avoid migrating empty section, as it can be allocated by * log in parallel. */ if (!get_valid_blocks(sbi, segno, true)) - continue; + goto next; if (IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, segno))) - continue; + goto next; do_garbage_collect(sbi, segno, &gc_list, FG_GC, dry_run_sections == 0); put_gc_inode(&gc_list); - if (!dry_run && get_valid_blocks(sbi, segno, true)) - return -EAGAIN; + if (!dry_run && get_valid_blocks(sbi, segno, true)) { + err = -EAGAIN; + goto next; + } if (dry_run && dry_run_sections && - !get_valid_blocks(sbi, segno, true) && --gc_secs == 0) - break; + !get_valid_blocks(sbi, segno, true)) { + --gc_secs; + goto next; + } if (fatal_signal_pending(current)) - return -ERESTARTSYS; + err = -ERESTARTSYS; +next: + if (lock) + f2fs_up_write(&sbi->gc_lock); + if (err) + return err; + if (dry_run && dry_run_sections && !gc_secs) + return 0; } return 0; @@ -2102,7 +2117,7 @@ static int free_segment_range(struct f2fs_sb_info *sbi, f2fs_allocate_segment_for_resize(sbi, type, start, end); /* do GC to move out valid blocks in the range */ - err = f2fs_gc_range(sbi, start, end, dry_run, 0); + err = f2fs_gc_range(sbi, start, end, dry_run, 0, false); if (err || dry_run) goto out; diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c5c94ac40860..6bc1b57a7835 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3147,9 +3147,7 @@ int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi) f2fs_unlock_op(sbi); if (f2fs_sb_has_blkzoned(sbi) && err && gc_required) { - f2fs_down_write(&sbi->gc_lock); - err = f2fs_gc_range(sbi, 0, GET_SEGNO(sbi, FDEV(0).end_blk), true, 1); - f2fs_up_write(&sbi->gc_lock); + err = f2fs_gc_range(sbi, 0, GET_SEGNO(sbi, FDEV(0).end_blk), true, 1, true); if (err) return err; err = f2fs_sync_fs(sbi->sb, 1); -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel