* [PATCH 1/2] f2fs: treat volatile file's data as hot one @ 2018-04-26 9:05 Chao Yu 2018-04-26 9:05 ` [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" Chao Yu 0 siblings, 1 reply; 4+ messages in thread From: Chao Yu @ 2018-04-26 9:05 UTC (permalink / raw) To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao, Chao Yu Volatile file's data will be updated oftenly, so it'd better to place its data into hot data segment. In addition, for atomic file, we change to check FI_ATOMIC_FILE instead of FI_HOT_DATA to make code readability better. Signed-off-by: Chao Yu <yuchao0@huawei.com> --- fs/f2fs/file.c | 2 -- fs/f2fs/segment.c | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index e88d94846d50..05b2045888a3 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1700,7 +1700,6 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) if (ret) goto out; skip_flush: - set_inode_flag(inode, FI_HOT_DATA); set_inode_flag(inode, FI_ATOMIC_FILE); clear_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST); f2fs_update_time(F2FS_I_SB(inode), REQ_TIME); @@ -1744,7 +1743,6 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp) ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true); if (!ret) { clear_inode_flag(inode, FI_ATOMIC_FILE); - clear_inode_flag(inode, FI_HOT_DATA); stat_dec_atomic_write(inode); } } else { diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 1fc23572067d..e339a5ff381f 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -314,7 +314,6 @@ void drop_inmem_pages(struct inode *inode) mutex_unlock(&fi->inmem_lock); clear_inode_flag(inode, FI_ATOMIC_FILE); - clear_inode_flag(inode, FI_HOT_DATA); stat_dec_atomic_write(inode); } @@ -1637,7 +1636,9 @@ static int __get_segment_type_6(struct f2fs_io_info *fio) if (is_cold_data(fio->page) || file_is_cold(inode)) return CURSEG_COLD_DATA; if (file_is_hot(inode) || - is_inode_flag_set(inode, FI_HOT_DATA)) + is_inode_flag_set(inode, FI_HOT_DATA) || + is_inode_flag_set(inode, FI_ATOMIC_FILE) || + is_inode_flag_set(inode, FI_VOLATILE_FILE)) return CURSEG_HOT_DATA; return rw_hint_to_seg_type(inode->i_write_hint); } else { -- 2.15.0.55.gc2ece9dc4de6 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" 2018-04-26 9:05 [PATCH 1/2] f2fs: treat volatile file's data as hot one Chao Yu @ 2018-04-26 9:05 ` Chao Yu 2018-04-27 2:55 ` Chao Yu 0 siblings, 1 reply; 4+ messages in thread From: Chao Yu @ 2018-04-26 9:05 UTC (permalink / raw) To: jaegeuk; +Cc: linux-kernel, linux-f2fs-devel For extreme case: 10 section, op = 10%, no_fggc_threshold = 90% All section usage: 85% 85% 85% 85% 90% 90% 95% 95% 95% 95% During foreground GC, if we skip select dirty section whose usage is larger than no_fggc_threshold, we can only recycle 80% invalid space from four 85% usage sections and two 90% usage sections, result in encountering out-of-space issue. This reverts commit e93b9865251a0503d83fd570e7d5a7c8bc351715 to fix this issue, besides, we keep the logic that we scan all dirty section when searching a victim, so that GC can select victim with least valid blocks. Signed-off-by: Chao Yu <yuchao0@huawei.com> --- fs/f2fs/f2fs.h | 3 --- fs/f2fs/gc.c | 16 ---------------- fs/f2fs/segment.h | 9 --------- 3 files changed, 28 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 64e3677998d8..9f8b327272df 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1192,9 +1192,6 @@ struct f2fs_sb_info { struct f2fs_gc_kthread *gc_thread; /* GC thread */ unsigned int cur_victim_sec; /* current victim section num */ - /* threshold for converting bg victims for fg */ - u64 fggc_threshold; - /* threshold for gc trials on pinned files */ u64 gc_pin_file_threshold; diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 3134dd781252..62eba4a71123 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -263,10 +263,6 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi) for_each_set_bit(secno, dirty_i->victim_secmap, MAIN_SECS(sbi)) { if (sec_usage_check(sbi, secno)) continue; - - if (no_fggc_candidate(sbi, secno)) - continue; - clear_bit(secno, dirty_i->victim_secmap); return GET_SEG_FROM_SEC(sbi, secno); } @@ -406,9 +402,6 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, goto next; if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) goto next; - if (gc_type == FG_GC && p.alloc_mode == LFS && - no_fggc_candidate(sbi, secno)) - goto next; cost = get_gc_cost(sbi, segno, &p); @@ -1152,17 +1145,8 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, void build_gc_manager(struct f2fs_sb_info *sbi) { - u64 main_count, resv_count, ovp_count; - DIRTY_I(sbi)->v_ops = &default_v_ops; - /* threshold of # of valid blocks in a section for victims of FG_GC */ - main_count = SM_I(sbi)->main_segments << sbi->log_blocks_per_seg; - resv_count = SM_I(sbi)->reserved_segments << sbi->log_blocks_per_seg; - ovp_count = SM_I(sbi)->ovp_segments << sbi->log_blocks_per_seg; - - sbi->fggc_threshold = div64_u64((main_count - ovp_count) * - BLKS_PER_SEC(sbi), (main_count - resv_count)); sbi->gc_pin_file_threshold = DEF_GC_FAILED_PINNED_FILES; /* give warm/cold data area from slower device */ diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 7702b054689c..c385daabcb67 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -774,15 +774,6 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type) - (base + 1) + type; } -static inline bool no_fggc_candidate(struct f2fs_sb_info *sbi, - unsigned int secno) -{ - if (get_valid_blocks(sbi, GET_SEG_FROM_SEC(sbi, secno), true) > - sbi->fggc_threshold) - return true; - return false; -} - static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno) { if (IS_CURSEC(sbi, secno) || (sbi->cur_victim_sec == secno)) -- 2.15.0.55.gc2ece9dc4de6 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" 2018-04-26 9:05 ` [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" Chao Yu @ 2018-04-27 2:55 ` Chao Yu 2018-05-05 5:37 ` Chao Yu 0 siblings, 1 reply; 4+ messages in thread From: Chao Yu @ 2018-04-27 2:55 UTC (permalink / raw) To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao Hi Jaegeuk, Missed this patch, or any problem in it? Thanks, On 2018/4/26 17:05, Chao Yu wrote: > For extreme case: > 10 section, op = 10%, no_fggc_threshold = 90% > All section usage: 85% 85% 85% 85% 90% 90% 95% 95% 95% 95% > > During foreground GC, if we skip select dirty section whose usage > is larger than no_fggc_threshold, we can only recycle 80% invalid > space from four 85% usage sections and two 90% usage sections, > result in encountering out-of-space issue. > > This reverts commit e93b9865251a0503d83fd570e7d5a7c8bc351715 to > fix this issue, besides, we keep the logic that we scan all dirty > section when searching a victim, so that GC can select victim with > least valid blocks. > > Signed-off-by: Chao Yu <yuchao0@huawei.com> > --- > fs/f2fs/f2fs.h | 3 --- > fs/f2fs/gc.c | 16 ---------------- > fs/f2fs/segment.h | 9 --------- > 3 files changed, 28 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 64e3677998d8..9f8b327272df 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1192,9 +1192,6 @@ struct f2fs_sb_info { > struct f2fs_gc_kthread *gc_thread; /* GC thread */ > unsigned int cur_victim_sec; /* current victim section num */ > > - /* threshold for converting bg victims for fg */ > - u64 fggc_threshold; > - > /* threshold for gc trials on pinned files */ > u64 gc_pin_file_threshold; > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > index 3134dd781252..62eba4a71123 100644 > --- a/fs/f2fs/gc.c > +++ b/fs/f2fs/gc.c > @@ -263,10 +263,6 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi) > for_each_set_bit(secno, dirty_i->victim_secmap, MAIN_SECS(sbi)) { > if (sec_usage_check(sbi, secno)) > continue; > - > - if (no_fggc_candidate(sbi, secno)) > - continue; > - > clear_bit(secno, dirty_i->victim_secmap); > return GET_SEG_FROM_SEC(sbi, secno); > } > @@ -406,9 +402,6 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, > goto next; > if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) > goto next; > - if (gc_type == FG_GC && p.alloc_mode == LFS && > - no_fggc_candidate(sbi, secno)) > - goto next; > > cost = get_gc_cost(sbi, segno, &p); > > @@ -1152,17 +1145,8 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, > > void build_gc_manager(struct f2fs_sb_info *sbi) > { > - u64 main_count, resv_count, ovp_count; > - > DIRTY_I(sbi)->v_ops = &default_v_ops; > > - /* threshold of # of valid blocks in a section for victims of FG_GC */ > - main_count = SM_I(sbi)->main_segments << sbi->log_blocks_per_seg; > - resv_count = SM_I(sbi)->reserved_segments << sbi->log_blocks_per_seg; > - ovp_count = SM_I(sbi)->ovp_segments << sbi->log_blocks_per_seg; > - > - sbi->fggc_threshold = div64_u64((main_count - ovp_count) * > - BLKS_PER_SEC(sbi), (main_count - resv_count)); > sbi->gc_pin_file_threshold = DEF_GC_FAILED_PINNED_FILES; > > /* give warm/cold data area from slower device */ > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > index 7702b054689c..c385daabcb67 100644 > --- a/fs/f2fs/segment.h > +++ b/fs/f2fs/segment.h > @@ -774,15 +774,6 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type) > - (base + 1) + type; > } > > -static inline bool no_fggc_candidate(struct f2fs_sb_info *sbi, > - unsigned int secno) > -{ > - if (get_valid_blocks(sbi, GET_SEG_FROM_SEC(sbi, secno), true) > > - sbi->fggc_threshold) > - return true; > - return false; > -} > - > static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno) > { > if (IS_CURSEC(sbi, secno) || (sbi->cur_victim_sec == secno)) > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" 2018-04-27 2:55 ` Chao Yu @ 2018-05-05 5:37 ` Chao Yu 0 siblings, 0 replies; 4+ messages in thread From: Chao Yu @ 2018-05-05 5:37 UTC (permalink / raw) To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao Ping, On 2018/4/27 10:55, Chao Yu wrote: > Hi Jaegeuk, > > Missed this patch, or any problem in it? > > Thanks, > > On 2018/4/26 17:05, Chao Yu wrote: >> For extreme case: >> 10 section, op = 10%, no_fggc_threshold = 90% >> All section usage: 85% 85% 85% 85% 90% 90% 95% 95% 95% 95% >> >> During foreground GC, if we skip select dirty section whose usage >> is larger than no_fggc_threshold, we can only recycle 80% invalid >> space from four 85% usage sections and two 90% usage sections, >> result in encountering out-of-space issue. >> >> This reverts commit e93b9865251a0503d83fd570e7d5a7c8bc351715 to >> fix this issue, besides, we keep the logic that we scan all dirty >> section when searching a victim, so that GC can select victim with >> least valid blocks. >> >> Signed-off-by: Chao Yu <yuchao0@huawei.com> >> --- >> fs/f2fs/f2fs.h | 3 --- >> fs/f2fs/gc.c | 16 ---------------- >> fs/f2fs/segment.h | 9 --------- >> 3 files changed, 28 deletions(-) >> >> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >> index 64e3677998d8..9f8b327272df 100644 >> --- a/fs/f2fs/f2fs.h >> +++ b/fs/f2fs/f2fs.h >> @@ -1192,9 +1192,6 @@ struct f2fs_sb_info { >> struct f2fs_gc_kthread *gc_thread; /* GC thread */ >> unsigned int cur_victim_sec; /* current victim section num */ >> >> - /* threshold for converting bg victims for fg */ >> - u64 fggc_threshold; >> - >> /* threshold for gc trials on pinned files */ >> u64 gc_pin_file_threshold; >> >> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c >> index 3134dd781252..62eba4a71123 100644 >> --- a/fs/f2fs/gc.c >> +++ b/fs/f2fs/gc.c >> @@ -263,10 +263,6 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi) >> for_each_set_bit(secno, dirty_i->victim_secmap, MAIN_SECS(sbi)) { >> if (sec_usage_check(sbi, secno)) >> continue; >> - >> - if (no_fggc_candidate(sbi, secno)) >> - continue; >> - >> clear_bit(secno, dirty_i->victim_secmap); >> return GET_SEG_FROM_SEC(sbi, secno); >> } >> @@ -406,9 +402,6 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, >> goto next; >> if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) >> goto next; >> - if (gc_type == FG_GC && p.alloc_mode == LFS && >> - no_fggc_candidate(sbi, secno)) >> - goto next; >> >> cost = get_gc_cost(sbi, segno, &p); >> >> @@ -1152,17 +1145,8 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, >> >> void build_gc_manager(struct f2fs_sb_info *sbi) >> { >> - u64 main_count, resv_count, ovp_count; >> - >> DIRTY_I(sbi)->v_ops = &default_v_ops; >> >> - /* threshold of # of valid blocks in a section for victims of FG_GC */ >> - main_count = SM_I(sbi)->main_segments << sbi->log_blocks_per_seg; >> - resv_count = SM_I(sbi)->reserved_segments << sbi->log_blocks_per_seg; >> - ovp_count = SM_I(sbi)->ovp_segments << sbi->log_blocks_per_seg; >> - >> - sbi->fggc_threshold = div64_u64((main_count - ovp_count) * >> - BLKS_PER_SEC(sbi), (main_count - resv_count)); >> sbi->gc_pin_file_threshold = DEF_GC_FAILED_PINNED_FILES; >> >> /* give warm/cold data area from slower device */ >> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h >> index 7702b054689c..c385daabcb67 100644 >> --- a/fs/f2fs/segment.h >> +++ b/fs/f2fs/segment.h >> @@ -774,15 +774,6 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type) >> - (base + 1) + type; >> } >> >> -static inline bool no_fggc_candidate(struct f2fs_sb_info *sbi, >> - unsigned int secno) >> -{ >> - if (get_valid_blocks(sbi, GET_SEG_FROM_SEC(sbi, secno), true) > >> - sbi->fggc_threshold) >> - return true; >> - return false; >> -} >> - >> static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno) >> { >> if (IS_CURSEC(sbi, secno) || (sbi->cur_victim_sec == secno)) >> > > > . > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-05 5:37 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-04-26 9:05 [PATCH 1/2] f2fs: treat volatile file's data as hot one Chao Yu 2018-04-26 9:05 ` [PATCH 2/2] Revert "f2fs: add ovp valid_blocks check for bg gc victim to fg_gc" Chao Yu 2018-04-27 2:55 ` Chao Yu 2018-05-05 5:37 ` Chao Yu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).