f2fs: fix to allow migrating fully valid segment
F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS needs to migrate all blocks of target segment to other place, no matter the segment has partially or fully valid blocks. However, after commit803e74be04("f2fs: stop GC when the victim becomes fully valid"), we may skip migration due to target segment is fully valid, result in failing the ioctl interface, fix this. Fixes:803e74be04("f2fs: stop GC when the victim becomes fully valid") Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
@@ -3547,7 +3547,7 @@ void f2fs_destroy_post_read_wq(struct f2fs_sb_info *sbi);
|
|||||||
int f2fs_start_gc_thread(struct f2fs_sb_info *sbi);
|
int f2fs_start_gc_thread(struct f2fs_sb_info *sbi);
|
||||||
void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi);
|
void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi);
|
||||||
block_t f2fs_start_bidx_of_node(unsigned int node_ofs, struct inode *inode);
|
block_t f2fs_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, bool force,
|
||||||
unsigned int segno);
|
unsigned int segno);
|
||||||
void f2fs_build_gc_manager(struct f2fs_sb_info *sbi);
|
void f2fs_build_gc_manager(struct f2fs_sb_info *sbi);
|
||||||
int f2fs_resize_fs(struct f2fs_sb_info *sbi, __u64 block_count);
|
int f2fs_resize_fs(struct f2fs_sb_info *sbi, __u64 block_count);
|
||||||
|
|||||||
@@ -1658,7 +1658,7 @@ next_alloc:
|
|||||||
if (has_not_enough_free_secs(sbi, 0,
|
if (has_not_enough_free_secs(sbi, 0,
|
||||||
GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi)))) {
|
GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi)))) {
|
||||||
down_write(&sbi->gc_lock);
|
down_write(&sbi->gc_lock);
|
||||||
err = f2fs_gc(sbi, true, false, NULL_SEGNO);
|
err = f2fs_gc(sbi, true, false, false, NULL_SEGNO);
|
||||||
if (err && err != -ENODATA && err != -EAGAIN)
|
if (err && err != -ENODATA && err != -EAGAIN)
|
||||||
goto out_err;
|
goto out_err;
|
||||||
}
|
}
|
||||||
@@ -2489,7 +2489,7 @@ static int f2fs_ioc_gc(struct file *filp, unsigned long arg)
|
|||||||
down_write(&sbi->gc_lock);
|
down_write(&sbi->gc_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = f2fs_gc(sbi, sync, true, NULL_SEGNO);
|
ret = f2fs_gc(sbi, sync, true, false, NULL_SEGNO);
|
||||||
out:
|
out:
|
||||||
mnt_drop_write_file(filp);
|
mnt_drop_write_file(filp);
|
||||||
return ret;
|
return ret;
|
||||||
@@ -2525,7 +2525,8 @@ do_more:
|
|||||||
down_write(&sbi->gc_lock);
|
down_write(&sbi->gc_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = f2fs_gc(sbi, range->sync, true, GET_SEGNO(sbi, range->start));
|
ret = f2fs_gc(sbi, range->sync, true, false,
|
||||||
|
GET_SEGNO(sbi, range->start));
|
||||||
if (ret) {
|
if (ret) {
|
||||||
if (ret == -EBUSY)
|
if (ret == -EBUSY)
|
||||||
ret = -EAGAIN;
|
ret = -EAGAIN;
|
||||||
@@ -2978,7 +2979,7 @@ static int f2fs_ioc_flush_device(struct file *filp, unsigned long arg)
|
|||||||
sm->last_victim[GC_CB] = end_segno + 1;
|
sm->last_victim[GC_CB] = end_segno + 1;
|
||||||
sm->last_victim[GC_GREEDY] = end_segno + 1;
|
sm->last_victim[GC_GREEDY] = end_segno + 1;
|
||||||
sm->last_victim[ALLOC_NEXT] = end_segno + 1;
|
sm->last_victim[ALLOC_NEXT] = end_segno + 1;
|
||||||
ret = f2fs_gc(sbi, true, true, start_segno);
|
ret = f2fs_gc(sbi, true, true, true, start_segno);
|
||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
ret = 0;
|
ret = 0;
|
||||||
else if (ret < 0)
|
else if (ret < 0)
|
||||||
|
|||||||
21
fs/f2fs/gc.c
21
fs/f2fs/gc.c
@@ -112,7 +112,7 @@ do_gc:
|
|||||||
sync_mode = F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_SYNC;
|
sync_mode = F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_SYNC;
|
||||||
|
|
||||||
/* if return value is not zero, no victim was selected */
|
/* if return value is not zero, no victim was selected */
|
||||||
if (f2fs_gc(sbi, sync_mode, true, NULL_SEGNO))
|
if (f2fs_gc(sbi, sync_mode, true, false, NULL_SEGNO))
|
||||||
wait_ms = gc_th->no_gc_sleep_time;
|
wait_ms = gc_th->no_gc_sleep_time;
|
||||||
|
|
||||||
trace_f2fs_background_gc(sbi->sb, wait_ms,
|
trace_f2fs_background_gc(sbi->sb, wait_ms,
|
||||||
@@ -1354,7 +1354,8 @@ out:
|
|||||||
* the victim data block is ignored.
|
* the victim data block is ignored.
|
||||||
*/
|
*/
|
||||||
static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
|
static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
|
||||||
struct gc_inode_list *gc_list, unsigned int segno, int gc_type)
|
struct gc_inode_list *gc_list, unsigned int segno, int gc_type,
|
||||||
|
bool force_migrate)
|
||||||
{
|
{
|
||||||
struct super_block *sb = sbi->sb;
|
struct super_block *sb = sbi->sb;
|
||||||
struct f2fs_summary *entry;
|
struct f2fs_summary *entry;
|
||||||
@@ -1383,8 +1384,8 @@ next_step:
|
|||||||
* race condition along with SSR block allocation.
|
* race condition along with SSR block allocation.
|
||||||
*/
|
*/
|
||||||
if ((gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) ||
|
if ((gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) ||
|
||||||
get_valid_blocks(sbi, segno, true) ==
|
(!force_migrate && get_valid_blocks(sbi, segno, true) ==
|
||||||
BLKS_PER_SEC(sbi))
|
BLKS_PER_SEC(sbi)))
|
||||||
return submitted;
|
return submitted;
|
||||||
|
|
||||||
if (check_valid_map(sbi, segno, off) == 0)
|
if (check_valid_map(sbi, segno, off) == 0)
|
||||||
@@ -1519,7 +1520,8 @@ static int __get_victim(struct f2fs_sb_info *sbi, unsigned int *victim,
|
|||||||
|
|
||||||
static int do_garbage_collect(struct f2fs_sb_info *sbi,
|
static int do_garbage_collect(struct f2fs_sb_info *sbi,
|
||||||
unsigned int start_segno,
|
unsigned int start_segno,
|
||||||
struct gc_inode_list *gc_list, int gc_type)
|
struct gc_inode_list *gc_list, int gc_type,
|
||||||
|
bool force_migrate)
|
||||||
{
|
{
|
||||||
struct page *sum_page;
|
struct page *sum_page;
|
||||||
struct f2fs_summary_block *sum;
|
struct f2fs_summary_block *sum;
|
||||||
@@ -1606,7 +1608,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
|
|||||||
gc_type);
|
gc_type);
|
||||||
else
|
else
|
||||||
submitted += gc_data_segment(sbi, sum->entries, gc_list,
|
submitted += gc_data_segment(sbi, sum->entries, gc_list,
|
||||||
segno, gc_type);
|
segno, gc_type,
|
||||||
|
force_migrate);
|
||||||
|
|
||||||
stat_inc_seg_count(sbi, type, gc_type);
|
stat_inc_seg_count(sbi, type, gc_type);
|
||||||
migrated++;
|
migrated++;
|
||||||
@@ -1634,7 +1637,7 @@ skip:
|
|||||||
}
|
}
|
||||||
|
|
||||||
int f2fs_gc(struct f2fs_sb_info *sbi, bool sync,
|
int f2fs_gc(struct f2fs_sb_info *sbi, bool sync,
|
||||||
bool background, unsigned int segno)
|
bool background, bool force, unsigned int segno)
|
||||||
{
|
{
|
||||||
int gc_type = sync ? FG_GC : BG_GC;
|
int gc_type = sync ? FG_GC : BG_GC;
|
||||||
int sec_freed = 0, seg_freed = 0, total_freed = 0;
|
int sec_freed = 0, seg_freed = 0, total_freed = 0;
|
||||||
@@ -1696,7 +1699,7 @@ gc_more:
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto stop;
|
goto stop;
|
||||||
|
|
||||||
seg_freed = do_garbage_collect(sbi, segno, &gc_list, gc_type);
|
seg_freed = do_garbage_collect(sbi, segno, &gc_list, gc_type, force);
|
||||||
if (gc_type == FG_GC &&
|
if (gc_type == FG_GC &&
|
||||||
seg_freed == f2fs_usable_segs_in_sec(sbi, segno))
|
seg_freed == f2fs_usable_segs_in_sec(sbi, segno))
|
||||||
sec_freed++;
|
sec_freed++;
|
||||||
@@ -1835,7 +1838,7 @@ static int free_segment_range(struct f2fs_sb_info *sbi,
|
|||||||
.iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS),
|
.iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS),
|
||||||
};
|
};
|
||||||
|
|
||||||
do_garbage_collect(sbi, segno, &gc_list, FG_GC);
|
do_garbage_collect(sbi, segno, &gc_list, FG_GC, true);
|
||||||
put_gc_inode(&gc_list);
|
put_gc_inode(&gc_list);
|
||||||
|
|
||||||
if (!gc_only && get_valid_blocks(sbi, segno, true)) {
|
if (!gc_only && get_valid_blocks(sbi, segno, true)) {
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
|
|||||||
*/
|
*/
|
||||||
if (has_not_enough_free_secs(sbi, 0, 0)) {
|
if (has_not_enough_free_secs(sbi, 0, 0)) {
|
||||||
down_write(&sbi->gc_lock);
|
down_write(&sbi->gc_lock);
|
||||||
f2fs_gc(sbi, false, false, NULL_SEGNO);
|
f2fs_gc(sbi, false, false, false, NULL_SEGNO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1865,7 +1865,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
|
|||||||
|
|
||||||
while (!f2fs_time_over(sbi, DISABLE_TIME)) {
|
while (!f2fs_time_over(sbi, DISABLE_TIME)) {
|
||||||
down_write(&sbi->gc_lock);
|
down_write(&sbi->gc_lock);
|
||||||
err = f2fs_gc(sbi, true, false, NULL_SEGNO);
|
err = f2fs_gc(sbi, true, false, false, NULL_SEGNO);
|
||||||
if (err == -ENODATA) {
|
if (err == -ENODATA) {
|
||||||
err = 0;
|
err = 0;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user