f2fs: add flush data in faster device to cold area
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: add flush data in faster device to cold area
This patch flushes data in faster device to cold area.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/f2fs.h | 6 ++++-- fs/f2fs/file.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- fs/f2fs/gc.c | 19 ++++++++++++++----- fs/f2fs/segment.c | 14 ++++++++++---- fs/f2fs/segment.h | 3 ++- 5 files changed, 83 insertions(+), 13 deletions(-)
fs/f2fs/f2fs.h +4 -2
@@ -280,6 +280,7 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,#define F2FS_IOC_DEFRAGMENT _IO(F2FS_IOCTL_MAGIC, 8)#define F2FS_IOC_MOVE_RANGE _IOWR(F2FS_IOCTL_MAGIC, 9, \ struct f2fs_move_range) +#define F2FS_IOC_FLUSH_DEVICE _IO(F2FS_IOCTL_MAGIC, 10)#define F2FS_IOC_SET_ENCRYPTION_POLICY FS_IOC_SET_ENCRYPTION_POLICY#define F2FS_IOC_GET_ENCRYPTION_POLICY FS_IOC_GET_ENCRYPTION_POLICY
@@ -941,7 +942,7 @@ struct f2fs_sb_info {int bg_gc;/* background gc calls */ unsigned int ndirty_inode[NR_INODE_TYPE ];/* # of dirty inodes */ #endif -unsigned int last_victim[2 ];/* last victim segment # */ +unsigned int last_victim[3 ];/* last victim segment # */ spinlock_t stat_lock;/* lock for stat operations */ /* For sysfs suppport */
@@ -2323,7 +2324,8 @@ int f2fs_migrate_page(struct address_space *mapping, struct page *newpage,int start_gc_thread (struct f2fs_sb_info *sbi);void stop_gc_thread (struct f2fs_sb_info *sbi);block_t start_bidx_of_node (unsigned int node_ofs,struct inode *inode); -int f2fs_gc (struct f2fs_sb_info *sbi,bool sync,bool background); +int f2fs_gc (struct f2fs_sb_info *sbi,bool sync,bool background, +unsigned int segno);void build_gc_manager (struct f2fs_sb_info *sbi);/*
fs/f2fs/file.c +53 -1
72 lines not on this page · raw message
fs/f2fs/gc.c +14 -5
@@ -84,7 +84,7 @@ static int gc_thread_func(void *data)stat_inc_bggc_count (sbi);/* if return value is not zero, no victim was selected */ -if (f2fs_gc (sbi,test_opt (sbi,FORCE_FG_GC ), true)) +if (f2fs_gc (sbi,test_opt (sbi,FORCE_FG_GC ), true,0 )) wait_ms = gc_th->no_gc_sleep_time; trace_f2fs_background_gc(sbi->sb, wait_ms,
@@ -308,6 +308,14 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, p.min_segno =NULL_SEGNO ; p.min_cost =get_max_cost (sbi, &p); +if (*result) { +if (IS_DATASEG (get_seg_entry (sbi, *result)->type) && +get_valid_blocks (sbi, *result, false) && + !sec_usage_check (sbi,GET_SEC_FROM_SEG (sbi, *result))) + p.min_segno = *result; + goto out; + } +if (p.max_search ==0 ) goto out;
@@ -912,7 +920,6 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,* - mutex_lock(sentry_lock) - change_curseg() * - lock_page(sum_page) */ -if (type ==SUM_TYPE_NODE )gc_node_segment (sbi, sum->entries, segno, gc_type);else
@@ -939,9 +946,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,return sec_freed; } -int f2fs_gc (struct f2fs_sb_info *sbi,bool sync,bool background) +int f2fs_gc (struct f2fs_sb_info *sbi,bool sync, +bool background,unsigned int segno) { -unsigned int segno;int gc_type = sync ?FG_GC :BG_GC ;int sec_freed =0 ;int ret = -EINVAL ;
@@ -990,8 +997,10 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, bool background) sbi->cur_victim_sec =NULL_SEGNO ;if (!sync) { -if (has_not_enough_free_secs (sbi, sec_freed,0 )) +if (has_not_enough_free_secs (sbi, sec_freed,0 )) { + segno =0 ; goto gc_more; + }if (gc_type ==FG_GC ) ret =write_checkpoint (sbi, &cpc);
fs/f2fs/segment.c +10 -4
@@ -401,7 +401,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)*/ if (has_not_enough_free_secs (sbi,0 ,0 )) {mutex_lock (&sbi->gc_mutex); -f2fs_gc (sbi, false, false); +f2fs_gc (sbi, false, false,0 ); } }
@@ -1566,6 +1566,8 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)if (type ==CURSEG_HOT_DATA ||IS_NODESEG (type))return 0 ; +if (sbi->last_victim[ALLOC_NEXT ]) +return sbi->last_victim[ALLOC_NEXT ];return CURSEG_I (sbi, type)->segno; }
@@ -1663,12 +1665,15 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type) {struct curseg_info *curseg =CURSEG_I (sbi, type);const struct victim_selection *v_ops =DIRTY_I (sbi)->v_ops; +unsigned segno =0 ;int i, cnt;bool reversed = false;/* need_SSR() already forces to do this */ -if (v_ops->get_victim (sbi, &(curseg)->next_segno,BG_GC , type,SSR )) +if (v_ops->get_victim (sbi, &segno,BG_GC , type,SSR )) { + curseg->next_segno = segno;return 1 ; + }/* For node segments, let's do SSR more intensively */ if (IS_NODESEG (type)) {
@@ -1692,9 +1697,10 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)for (; cnt-- >0 ; reversed ? i-- : i++) {if (i == type)continue ; -if (v_ops->get_victim (sbi, &(curseg)->next_segno, -BG_GC , i,SSR )) +if (v_ops->get_victim (sbi, &segno,BG_GC , i,SSR )) { + curseg->next_segno = segno;return 1 ; + } }return 0 ; }
fs/f2fs/segment.h +2 -1
@@ -138,7 +138,8 @@ enum {*/ enum {GC_CB =0 , -GC_GREEDY +GC_GREEDY , +ALLOC_NEXT , };/*
Signature · 1 line
2.11.0
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: avoid dirty node pages in check_only recovery
In the check_only mode, we should not make any dirty node pages. Otherwise, we can get this panic:
F2FS-fs (nvme0n1p1): Need to recover fsync data
------------[ cut here ]------------ kernel BUG at fs/f2fs/node.c:2204! CPU: 7 PID: 19923 Comm: mount Tainted: G OE 4.9.8 #2 RIP: 0010:[<ffffffffc0979c0b>] [<ffffffffc0979c0b>] flush_nat_entries+0x43b/0x7d0 [f2fs] Call Trace: [<ffffffffc096ddaa>] ? __f2fs_submit_merged_bio+0x5a/0xd0 [f2fs] [<ffffffffc096ddaa>] ? __f2fs_submit_merged_bio+0x5a/0xd0 [f2fs] [<ffffffffc096dddb>] ? __f2fs_submit_merged_bio+0x8b/0xd0 [f2fs] [<ffffffff860e450f>] ? up_write+0x1f/0x40 [<ffffffffc096dddb>] ? __f2fs_submit_merged_bio+0x8b/0xd0 [f2fs] [<ffffffffc0969f04>] write_checkpoint+0x2f4/0xf20 [f2fs] [<ffffffff860e938d>] ? trace_hardirqs_on+0xd/0x10 [<ffffffffc0960bc9>] ? f2fs_sync_fs+0x79/0x190 [f2fs] [<ffffffffc0960bc9>] ? f2fs_sync_fs+0x79/0x190 [f2fs] [<ffffffffc0960bd5>] f2fs_sync_fs+0x85/0x190 [f2fs] [<ffffffffc097b6de>] f2fs_balance_fs_bg+0x7e/0x1c0 [f2fs] [<ffffffffc0977b64>] f2fs_write_node_pages+0x34/0x350 [f2fs] [<ffffffff860e5f42>] ? __lock_is_held+0x52/0x70 [<ffffffff861d9b31>] do_writepages+0x21/0x30 [<ffffffff86298ce1>] __writeback_single_inode+0x61/0x760 [<ffffffff86909127>] ? _raw_spin_unlock+0x27/0x40 [<ffffffff8629a735>] writeback_single_inode+0xd5/0x190 [<ffffffff8629a889>] write_inode_now+0x99/0xc0 [<ffffffff86283876>] iput+0x1f6/0x2c0 [<ffffffffc0964b52>] f2fs_fill_super+0xc32/0x10c0 [f2fs] [<ffffffff86266462>] mount_bdev+0x182/0x1b0 [<ffffffffc0963f20>] ? f2fs_commit_super+0x100/0x100 [f2fs] [<ffffffffc0960da5>] f2fs_mount+0x15/0x20 [f2fs] [<ffffffff86266e08>] mount_fs+0x38/0x170 [<ffffffff86288bab>] vfs_kern_mount+0x6b/0x160 [<ffffffff8628bcfe>] do_mount+0x1be/0xd60
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/recovery.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/f2fs/recovery.c +5 -3
@@ -198,7 +198,8 @@ static void recover_inode(struct inode *inode, struct page *page) ino_of_node(page), name); } -static int find_fsync_dnodes (struct f2fs_sb_info *sbi,struct list_head *head) +static int find_fsync_dnodes (struct f2fs_sb_info *sbi,struct list_head *head, +bool check_only) {struct curseg_info *curseg;struct page *page =NULL ;
@@ -225,7 +226,8 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) entry =get_fsync_inode (head,ino_of_node (page));if (!entry) { -if (IS_INODE (page) &&is_dent_dnode (page)) { +if (!check_only && +IS_INODE (page) &&is_dent_dnode (page)) { err =recover_inode_page (sbi, page);if (err)break ;
@@ -569,7 +571,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)mutex_lock (&sbi->cp_mutex);/* step #1: find fsynced inode numbers */ - err =find_fsync_dnodes (sbi, &inode_list); + err =find_fsync_dnodes (sbi, &inode_list, check_only);if (err ||list_empty (&inode_list)) goto out;
Signature · 1 line
2.11.0