f2fs: add a rw_sem to cover quota flag changes
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: add a rw_sem to cover quota flag changes
thread 1: thread 2:
writeback checkpoint
set QUOTA_NEED_FLUSH
clear QUOTA_NEED_FLUSHf2fs_dquot_commitdquot_commitclear_dquot_dirty
f2fs_quota_sync dquot_writeback_dquots nothing to commitcommit_dqblkquota_writef2fs_quota_write
waiting for f2fs_lock_op()
pass __need_flush_quota (no F2FS_DIRTY_QDATA)
-> up-to-date quota is not written
--- fs/f2fs/checkpoint.c | 26 ++++++++++++++++---------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 27 ++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 15 deletions(-)
fs/f2fs/checkpoint.c +16 -10
@@ -1131,17 +1131,23 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; + +down_write (&sbi->quota_sem);if (!is_journalled_quota (sbi)) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) + ret = true; +else if (get_pages (sbi,F2FS_DIRTY_QDATA )) + ret = true; +else + ret = false; +up_write (&sbi->quota_sem); +return ret; }/*
fs/f2fs/f2fs.h +1 -0
@@ -1250,6 +1250,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];
fs/f2fs/super.c +22 -5
@@ -1944,7 +1944,10 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type); +up_read (&sbi->quota_sem); +if (ret) goto out;
@@ -2074,32 +2077,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -2109,22 +2120,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -3233,6 +3249,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
Signature · 1 line
2.19.0.605.g01d371f741-goog
Chao Yu
maintainerQuoted 8 lines · Jaegeuk Kim
thread 1: thread 2:
writeback checkpoint
setQUOTA_NEED_FLUSH
clearQUOTA_NEED_FLUSHf2fs_dquot_commitdquot_commitclear_dquot_dirty
f2fs_quota_sync
Quoted 8 lines
dquot_writeback_dquotsnothing to commitcommit_dqblkquota_writef2fs_quota_write
waiting forf2fs_lock_op()
pass__need_flush_quota(noF2FS_DIRTY_QDATA)
At a glance, will it cause deadlock:
- f2fs_dquot_commit
- down_read(&sbi->quota_sem)
- block_operation
- f2fs_lock_all
- need_flush_quota
- down_write(&sbi->quota_sem)
- f2fs_quota_write
- f2fs_lock_op
Thanks,
Quoted 158 lines
-> up-to-date quota is not written
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/checkpoint.c | 26 ++++++++++++++++---------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 27 ++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 15 deletions(-)fs/f2fs/checkpoint.c +16
-10@@ -1131,17 +1131,23 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; + +down_write (&sbi->quota_sem);if (!is_journalled_quota (sbi)) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) + ret = true; +else if (get_pages (sbi,F2FS_DIRTY_QDATA )) + ret = true; +else + ret = false; +up_write (&sbi->quota_sem); +return ret; }/* fs/f2fs/f2fs.h +1
-0@@ -1250,6 +1250,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +22
-5@@ -1944,7 +1944,10 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type); +up_read (&sbi->quota_sem); +if (ret) goto out;@@ -2074,32 +2077,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2109,22 +2120,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3233,6 +3249,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
Jaegeuk Kim
maintainerthread 1: thread 2:
writeback checkpoint
set QUOTA_NEED_FLUSH
clear QUOTA_NEED_FLUSHf2fs_dquot_commitdquot_commitclear_dquot_dirty
f2fs_quota_sync dquot_writeback_dquots nothing to commitcommit_dqblkquota_writef2fs_quota_write
waiting for f2fs_lock_op()
pass __need_flush_quota (no F2FS_DIRTY_QDATA)
-> up-to-date quota is not written
---
v2 from v1:
- avoid deadlock.
- shorten the loop path
fs/f2fs/checkpoint.c | 40 ++++++++++++++++++++-------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 27 ++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 25 deletions(-)
fs/f2fs/checkpoint.c +20 -20
@@ -1131,17 +1131,26 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) + +if (!down_write_trylock (&sbi->quota_sem))return true; -return false; + +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) + ret = false; +else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) + ret = true; +else if (get_pages (sbi,F2FS_DIRTY_QDATA )) + ret = true; +else + ret = false; +up_write (&sbi->quota_sem); +return ret; }/*
@@ -1160,14 +1169,16 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); goto retry_flush_dents; } + +f2fs_unlock_all (sbi);clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH );/* only failed during mount/umount/freeze/quotactl */
@@ -1175,11 +1186,6 @@ static int block_operations(struct f2fs_sb_info *sbi)f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }
@@ -1201,12 +1207,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);
fs/f2fs/f2fs.h +1 -0
@@ -1250,6 +1250,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];
fs/f2fs/super.c +22 -5
@@ -1946,7 +1946,10 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type); +up_read (&sbi->quota_sem); +if (ret) goto out;
@@ -2076,32 +2079,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -2111,22 +2122,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -3235,6 +3251,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
Signature · 1 line
2.19.0.605.g01d371f741-goog
Chao Yu
Reviewed-byQuoted 17 lines · Jaegeuk Kim
thread 1: thread 2:
writeback checkpoint
setQUOTA_NEED_FLUSH
clearQUOTA_NEED_FLUSHf2fs_dquot_commitdquot_commitclear_dquot_dirty
f2fs_quota_syncdquot_writeback_dquotsnothing to commitcommit_dqblkquota_writef2fs_quota_write
waiting forf2fs_lock_op()
pass__need_flush_quota(noF2FS_DIRTY_QDATA)
Quoted 3 lines
-> up-to-date quota is not written
Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Jaegeuk Kim
maintainerTwo paths to update quota and f2fs_lock_op:
1.
- lock_op
| - quota_update
`- unlock_op
2.
- quota_update
- lock_op
`- unlock_op
But, we need to make a transaction on quota_update + lock_op in #2 case. So, this patch introduces:
1. lock_op
2. down_write
3. check __need_flush
4. up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to go
---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)
fs/f2fs/checkpoint.c +19 -22
@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/*
@@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }
@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);
fs/f2fs/f2fs.h +1 -0
@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];
fs/f2fs/super.c +21 -5
@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;
@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }
@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to go
Quoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.
- f2fs_dquot_commit
- down_read(&sbi->quota_sem)
- block_operation
- f2fs_lock_all
- need_flush_quota
- down_write(&sbi->quota_sem)
- f2fs_quota_write
- f2fs_lock_op
Why can't this happen?
Once more question, should we hold quota_sem during checkpoint to avoid further quota update? f2fs_lock_op can do this job as well?
Thanks,
Quoted 202 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +21
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
Jaegeuk Kim
maintainerQuoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_op
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?
I couldn't find write_dquot() call to make this happen, and f2fs_lock_op was not enough to cover quota updates. Current stress & power-cut tests are running for several days without problem with this patch.
Quoted 199 lines
Thanks,
Quoted 196 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +20
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }
Quoted 6 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 3274
Quoted 6 lines
fs/f2fs/super.c +1
-0init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_op
Quoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not
- f2fs_dquot_commit
- dquot_commit
->commit_dqblk (v2_write_dquot)
- qtree_write_dquot
->quota_write (f2fs_quota_write)
- f2fs_lock_op
Do you mean there is no such way that calling f2fs_lock_op() from f2fs_quota_write()? So that deadlock condition is not existing?
Thanks,
Quoted 210 lines
enough to cover quota updates. Current stress & power-cut tests are running for several days without problem with this patch.
Quoted 199 lines
Thanks,
Quoted 196 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +20
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }Quoted 6 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 3274
Quoted 6 lines
fs/f2fs/super.c +1
-0init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);.
Jaegeuk Kim
maintainerQuoted 55 lines · Chao Yu
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_opQuoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not-
f2fs_dquot_commit
-dquot_commit
->commit_dqblk (v2_write_dquot)
-qtree_write_dquot
->quota_write (f2fs_quota_write)
-f2fs_lock_op
Quoted 2 lines
Do you mean there is no such way that calling
f2fs_lock_op()fromf2fs_quota_write()? So that deadlock condition is not existing?
I mean write_dquot->f2fs_dquot_commit and block_operation seems not racing together.
Quoted 213 lines
Thanks,
Quoted 210 lines
enough to cover quota updates. Current stress & power-cut tests are running for several days without problem with this patch.
Quoted 199 lines
Thanks,
Quoted 196 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +20
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }Quoted 6 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 3274
Quoted 6 lines
fs/f2fs/super.c +1
-0init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);.
Quoted 56 lines · Jaegeuk Kim
Quoted 55 lines · Chao Yu
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_opQuoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not-
f2fs_dquot_commit
-dquot_commit
->commit_dqblk (v2_write_dquot)
-qtree_write_dquot
->quota_write (f2fs_quota_write)
-f2fs_lock_op
Quoted 5 lines
Quoted 2 lines
Do you mean there is no such way that calling
f2fs_lock_op()fromf2fs_quota_write()? So that deadlock condition is not existing?I mean
write_dquot->f2fs_dquot_commitandblock_operationseems not racing together.
quota ioctl has the path calling write_dquot->f2fs_dquot_commit as below, which can race with checkpoint().
- do_quotactl
- sb->s_qcop->quota_sync (f2fs_quota_sync)
- down_read(&sbi->quota_sem); ---- First
- dquot_writeback_dquots
- sb->dq_op->write_dquot (f2fs_dquot_commit)
- block_operation can race here
- down_read(&sbi->quota_sem); ---- Second
Thanks,
Quoted 216 lines
Quoted 214 lines
Thanks,
Quoted 210 lines
enough to cover quota updates. Current stress & power-cut tests are running for several days without problem with this patch.
Quoted 199 lines
Thanks,
Quoted 196 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +20
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }Quoted 6 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 3274
Quoted 6 lines
fs/f2fs/super.c +1
-0init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);.
.
Jaegeuk Kim
maintainerQuoted 66 lines · Chao Yu
Quoted 56 lines · Jaegeuk Kim
Quoted 55 lines · Chao Yu
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_opQuoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not-
f2fs_dquot_commit
-dquot_commit
->commit_dqblk (v2_write_dquot)
-qtree_write_dquot
->quota_write (f2fs_quota_write)
-f2fs_lock_opQuoted 5 lines
Quoted 2 lines
Do you mean there is no such way that calling
f2fs_lock_op()fromf2fs_quota_write()? So that deadlock condition is not existing?I mean
write_dquot->f2fs_dquot_commitandblock_operationseems not racing together.quota ioctl has the path calling
write_dquot->f2fs_dquot_commitas below, which can race withcheckpoint().
Quoted 7 lines
-
do_quotactl
-sb->s_qcop->quota_sync(f2fs_quota_sync)
-down_read(&sbi->quota_sem); ---- First
-dquot_writeback_dquots
-sb->dq_op->write_dquot(f2fs_dquot_commit)
-block_operationcan race here
-down_read(&sbi->quota_sem); ---- Second
Adding f2fs_lock_op() in f2fs_quota_sync() should be fine?
Quoted 219 lines
Thanks,
Quoted 216 lines
Quoted 214 lines
Thanks,
Quoted 210 lines
enough to cover quota updates. Current stress & power-cut tests are running for several days without problem with this patch.
Quoted 199 lines
Thanks,
Quoted 196 lines
fs/f2fs/checkpoint.c | 41 +++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 27 deletions(-)fs/f2fs/checkpoint.c +19
-22@@ -1131,17 +1131,24 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)static bool __need_flush_quota (struct f2fs_sb_info *sbi) { +bool ret = false; +if (!is_journalled_quota (sbi))return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) -return false; -if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) -return true; -if (get_pages (sbi,F2FS_DIRTY_QDATA )) -return true; -return false; + +down_write (&sbi->quota_sem); +if (is_sbi_flag_set (sbi,SBI_QUOTA_SKIP_FLUSH )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_REPAIR )) { + ret = false; + }else if (is_sbi_flag_set (sbi,SBI_QUOTA_NEED_FLUSH )) { +clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); + ret = true; + }else if (get_pages (sbi,F2FS_DIRTY_QDATA )) { + ret = true; + } +up_write (&sbi->quota_sem); +return ret; }/* @@ -1160,26 +1167,22 @@ static int block_operations(struct f2fs_sb_info *sbi)blk_start_plug (&plug); retry_flush_quotas: +f2fs_lock_all (sbi);if (__need_flush_quota (sbi)) {int locked;if (++cnt >DEFAULT_RETRY_QUOTA_FLUSH_COUNT ) {set_sbi_flag (sbi,SBI_QUOTA_SKIP_FLUSH ); -f2fs_lock_all (sbi); +set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); goto retry_flush_dents; } -clear_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +f2fs_unlock_all (sbi);/* only failed during mount/umount/freeze/quotactl */ locked =down_read_trylock (&sbi->sb->s_umount);f2fs_quota_sync (sbi->sb,-1 );if (locked)up_read (&sbi->sb->s_umount); - } - -f2fs_lock_all (sbi); -if (__need_flush_quota (sbi)) { -f2fs_unlock_all (sbi);cond_resched (); goto retry_flush_quotas; }@@ -1201,12 +1204,6 @@ static int block_operations(struct f2fs_sb_info *sbi)*/ down_write (&sbi->node_change); -if (__need_flush_quota (sbi)) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); - goto retry_flush_quotas; - } -if (get_pages (sbi,F2FS_DIRTY_IMETA )) {up_write (&sbi->node_change);f2fs_unlock_all (sbi);fs/f2fs/f2fs.h +1
-0@@ -1253,6 +1253,7 @@ struct f2fs_sb_info {block_t unusable_block_count;/* # of blocks saved by last cp */ unsigned int nquota_files;/* # of quota sysfile */ +struct rw_semaphore quota_sem;/* blocking cp for flags */ /* # of pages, see count_type */ atomic_t nr_pages[NR_COUNT_TYPE ];fs/f2fs/super.c +20
-5@@ -1964,6 +1964,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret) goto out;@@ -2001,6 +2002,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) out:if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2094,32 +2096,40 @@ static void f2fs_truncate_quota_inode_pages(struct super_block *sb)static int f2fs_dquot_commit (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_acquire (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_acquire (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); - +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_release (struct dquot *dquot) { +struct f2fs_sb_info *sbi =F2FS_SB (dquot->dq_sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_release (dquot);if (ret <0 ) -set_sbi_flag (F2FS_SB (dquot->dq_sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -2129,22 +2139,27 @@ static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot)struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_mark_dquot_dirty (dquot);/* if we are using journalled quota */ if (is_journalled_quota (sbi))set_sbi_flag (sbi,SBI_QUOTA_NEED_FLUSH ); +up_read (&sbi->quota_sem);return ret; }static int f2fs_dquot_commit_info (struct super_block *sb,int type) { +struct f2fs_sb_info *sbi =F2FS_SB (sb);int ret; +down_read (&sbi->quota_sem); ret =dquot_commit_info (sb, type);if (ret <0 ) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +up_read (&sbi->quota_sem);return ret; }@@ -3253,6 +3268,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) }Quoted 6 lines
fs/f2fs/super.c static int f2fs_fill_super(struct super_block *sb, void *data, int silent) · line 3274
Quoted 6 lines
fs/f2fs/super.c +1
-0init_rwsem (&sbi->cp_rwsem); +init_rwsem (&sbi->quota_sem);init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);.
.
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerQuoted 75 lines · Jaegeuk Kim
Quoted 66 lines · Chao Yu
Quoted 56 lines · Jaegeuk Kim
Quoted 55 lines · Chao Yu
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_opQuoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not-
f2fs_dquot_commit
-dquot_commit
->commit_dqblk (v2_write_dquot)
-qtree_write_dquot
->quota_write (f2fs_quota_write)
-f2fs_lock_opQuoted 5 lines
Quoted 2 lines
Do you mean there is no such way that calling
f2fs_lock_op()fromf2fs_quota_write()? So that deadlock condition is not existing?I mean
write_dquot->f2fs_dquot_commitandblock_operationseems not racing together.quota ioctl has the path calling
write_dquot->f2fs_dquot_commitas below, which can race withcheckpoint().Quoted 7 lines
-
do_quotactl
-sb->s_qcop->quota_sync(f2fs_quota_sync)
-down_read(&sbi->quota_sem); ---- First
-dquot_writeback_dquots
-sb->dq_op->write_dquot(f2fs_dquot_commit)
-block_operationcan race here
-down_read(&sbi->quota_sem); ---- Second
Quoted 1 line
Adding
f2fs_lock_op()inf2fs_quota_sync()should be fine?
Something like this?
--- fs/f2fs/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/f2fs/super.c +12 -0
@@ -1919,6 +1919,17 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +/* +* do_quotactl +* f2fs_quota_sync +* down_read(quota_sem) +* dquot_writeback_dquots() +* f2fs_dquot_commit +* block_operation +* down_read(quota_sem) +*/ +f2fs_lock_op (sbi); +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret)
@@ -1958,6 +1969,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR );up_read (&sbi->quota_sem); +f2fs_unlock_op (sbi);return ret; }
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 76 lines · Jaegeuk Kim
Quoted 75 lines · Jaegeuk Kim
Quoted 73 lines · Chao Yu
Quoted 56 lines · Jaegeuk Kim
Quoted 55 lines · Chao Yu
Quoted 40 lines · Jaegeuk Kim
Quoted 39 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Two paths to update quota and
f2fs_lock_op:1.
-lock_op
| -quota_update
`-unlock_op2.
-quota_update
-lock_op
`-unlock_opBut, we need to make a transaction on
quota_update+lock_opin #2 case. So, this patch introduces:
1.lock_op
2.down_write
3. check__need_flush
4.up_write
5. if there is dirty quota entries, flush them
6. otherwise, good to goQuoted 7 lines
Signed-off-by Jaegeuk Kim <[email protected]>---
v3 from v2:
- refactor to fix quota corruption issue
: it seems that the previous scenario is not real and no deadlock case was
encountered.-
f2fs_dquot_commit
-down_read(&sbi->quota_sem)
-block_operation
-f2fs_lock_all
-need_flush_quota
-down_write(&sbi->quota_sem)
-f2fs_quota_write
-f2fs_lock_opQuoted 6 lines
Quoted 4 lines
Why can't this happen?
Once more question, should we hold
quota_semduring checkpoint to avoid further quota update?f2fs_lock_opcan do this job as well?I couldn't find
write_dquot()call to make this happen, andf2fs_lock_opwas not-
f2fs_dquot_commit
-dquot_commit
->commit_dqblk (v2_write_dquot)
-qtree_write_dquot
->quota_write (f2fs_quota_write)
-f2fs_lock_opQuoted 5 lines
Quoted 2 lines
Do you mean there is no such way that calling
f2fs_lock_op()fromf2fs_quota_write()? So that deadlock condition is not existing?I mean
write_dquot->f2fs_dquot_commitandblock_operationseems not racing together.quota ioctl has the path calling
write_dquot->f2fs_dquot_commitas below, which can race withcheckpoint().-
do_quotactl
-sb->s_qcop->quota_sync(f2fs_quota_sync)
-down_read(&sbi->quota_sem); ---- First
-dquot_writeback_dquots
-sb->dq_op->write_dquot(f2fs_dquot_commit)
-block_operationcan race here
-down_read(&sbi->quota_sem); ---- Second
Quoted 3 lines
Quoted 1 line
Adding
f2fs_lock_op()inf2fs_quota_sync()should be fine?Something like this?
I'm okay with this diff. :)
Thanks,
Quoted 29 lines
--- fs/f2fs/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)fs/f2fs/super.c +11
-0@@ -1919,6 +1919,17 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; +/* +* do_quotactl +* f2fs_quota_sync +* down_read(quota_sem) +* dquot_writeback_dquots() +* f2fs_dquot_commit +* block_operation +* down_read(quota_sem) +*/ +f2fs_lock_op (sbi); +down_read (&sbi->quota_sem); ret =dquot_writeback_dquots (sb, type);if (ret)
fs/f2fs/super.c int f2fs_quota_sync(struct super_block *sb, int type) · line 1975
Quoted 7 lines
fs/f2fs/super.c +1
-0@@ -1958,6 +1969,7 @@ int f2fs_quota_sync(struct super_block *sb, int type)if (ret)set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR );up_read (&sbi->quota_sem); +f2fs_unlock_op (sbi);return ret; }
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel