From nobody Fri Oct 24 20:29:25 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8853CC00140 for ; Mon, 15 Aug 2022 22:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352404AbiHOW5s (ORCPT ); Mon, 15 Aug 2022 18:57:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352531AbiHOW4Q (ORCPT ); Mon, 15 Aug 2022 18:56:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 081C230578; Mon, 15 Aug 2022 12:55:31 -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 ams.source.kernel.org (Postfix) with ESMTPS id D3AD0B8114A; Mon, 15 Aug 2022 19:55:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B910C433C1; Mon, 15 Aug 2022 19:55:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593328; bh=05avqxmYXFOy+Fb6qKZzCgRFhzrIHH+pxQNlBFNqTWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HQZ1nwn7A+ozVnbGR6uindWse91RcOCoKMaqWfZxSDLXLjN1/SHFc0z+iJBhXGQPU g6qfdss9I9puRevV+JqGl/qsQG5hbJGfrwhguOk17pnP7Od8SkP/genq7odnc9LHVm 60bLoFIdErKeF72/hvzFA5HdbnfPrBagxYxkZsm4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.18 0930/1095] f2fs: give priority to select unpinned section for foreground GC Date: Mon, 15 Aug 2022 20:05:29 +0200 Message-Id: <20220815180507.708748476@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chao Yu [ Upstream commit 71419129625a50cfb5e3c5cc215948a3f98c806d ] Previously, during foreground GC, if victims contain data of pinned file, it will fail migration of the data, and meanwhile i_gc_failures of that pinned file may increase, and when it exceeds threshold, GC will unpin the file, result in breaking pinfile's semantics. In order to mitigate such condition, let's record and skip section which has pinned file's data and give priority to select unpinned one. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/gc.c | 85 +++++++++++++++++++++++++++++++++++++++-------- fs/f2fs/segment.c | 8 +++++ fs/f2fs/segment.h | 3 ++ 3 files changed, 82 insertions(+), 14 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index a193862ad8a5..3009c0a97ab4 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -646,6 +646,54 @@ static void release_victim_entry(struct f2fs_sb_info *= sbi) f2fs_bug_on(sbi, !list_empty(&am->victim_list)); } =20 +static bool f2fs_pin_section(struct f2fs_sb_info *sbi, unsigned int segno) +{ + struct dirty_seglist_info *dirty_i =3D DIRTY_I(sbi); + unsigned int secno =3D GET_SEC_FROM_SEG(sbi, segno); + + if (!dirty_i->enable_pin_section) + return false; + if (!test_and_set_bit(secno, dirty_i->pinned_secmap)) + dirty_i->pinned_secmap_cnt++; + return true; +} + +static bool f2fs_pinned_section_exists(struct dirty_seglist_info *dirty_i) +{ + return dirty_i->pinned_secmap_cnt; +} + +static bool f2fs_section_is_pinned(struct dirty_seglist_info *dirty_i, + unsigned int secno) +{ + return dirty_i->enable_pin_section && + f2fs_pinned_section_exists(dirty_i) && + test_bit(secno, dirty_i->pinned_secmap); +} + +static void f2fs_unpin_all_sections(struct f2fs_sb_info *sbi, bool enable) +{ + unsigned int bitmap_size =3D f2fs_bitmap_size(MAIN_SECS(sbi)); + + if (f2fs_pinned_section_exists(DIRTY_I(sbi))) { + memset(DIRTY_I(sbi)->pinned_secmap, 0, bitmap_size); + DIRTY_I(sbi)->pinned_secmap_cnt =3D 0; + } + DIRTY_I(sbi)->enable_pin_section =3D enable; +} + +static int f2fs_gc_pinned_control(struct inode *inode, int gc_type, + unsigned int segno) +{ + if (!f2fs_is_pinned_file(inode)) + return 0; + if (gc_type !=3D FG_GC) + return -EBUSY; + if (!f2fs_pin_section(F2FS_I_SB(inode), segno)) + f2fs_pin_file_control(inode, true); + return -EAGAIN; +} + /* * This function is called from two paths. * One is garbage collection and the other is SSR segment selection. @@ -787,6 +835,9 @@ static int get_victim_by_default(struct f2fs_sb_info *s= bi, if (gc_type =3D=3D BG_GC && test_bit(secno, dirty_i->victim_secmap)) goto next; =20 + if (gc_type =3D=3D FG_GC && f2fs_section_is_pinned(dirty_i, secno)) + goto next; + if (is_atgc) { add_victim_entry(sbi, &p, segno); goto next; @@ -1201,12 +1252,9 @@ static int move_data_block(struct inode *inode, bloc= k_t bidx, goto out; } =20 - if (f2fs_is_pinned_file(inode)) { - if (gc_type =3D=3D FG_GC) - f2fs_pin_file_control(inode, true); - err =3D -EAGAIN; + err =3D f2fs_gc_pinned_control(inode, gc_type, segno); + if (err) goto out; - } =20 set_new_dnode(&dn, inode, NULL, NULL, 0); err =3D f2fs_get_dnode_of_data(&dn, bidx, LOOKUP_NODE); @@ -1351,12 +1399,9 @@ static int move_data_page(struct inode *inode, block= _t bidx, int gc_type, err =3D -EAGAIN; goto out; } - if (f2fs_is_pinned_file(inode)) { - if (gc_type =3D=3D FG_GC) - f2fs_pin_file_control(inode, true); - err =3D -EAGAIN; + err =3D f2fs_gc_pinned_control(inode, gc_type, segno); + if (err) goto out; - } =20 if (gc_type =3D=3D BG_GC) { if (PageWriteback(page)) { @@ -1476,14 +1521,15 @@ static int gc_data_segment(struct f2fs_sb_info *sbi= , struct f2fs_summary *sum, ofs_in_node =3D le16_to_cpu(entry->ofs_in_node); =20 if (phase =3D=3D 3) { + int err; + inode =3D f2fs_iget(sb, dni.ino); if (IS_ERR(inode) || is_bad_inode(inode) || special_file(inode->i_mode)) continue; =20 - if (is_inode_flag_set(inode, FI_PIN_FILE) && - gc_type =3D=3D FG_GC) { - f2fs_pin_file_control(inode, true); + err =3D f2fs_gc_pinned_control(inode, gc_type, segno); + if (err =3D=3D -EAGAIN) { iput(inode); return submitted; } @@ -1766,9 +1812,17 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, ret =3D -EINVAL; goto stop; } +retry: ret =3D __get_victim(sbi, &segno, gc_type); - if (ret) + if (ret) { + /* allow to search victim from sections has pinned data */ + if (ret =3D=3D -ENODATA && gc_type =3D=3D FG_GC && + f2fs_pinned_section_exists(DIRTY_I(sbi))) { + f2fs_unpin_all_sections(sbi, false); + goto retry; + } goto stop; + } =20 seg_freed =3D do_garbage_collect(sbi, segno, &gc_list, gc_type, force); if (gc_type =3D=3D FG_GC && @@ -1819,6 +1873,9 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, SIT_I(sbi)->last_victim[ALLOC_NEXT] =3D 0; SIT_I(sbi)->last_victim[FLUSH_DEVICE] =3D init_segno; =20 + if (gc_type =3D=3D FG_GC) + f2fs_unpin_all_sections(sbi, true); + trace_f2fs_gc_end(sbi->sb, ret, total_freed, sec_freed, get_pages(sbi, F2FS_DIRTY_NODES), get_pages(sbi, F2FS_DIRTY_DENTS), diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index aa0162664a1e..a914b70f8543 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -4653,6 +4653,13 @@ static int init_victim_secmap(struct f2fs_sb_info *s= bi) dirty_i->victim_secmap =3D f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); if (!dirty_i->victim_secmap) return -ENOMEM; + + dirty_i->pinned_secmap =3D f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); + if (!dirty_i->pinned_secmap) + return -ENOMEM; + + dirty_i->pinned_secmap_cnt =3D 0; + dirty_i->enable_pin_section =3D true; return 0; } =20 @@ -5241,6 +5248,7 @@ static void destroy_victim_secmap(struct f2fs_sb_info= *sbi) { struct dirty_seglist_info *dirty_i =3D DIRTY_I(sbi); =20 + kvfree(dirty_i->pinned_secmap); kvfree(dirty_i->victim_secmap); } =20 diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 1fa26a9603cb..8fbc9f6afa55 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -295,6 +295,9 @@ struct dirty_seglist_info { struct mutex seglist_lock; /* lock for segment bitmaps */ int nr_dirty[NR_DIRTY_TYPE]; /* # of dirty segments */ unsigned long *victim_secmap; /* background GC victims */ + unsigned long *pinned_secmap; /* pinned victims from foreground GC */ + unsigned int pinned_secmap_cnt; /* count of victims which has pinned dat= a */ + bool enable_pin_section; /* enable pinning section */ }; =20 /* victim selection function for cleaning and SSR */ --=20 2.35.1