f2fs: attach inline_data after setting compression
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/3 f2fs: attach inline_data after setting compression
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
--- fs/f2fs/namei.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
fs/f2fs/namei.c +10 -6
@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );
@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );
@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );
@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +clear_inode_flag (inode,FI_INLINE_DATA );set_compress_context (inode);return ; }
Signature · 1 line
2.36.1.476.g0c4daa206d-goog
Jaegeuk Kim
maintainerPATCH 2/3 f2fs: run GCs synchronously given user requests
When users set GC_URGENT or GC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread.
--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/f2fs/gc.c +6 -2
@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;
@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {
@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
Signature · 8 lines
2.36.1.476.g0c4daa206d-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread.
.should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
Thanks,
Quoted 40 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +6
-2@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 8 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread..should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
I think it'll move a full section given .victim_segno is not NULL_SEGNO, as __get_victim will give a dirty segment all the time. wdyt?
Quoted 39 lines
Thanks,
Quoted 36 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +6
-2@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 6 lines · Jaegeuk Kim
Quoted 5 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread.
Quoted 6 lines
Quoted 3 lines
.should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
I think it'll move a full section given .victim_segno is not
NULL_SEGNO, as__get_victimwill give a dirty segment all the time. wdyt?
However, in gc_thread_fun() victim_segno is NULL_SEGNO all the time.
I guess .should_migrate_blocks should only be set to true for F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS case? rather than GC_URGENT or GC_MID case? See commit 7dede88659df ("f2fs: fix to allow migrating fully valid segment").
Thanks,
Quoted 32 lines
Quoted 32 lines
Thanks,
Quoted 28 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +3
-1@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)
Quoted 8 lines
Quoted 8 lines
fs/f2fs/gc.c static int gc_thread_func(void *data) · line 149
Quoted 8 lines
fs/f2fs/gc.c +3
-1if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 7 lines · Chao Yu
Quoted 6 lines · Jaegeuk Kim
Quoted 5 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
.should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
I think it'll move a full section given .victim_segno is not
NULL_SEGNO, as__get_victimwill give a dirty segment all the time. wdyt?However, in
gc_thread_fun()victim_segnoisNULL_SEGNOall the time.
What do you mean? The gc_thread thread sets NULL_SEGNO, which prevents from selecting the full section. But, f2fs_ioc_flush_device will set the segno to move, and f2fs_resize_fs calls do_garbage_collect directly.
Quoted 39 lines
I guess .should_migrate_blocks should only be set to true for F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS case? rather than
GC_URGENTorGC_MIDcase? See commit7dede88659df("f2fs: fix to allow migrating fully valid segment").Thanks,
Quoted 32 lines
Quoted 32 lines
Thanks,
Quoted 28 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +3
-1@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/f2fs/gc.c static int gc_thread_func(void *data) · line 149
Quoted 8 lines
fs/f2fs/gc.c +3
-1if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 12 lines · Jaegeuk Kim
Quoted 11 lines · Chao Yu
Quoted 10 lines · Jaegeuk Kim
Quoted 8 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread..should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
I think it'll move a full section given .victim_segno is not
NULL_SEGNO, as__get_victimwill give a dirty segment all the time. wdyt?However, in
gc_thread_fun()victim_segnoisNULL_SEGNOall the time.What do you mean? The
gc_threadthread setsNULL_SEGNO, which prevents from selecting the full section. But,f2fs_ioc_flush_devicewill set the segno to move, andf2fs_resize_fscallsdo_garbage_collectdirectly.
Yes, but I didn't get why this patch updates .should_migrate_blocks for gc_thread_func() case? If this is added to avoid breaking from below condition, I guess it's not necessary, since victim selected from gc_thread_func() will always be dirty, so get_valid_blocks(sbi, segno, true) == BLKS_PER_SEC(sbi) will be false anyway? or am I missing something?
/* * stop BG_GC if there is not enough free sections. * Or, stop GC if the segment becomes fully valid caused by * race condition along with SSR block allocation. */ if ((gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) || (!force_migrate && get_valid_blocks(sbi, segno, true) == BLKS_PER_SEC(sbi))) return submitted;
Thanks,
Quoted 48 lines
Quoted 48 lines
I guess .should_migrate_blocks should only be set to true for F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS case? rather than
GC_URGENTorGC_MIDcase? See commit7dede88659df("f2fs: fix to allow migrating fully valid segment").Thanks,
Quoted 40 lines
Quoted 40 lines
Thanks,
Quoted 36 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +6
-2@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 22 lines · Chao Yu
Quoted 12 lines · Jaegeuk Kim
Quoted 11 lines · Chao Yu
Quoted 10 lines · Jaegeuk Kim
Quoted 8 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread..should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
I think it'll move a full section given .victim_segno is not
NULL_SEGNO, as__get_victimwill give a dirty segment all the time. wdyt?However, in
gc_thread_fun()victim_segnoisNULL_SEGNOall the time.What do you mean? The
gc_threadthread setsNULL_SEGNO, which prevents from selecting the full section. But,f2fs_ioc_flush_devicewill set the segno to move, andf2fs_resize_fscallsdo_garbage_collectdirectly.
Quoted 5 lines
Yes, but I didn't get why this patch updates .should_migrate_blocks for
gc_thread_func()case? If this is added to avoid breaking from below condition, I guess it's not necessary, since victim selected fromgc_thread_func()will always be dirty, soget_valid_blocks(sbi, segno, true)==BLKS_PER_SEC(sbi)will be false anyway? or am I missing something?
I lost the previous test. :( IIRC, once I set GC_URGENT_HIGH, I've seen that f2fs_gc couldn't migrate blocks quickly, even or never succeeded. And, I also suspected the below condition tho, if I give force_migrate, it simply worked. I just realized that that may be caused by large sections having non-2MB-aligned zone capacity. Will check it again, as I found some buggy flows in that case.
Quoted 61 lines
/* * stop BG_GC if there is not enough free sections. * Or, stop GC if the segment becomes fully valid caused by * race condition along with SSR block allocation. */ if ((gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) || (!force_migrate && get_valid_blocks(sbi, segno, true) == BLKS_PER_SEC(sbi))) return submitted;Thanks,
Quoted 48 lines
Quoted 48 lines
I guess .should_migrate_blocks should only be set to true for F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS case? rather than
GC_URGENTorGC_MIDcase? See commit7dede88659df("f2fs: fix to allow migrating fully valid segment").Thanks,
Quoted 40 lines
Quoted 40 lines
Thanks,
Quoted 36 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +6
-2@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/3] f2fs: run GCs synchronously given user requests
Quoted 29 lines · Jaegeuk Kim
Quoted 22 lines · Chao Yu
Quoted 12 lines · Jaegeuk Kim
Quoted 11 lines · Chao Yu
Quoted 10 lines · Jaegeuk Kim
Quoted 8 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
When users set
GC_URGENTorGC_MID, they expected to do GCs right away. But, there's a condition to bypass it. Let's indicate we need to do now in the thread..should_migrate_blocks is used to force migrating blocks in full section, so what is the condition here? GC should not never select a full section, right?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
I think it'll move a full section given .victim_segno is not
NULL_SEGNO, as__get_victimwill give a dirty segment all the time. wdyt?However, in
gc_thread_fun()victim_segnoisNULL_SEGNOall the time.What do you mean? The
gc_threadthread setsNULL_SEGNO, which prevents from selecting the full section. But,f2fs_ioc_flush_devicewill set the segno to move, andf2fs_resize_fscallsdo_garbage_collectdirectly.Quoted 5 lines
Yes, but I didn't get why this patch updates .should_migrate_blocks for
gc_thread_func()case? If this is added to avoid breaking from below condition, I guess it's not necessary, since victim selected fromgc_thread_func()will always be dirty, soget_valid_blocks(sbi, segno, true)==BLKS_PER_SEC(sbi)will be false anyway? or am I missing something?
Quoted 6 lines
I lost the previous test. :( IIRC, once I set
GC_URGENT_HIGH, I've seen thatf2fs_gccouldn't migrate blocks quickly, even or never succeeded. And, I also suspected the below condition tho, if I giveforce_migrate, it simply worked. I just realized that that may be caused by large sections having non-2MB-aligned zone capacity. Will check it again, as I found some buggy flows in that case.
Let me drop this patch, since [1] series could fix the GC issue.
[1] https://lore.kernel.org/linux-f2fs-devel/[email protected]/T/#t
Quoted 68 lines
Quoted 54 lines
/* * stop BG_GC if there is not enough free sections. * Or, stop GC if the segment becomes fully valid caused by * race condition along with SSR block allocation. */ if ((gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) || (!force_migrate && get_valid_blocks(sbi, segno, true) == BLKS_PER_SEC(sbi))) return submitted;Thanks,
Quoted 40 lines
Quoted 40 lines
I guess .should_migrate_blocks should only be set to true for F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS case? rather than
GC_URGENTorGC_MIDcase? See commit7dede88659df("f2fs: fix to allow migrating fully valid segment").Thanks,
Quoted 32 lines
Quoted 32 lines
Thanks,
Quoted 28 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/f2fs/gc.c +3
-1@@ -37,7 +37,6 @@ static int gc_thread_func(void *data)unsigned int wait_ms;struct f2fs_gc_control gc_control = { .victim_segno =NULL_SEGNO , - .should_migrate_blocks = false, .err_gc_skipped = false }; wait_ms = gc_th->min_sleep_time;@@ -113,7 +112,10 @@ static int gc_thread_func(void *data) sbi->gc_mode == GC_URGENT_MID) { wait_ms = gc_th->urgent_sleep_time; f2fs_down_write(&sbi->gc_lock); + gc_control.should_migrate_blocks = true; goto do_gc; + } else { + gc_control.should_migrate_blocks = false; }if (foreground) {@@ -139,7 +141,9 @@ static int gc_thread_func(void *data)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/f2fs/gc.c static int gc_thread_func(void *data) · line 147
Quoted 8 lines
fs/f2fs/gc.c +3
-1if (!foreground)stat_inc_bggc_count (sbi->stat_info); - sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ; + sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC || + sbi->gc_mode ==GC_URGENT_HIGH || + sbi->gc_mode ==GC_URGENT_MID ;/* foreground GC was been triggered via f2fs_balance_fs() */ if (foreground)_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 3/3 f2fs: do not skip updating inode when retrying to flush node page
In reply to Jaegeuk KimLet's try to flush dirty inode again to improve subtle i_blocks mismatch.
--- fs/f2fs/node.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
fs/f2fs/node.c +2 -6
@@ -1943,7 +1943,6 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,for (i =0 ; i < nr_pages; i++) {struct page *page = pvec.pages[i];bool submitted = false; -bool may_dirty = true;/* give a priority to WB_SYNC threads */ if (atomic_read(&sbi->wb_sync_req[NODE]) &&
@@ -1996,11 +1995,8 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, }/* flush dirty inode */ -if (IS_INODE (page) && may_dirty) { - may_dirty = false; -if (flush_dirty_inode (page)) - goto lock_node; - } +if (IS_INODE (page) &&flush_dirty_inode (page)) + goto lock_node; write_node:f2fs_wait_on_page_writeback (page,NODE , true, true);
Signature · 8 lines
2.36.1.476.g0c4daa206d-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 3/3] f2fs: do not skip updating inode when retrying to flush node page
Quoted 3 lines · Jaegeuk Kim
Let's try to flush dirty inode again to improve subtle
i_blocksmismatch.Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Chao Yu
maintainerQuoted 51 lines · Jaegeuk Kim
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fixCc <[email protected]>Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)fs/f2fs/namei.c +8
-6@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 331
Quoted 5 lines
fs/f2fs/namei.c +2
-0@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +clear_inode_flag (inode,FI_INLINE_DATA );
if (is_inode_set_flag()) {
clear_inode_flag();
stat_dec_inline_inode();
}Thanks,
Quoted 3 lines
fs/f2fs/namei.c +0
-0set_compress_context (inode);return ; }
Chao Yu
maintainerQuoted 55 lines · Chao Yu
Quoted 54 lines · Jaegeuk Kim
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fixCc <[email protected]>Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)fs/f2fs/namei.c +8
-6@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ;
Quoted 7 lines
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 331
Quoted 2 lines
fs/f2fs/namei.c +2
-0+/* Do not use inline_data with compression */ +clear_inode_flag (inode,FI_INLINE_DATA );if (is_inode_set_flag()) { clear_inode_flag(); stat_dec_inline_inode(); }
Missed to send new version to mailing list?
Thanks,
Quoted 12 lines
Thanks,
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 334
Quoted 3 lines
fs/f2fs/namei.c +0
-0set_compress_context (inode);return ; }_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerQuoted 56 lines · Chao Yu
Quoted 46 lines · Chao Yu
Quoted 45 lines · Jaegeuk Kim
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fixCc <[email protected]>Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)fs/f2fs/namei.c +8
-6@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))Quoted 8 lines
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 331
Quoted 3 lines
fs/f2fs/namei.c +2
-0continue ; +/* Do not use inline_data with compression */ +clear_inode_flag (inode,FI_INLINE_DATA );if (is_inode_set_flag()) { clear_inode_flag(); stat_dec_inline_inode(); }
Quoted 3 lines
Missed to send new version to mailing list?
I'm testing the new version.
Quoted 15 lines
Thanks,
Quoted 12 lines
Thanks,
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 334
Quoted 3 lines
fs/f2fs/namei.c +0
-0set_compress_context (inode);return ; }_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerThis fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
--- fs/f2fs/namei.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/f2fs/namei.c +11 -6
@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );
@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );
@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );
@@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +stat_dec_inline_inode (inode); +clear_inode_flag (inode,FI_INLINE_DATA );set_compress_context (inode);return ; }
Signature · 8 lines
2.37.0.rc0.104.g0611611a94-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerQuoted 51 lines · Jaegeuk Kim
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fixCc <[email protected]>Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)fs/f2fs/namei.c +8
-6@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,if (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,f2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,set_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 332
Quoted 6 lines
fs/f2fs/namei.c +3
-0@@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +stat_dec_inline_inode (inode); +clear_inode_flag (inode,FI_INLINE_DATA );
It looks we don't need to dirty inode if there is no inline_data flag.
Thanks,
Quoted 3 lines
fs/f2fs/namei.c +0
-0set_compress_context (inode);return ; }
Chao Yu
maintainerQuoted 44 lines · Chao Yu
Quoted 43 lines · Jaegeuk Kim
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fixCc <[email protected]>Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")Signed-off-by Jaegeuk Kim <[email protected]>---
fs/f2fs/namei.c| 17 +++++++++++------1 file changed, 11 insertions(+), 6 deletions(-)fs/f2fs/namei.c +0
-6@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, if (test_opt(sbi, INLINE_XATTR)) set_inode_flag(inode, FI_INLINE_XATTR); - if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode)) - set_inode_flag(inode, FI_INLINE_DATA); if (f2fs_may_inline_dentry(inode)) set_inode_flag(inode, FI_INLINE_DENTRY);@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, f2fs_init_extent_tree(inode, NULL); - stat_inc_inline_xattr(inode); - stat_inc_inline_inode(inode); - stat_inc_inline_dir(inode); -F2FS_I(inode)->i_flags =
f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);fs/f2fs/namei.c +8
-0@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, set_compress_context(inode); } + /* Should enable inline_data after compression set */ + if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode)) + set_inode_flag(inode, FI_INLINE_DATA); + + stat_inc_inline_xattr(inode); + stat_inc_inline_inode(inode); + stat_inc_inline_dir(inode); + f2fs_set_inode_flags(inode); trace_f2fs_new_inode(inode, 0);
Quoted 8 lines
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 331
Quoted 6 lines
fs/f2fs/namei.c +3
-0@@ -325,6 +327,9 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, if (!is_extension_exist(name, ext[i], false)) continue; + /* Do not use inline_data with compression */ + stat_dec_inline_inode(inode); + clear_inode_flag(inode, FI_INLINE_DATA);It looks we don't need to dirty inode if there is no
inline_dataflag.
Oh, it looks set_compress_context() will dirty inode anyway.... :P
Thanks,
Quoted 12 lines
Thanks,
fs/f2fs/namei.c static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, · line 335
Quoted 3 lines
fs/f2fs/namei.c +0
-0set_compress_context(inode); return; }_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel