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=-18.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 7915BC433C1 for ; Thu, 25 Mar 2021 01:51:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0C6F361983 for ; Thu, 25 Mar 2021 01:51:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C6F361983 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net 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.90_1) (envelope-from ) id 1lPF9j-0001bD-An; Thu, 25 Mar 2021 01:51:27 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPF9h-0001b6-TT for linux-f2fs-devel@lists.sourceforge.net; Thu, 25 Mar 2021 01:51:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: 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=xm+jbCtKgDlGmXL3racoyiM9Ax08X4YjvykuaLiuBbc=; b=AaYfTWZFXT2q81m3jNFfPGbVbT cCrcKgCTfZRek6lrcknEKEySagtTX3Nih0SimsxuY9pnjz67G/fWD4RARFfF2l2hfuukGyrW1yfeN DB3WneVw7qtonB/IYnbDsz5XZST+nm6B3mtWas+XGwGPQ7VaRGBaLakDKq1vIuY0tzRw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding: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=xm+jbCtKgDlGmXL3racoyiM9Ax08X4YjvykuaLiuBbc=; b=ItgzqejnDKFBfDXsfDE9t8CEOR Sf42vSYwLTg+coPZFVE5oYwr7L2q5jeaVbkjxHYm/Uu6W4qJ84CN+Kt4uXbp+CuOBColscQBx76ZQ hA4S3I5CSHKXkBVKSHV/dLwy6NZ1cQvMfxER6fOurPxTWW9OstNWcUifVBb6FDN2/fxQ=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lPF9X-007m6r-A8 for linux-f2fs-devel@lists.sourceforge.net; Thu, 25 Mar 2021 01:51:25 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D0F9461983; Thu, 25 Mar 2021 01:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616637069; bh=avCX1lsj+Uyz9V6Mox+HrvdX/OqtY44z1L8hEcD4utI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mP6r5m4kEewb5zpF1t609YmKhGOqB33HTrGGYuNB9bvk6uYUc/pFWnnQzAWbOTekM aX6dOHavtAqzzikSeOtBZLJEw9qJ/6hhOYj6LVAaQuY1EIVwu5O+dUD/GCr+QqYA2F pONN08Cs+svQfDWE0IB365mzmTFksH0ORuhmMkPs3k5BNsfHNyF42k7KeCOXD9sQ/X 91MMx+D7zqOI3TVuloICpVTZAvvCdOuegQJcxJBWnd2m8cG1HCu8EZNolo0m7Dbvnq 0Pq/y7nwpO1d2WdpySHzOt34N45F6j1/oIFqyqaQL4wRarlm/2v4EwUHG/vYnpGrED L8T+NHcDC1OCg== Date: Wed, 24 Mar 2021 18:51:07 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20210324031828.67133-1-yuchao0@huawei.com> <8fd71953-05a9-61e4-2fb0-e1dcd65bbaa0@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <8fd71953-05a9-61e4-2fb0-e1dcd65bbaa0@huawei.com> X-Headers-End: 1lPF9X-007m6r-A8 Subject: Re: [f2fs-dev] [PATCH v2] f2fs: fix to avoid touching checkpointed data in get_victim() 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: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 03/25, Chao Yu wrote: > On 2021/3/25 7:49, Jaegeuk Kim wrote: > > On 03/24, Chao Yu wrote: > > > In CP disabling mode, there are two issues when using LFS or SSR | AT_SSR > > > mode to select victim: > > > > > > 1. LFS is set to find source section during GC, the victim should have > > > no checkpointed data, since after GC, section could not be set free for > > > reuse. > > > > > > Previously, we only check valid chpt blocks in current segment rather > > > than section, fix it. > > > > > > 2. SSR | AT_SSR are set to find target segment for writes which can be > > > fully filled by checkpointed and newly written blocks, we should never > > > select such segment, otherwise it can cause panic or data corruption > > > during allocation, potential case is described as below: > > > > > > a) target segment has 128 ckpt valid blocks > > > b) GC migrates 'n' (n < 512) valid blocks to other segment (segment is > > > still in dirty list) > > > c) GC migrates '512 - n' blocks to target segment (segment has 'n' > > > cp_vblocks and '512 - n' vblocks) > > > d) If GC selects target segment via {AT,}SSR allocator, however there > > > is no free space in targe segment. > > > > > > Fixes: 4354994f097d ("f2fs: checkpoint disabling") > > > Fixes: 093749e296e2 ("f2fs: support age threshold based garbage collection") > > > Signed-off-by: Chao Yu > > > --- > > > v2: > > > - fix to check checkpointed data in section rather than segment for > > > LFS mode. > > > - update commit title and message. > > > fs/f2fs/f2fs.h | 1 + > > > fs/f2fs/gc.c | 28 ++++++++++++++++++++-------- > > > fs/f2fs/segment.c | 39 ++++++++++++++++++++++++--------------- > > > fs/f2fs/segment.h | 14 +++++++++++++- > > > 4 files changed, 58 insertions(+), 24 deletions(-) > > > > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index eb154d9cb063..29e634d08a27 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -3387,6 +3387,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi); > > > int f2fs_disable_cp_again(struct f2fs_sb_info *sbi, block_t unusable); > > > void f2fs_release_discard_addrs(struct f2fs_sb_info *sbi); > > > int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra); > > > +bool segment_has_free_slot(struct f2fs_sb_info *sbi, int segno); > > > void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi); > > > void f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi); > > > void f2fs_restore_inmem_curseg(struct f2fs_sb_info *sbi); > > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > > > index d96acc6531f2..4d9616373a4a 100644 > > > --- a/fs/f2fs/gc.c > > > +++ b/fs/f2fs/gc.c > > > @@ -392,10 +392,6 @@ static void add_victim_entry(struct f2fs_sb_info *sbi, > > > if (p->gc_mode == GC_AT && > > > get_valid_blocks(sbi, segno, true) == 0) > > > return; > > > - > > > - if (p->alloc_mode == AT_SSR && > > > - get_seg_entry(sbi, segno)->ckpt_valid_blocks == 0) > > > - return; > > > } > > > for (i = 0; i < sbi->segs_per_sec; i++) > > > @@ -728,11 +724,27 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, > > > if (sec_usage_check(sbi, secno)) > > > goto next; > > > + > > > /* Don't touch checkpointed data */ > > > - if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED) && > > > - get_ckpt_valid_blocks(sbi, segno) && > > > - p.alloc_mode == LFS)) > > > - goto next; > > > + if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { > > > + if (p.alloc_mode == LFS) { > > > + /* > > > + * LFS is set to find source section during GC. > > > + * The victim should have no checkpointed data. > > > + */ > > > + if (get_ckpt_valid_blocks(sbi, segno, true)) > > > + goto next; > > > + } else { > > > + /* > > > + * SSR | AT_SSR are set to find target segment > > > + * for writes which can be full by checkpointed > > > + * and newly written blocks. > > > + */ > > > + if (!segment_has_free_slot(sbi, segno)) > > > + goto next; > > > + } > > > + } > > > + > > > if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) > > > goto next; > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > > > index 6e1a5f5657bf..f6a30856ceda 100644 > > > --- a/fs/f2fs/segment.c > > > +++ b/fs/f2fs/segment.c > > > @@ -865,7 +865,7 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno) > > > mutex_lock(&dirty_i->seglist_lock); > > > valid_blocks = get_valid_blocks(sbi, segno, false); > > > - ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno); > > > + ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno, false); > > > if (valid_blocks == 0 && (!is_sbi_flag_set(sbi, SBI_CP_DISABLED) || > > > ckpt_valid_blocks == usable_blocks)) { > > > @@ -950,7 +950,7 @@ static unsigned int get_free_segment(struct f2fs_sb_info *sbi) > > > for_each_set_bit(segno, dirty_i->dirty_segmap[DIRTY], MAIN_SEGS(sbi)) { > > > if (get_valid_blocks(sbi, segno, false)) > > > continue; > > > - if (get_ckpt_valid_blocks(sbi, segno)) > > > + if (get_ckpt_valid_blocks(sbi, segno, false)) > > > continue; > > > mutex_unlock(&dirty_i->seglist_lock); > > > return segno; > > > @@ -2643,6 +2643,26 @@ static void __refresh_next_blkoff(struct f2fs_sb_info *sbi, > > > seg->next_blkoff++; > > > } > > > +bool segment_has_free_slot(struct f2fs_sb_info *sbi, int segno) > > > +{ > > > + struct sit_info *sit = SIT_I(sbi); > > > + struct seg_entry *se = get_seg_entry(sbi, segno); > > > + int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long); > > > + unsigned long *target_map = SIT_I(sbi)->tmp_map; > > > + unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map; > > > + unsigned long *cur_map = (unsigned long *)se->cur_valid_map; > > > + int i, pos; > > > + > > > + down_write(&sit->sentry_lock); > > > > Should remove this lock. > > https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev > > Oh, correct. > > BTW, could you please add 'f2fs_' prefix for segment_has_free_slot() > like we did for other non-static symbols? Added. > > Thanks, > > > > > > + for (i = 0; i < entries; i++) > > > + target_map[i] = ckpt_map[i] | cur_map[i]; > > > + > > > + pos = __find_rev_next_zero_bit(target_map, sbi->blocks_per_seg, 0); > > > + up_write(&sit->sentry_lock); > > > + > > > + return pos < sbi->blocks_per_seg; > > > +} > > > + > > > /* > > > * This function always allocates a used segment(from dirty seglist) by SSR > > > * manner, so it should recover the existing segment information of valid blocks > > > @@ -2913,19 +2933,8 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type, > > > get_valid_blocks(sbi, curseg->segno, new_sec)) > > > goto alloc; > > > - if (new_sec) { > > > - unsigned int segno = START_SEGNO(curseg->segno); > > > - int i; > > > - > > > - for (i = 0; i < sbi->segs_per_sec; i++, segno++) { > > > - if (get_ckpt_valid_blocks(sbi, segno)) > > > - goto alloc; > > > - } > > > - } else { > > > - if (!get_ckpt_valid_blocks(sbi, curseg->segno)) > > > - return; > > > - } > > > - > > > + if (!get_ckpt_valid_blocks(sbi, curseg->segno, new_sec)) > > > + return; > > > alloc: > > > old_segno = curseg->segno; > > > SIT_I(sbi)->s_ops->allocate_segment(sbi, type, true); > > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > > > index 144980b62f9e..dab87ecba2b5 100644 > > > --- a/fs/f2fs/segment.h > > > +++ b/fs/f2fs/segment.h > > > @@ -359,8 +359,20 @@ static inline unsigned int get_valid_blocks(struct f2fs_sb_info *sbi, > > > } > > > static inline unsigned int get_ckpt_valid_blocks(struct f2fs_sb_info *sbi, > > > - unsigned int segno) > > > + unsigned int segno, bool use_section) > > > { > > > + if (use_section && __is_large_section(sbi)) { > > > + unsigned int start_segno = START_SEGNO(segno); > > > + unsigned int blocks = 0; > > > + int i; > > > + > > > + for (i = 0; i < sbi->segs_per_sec; i++, start_segno++) { > > > + struct seg_entry *se = get_seg_entry(sbi, start_segno); > > > + > > > + blocks += se->ckpt_valid_blocks; > > > + } > > > + return blocks; > > > + } > > > return get_seg_entry(sbi, segno)->ckpt_valid_blocks; > > > } > > > -- > > > 2.29.2 > > . > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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=-21.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 3AFF7C433C1 for ; Thu, 25 Mar 2021 01:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3A5461983 for ; Thu, 25 Mar 2021 01:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233525AbhCYBvS (ORCPT ); Wed, 24 Mar 2021 21:51:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:56910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233471AbhCYBvJ (ORCPT ); Wed, 24 Mar 2021 21:51:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D0F9461983; Thu, 25 Mar 2021 01:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616637069; bh=avCX1lsj+Uyz9V6Mox+HrvdX/OqtY44z1L8hEcD4utI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mP6r5m4kEewb5zpF1t609YmKhGOqB33HTrGGYuNB9bvk6uYUc/pFWnnQzAWbOTekM aX6dOHavtAqzzikSeOtBZLJEw9qJ/6hhOYj6LVAaQuY1EIVwu5O+dUD/GCr+QqYA2F pONN08Cs+svQfDWE0IB365mzmTFksH0ORuhmMkPs3k5BNsfHNyF42k7KeCOXD9sQ/X 91MMx+D7zqOI3TVuloICpVTZAvvCdOuegQJcxJBWnd2m8cG1HCu8EZNolo0m7Dbvnq 0Pq/y7nwpO1d2WdpySHzOt34N45F6j1/oIFqyqaQL4wRarlm/2v4EwUHG/vYnpGrED L8T+NHcDC1OCg== Date: Wed, 24 Mar 2021 18:51:07 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org Subject: Re: [PATCH v2] f2fs: fix to avoid touching checkpointed data in get_victim() Message-ID: References: <20210324031828.67133-1-yuchao0@huawei.com> <8fd71953-05a9-61e4-2fb0-e1dcd65bbaa0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8fd71953-05a9-61e4-2fb0-e1dcd65bbaa0@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/25, Chao Yu wrote: > On 2021/3/25 7:49, Jaegeuk Kim wrote: > > On 03/24, Chao Yu wrote: > > > In CP disabling mode, there are two issues when using LFS or SSR | AT_SSR > > > mode to select victim: > > > > > > 1. LFS is set to find source section during GC, the victim should have > > > no checkpointed data, since after GC, section could not be set free for > > > reuse. > > > > > > Previously, we only check valid chpt blocks in current segment rather > > > than section, fix it. > > > > > > 2. SSR | AT_SSR are set to find target segment for writes which can be > > > fully filled by checkpointed and newly written blocks, we should never > > > select such segment, otherwise it can cause panic or data corruption > > > during allocation, potential case is described as below: > > > > > > a) target segment has 128 ckpt valid blocks > > > b) GC migrates 'n' (n < 512) valid blocks to other segment (segment is > > > still in dirty list) > > > c) GC migrates '512 - n' blocks to target segment (segment has 'n' > > > cp_vblocks and '512 - n' vblocks) > > > d) If GC selects target segment via {AT,}SSR allocator, however there > > > is no free space in targe segment. > > > > > > Fixes: 4354994f097d ("f2fs: checkpoint disabling") > > > Fixes: 093749e296e2 ("f2fs: support age threshold based garbage collection") > > > Signed-off-by: Chao Yu > > > --- > > > v2: > > > - fix to check checkpointed data in section rather than segment for > > > LFS mode. > > > - update commit title and message. > > > fs/f2fs/f2fs.h | 1 + > > > fs/f2fs/gc.c | 28 ++++++++++++++++++++-------- > > > fs/f2fs/segment.c | 39 ++++++++++++++++++++++++--------------- > > > fs/f2fs/segment.h | 14 +++++++++++++- > > > 4 files changed, 58 insertions(+), 24 deletions(-) > > > > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index eb154d9cb063..29e634d08a27 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -3387,6 +3387,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi); > > > int f2fs_disable_cp_again(struct f2fs_sb_info *sbi, block_t unusable); > > > void f2fs_release_discard_addrs(struct f2fs_sb_info *sbi); > > > int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra); > > > +bool segment_has_free_slot(struct f2fs_sb_info *sbi, int segno); > > > void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi); > > > void f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi); > > > void f2fs_restore_inmem_curseg(struct f2fs_sb_info *sbi); > > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > > > index d96acc6531f2..4d9616373a4a 100644 > > > --- a/fs/f2fs/gc.c > > > +++ b/fs/f2fs/gc.c > > > @@ -392,10 +392,6 @@ static void add_victim_entry(struct f2fs_sb_info *sbi, > > > if (p->gc_mode == GC_AT && > > > get_valid_blocks(sbi, segno, true) == 0) > > > return; > > > - > > > - if (p->alloc_mode == AT_SSR && > > > - get_seg_entry(sbi, segno)->ckpt_valid_blocks == 0) > > > - return; > > > } > > > for (i = 0; i < sbi->segs_per_sec; i++) > > > @@ -728,11 +724,27 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, > > > if (sec_usage_check(sbi, secno)) > > > goto next; > > > + > > > /* Don't touch checkpointed data */ > > > - if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED) && > > > - get_ckpt_valid_blocks(sbi, segno) && > > > - p.alloc_mode == LFS)) > > > - goto next; > > > + if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { > > > + if (p.alloc_mode == LFS) { > > > + /* > > > + * LFS is set to find source section during GC. > > > + * The victim should have no checkpointed data. > > > + */ > > > + if (get_ckpt_valid_blocks(sbi, segno, true)) > > > + goto next; > > > + } else { > > > + /* > > > + * SSR | AT_SSR are set to find target segment > > > + * for writes which can be full by checkpointed > > > + * and newly written blocks. > > > + */ > > > + if (!segment_has_free_slot(sbi, segno)) > > > + goto next; > > > + } > > > + } > > > + > > > if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) > > > goto next; > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > > > index 6e1a5f5657bf..f6a30856ceda 100644 > > > --- a/fs/f2fs/segment.c > > > +++ b/fs/f2fs/segment.c > > > @@ -865,7 +865,7 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno) > > > mutex_lock(&dirty_i->seglist_lock); > > > valid_blocks = get_valid_blocks(sbi, segno, false); > > > - ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno); > > > + ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno, false); > > > if (valid_blocks == 0 && (!is_sbi_flag_set(sbi, SBI_CP_DISABLED) || > > > ckpt_valid_blocks == usable_blocks)) { > > > @@ -950,7 +950,7 @@ static unsigned int get_free_segment(struct f2fs_sb_info *sbi) > > > for_each_set_bit(segno, dirty_i->dirty_segmap[DIRTY], MAIN_SEGS(sbi)) { > > > if (get_valid_blocks(sbi, segno, false)) > > > continue; > > > - if (get_ckpt_valid_blocks(sbi, segno)) > > > + if (get_ckpt_valid_blocks(sbi, segno, false)) > > > continue; > > > mutex_unlock(&dirty_i->seglist_lock); > > > return segno; > > > @@ -2643,6 +2643,26 @@ static void __refresh_next_blkoff(struct f2fs_sb_info *sbi, > > > seg->next_blkoff++; > > > } > > > +bool segment_has_free_slot(struct f2fs_sb_info *sbi, int segno) > > > +{ > > > + struct sit_info *sit = SIT_I(sbi); > > > + struct seg_entry *se = get_seg_entry(sbi, segno); > > > + int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long); > > > + unsigned long *target_map = SIT_I(sbi)->tmp_map; > > > + unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map; > > > + unsigned long *cur_map = (unsigned long *)se->cur_valid_map; > > > + int i, pos; > > > + > > > + down_write(&sit->sentry_lock); > > > > Should remove this lock. > > https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev > > Oh, correct. > > BTW, could you please add 'f2fs_' prefix for segment_has_free_slot() > like we did for other non-static symbols? Added. > > Thanks, > > > > > > + for (i = 0; i < entries; i++) > > > + target_map[i] = ckpt_map[i] | cur_map[i]; > > > + > > > + pos = __find_rev_next_zero_bit(target_map, sbi->blocks_per_seg, 0); > > > + up_write(&sit->sentry_lock); > > > + > > > + return pos < sbi->blocks_per_seg; > > > +} > > > + > > > /* > > > * This function always allocates a used segment(from dirty seglist) by SSR > > > * manner, so it should recover the existing segment information of valid blocks > > > @@ -2913,19 +2933,8 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type, > > > get_valid_blocks(sbi, curseg->segno, new_sec)) > > > goto alloc; > > > - if (new_sec) { > > > - unsigned int segno = START_SEGNO(curseg->segno); > > > - int i; > > > - > > > - for (i = 0; i < sbi->segs_per_sec; i++, segno++) { > > > - if (get_ckpt_valid_blocks(sbi, segno)) > > > - goto alloc; > > > - } > > > - } else { > > > - if (!get_ckpt_valid_blocks(sbi, curseg->segno)) > > > - return; > > > - } > > > - > > > + if (!get_ckpt_valid_blocks(sbi, curseg->segno, new_sec)) > > > + return; > > > alloc: > > > old_segno = curseg->segno; > > > SIT_I(sbi)->s_ops->allocate_segment(sbi, type, true); > > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > > > index 144980b62f9e..dab87ecba2b5 100644 > > > --- a/fs/f2fs/segment.h > > > +++ b/fs/f2fs/segment.h > > > @@ -359,8 +359,20 @@ static inline unsigned int get_valid_blocks(struct f2fs_sb_info *sbi, > > > } > > > static inline unsigned int get_ckpt_valid_blocks(struct f2fs_sb_info *sbi, > > > - unsigned int segno) > > > + unsigned int segno, bool use_section) > > > { > > > + if (use_section && __is_large_section(sbi)) { > > > + unsigned int start_segno = START_SEGNO(segno); > > > + unsigned int blocks = 0; > > > + int i; > > > + > > > + for (i = 0; i < sbi->segs_per_sec; i++, start_segno++) { > > > + struct seg_entry *se = get_seg_entry(sbi, start_segno); > > > + > > > + blocks += se->ckpt_valid_blocks; > > > + } > > > + return blocks; > > > + } > > > return get_seg_entry(sbi, segno)->ckpt_valid_blocks; > > > } > > > -- > > > 2.29.2 > > . > >