f2fs: fix to relocate f2fs_balance_fs() in mkwrite()
PATCH 1/1 f2fs: fix to relocate f2fs_balance_fs() in mkwrite()
As Dinosaur Huang reported, there is a potential deadlock in between GC and mkwrite():
Thread A Thread B
- do_page_mkwrite
- f2fs_vm_page_mkwrite
- lock_page
- f2fs_balance_fs
- mutex_lock(gc_mutex)
- f2fs_gc
- do_garbage_collect
- ra_data_block
- grab_cache_page
- f2fs_balance_fs
- mutex_lock(gc_mutex)
In order to fix this, we just move f2fs_balance_fs() out of page lock's coverage in f2fs_vm_page_mkwrite().
--- fs/f2fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/file.c +2 -2
@@ -67,6 +67,8 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)f2fs_bug_on (sbi,f2fs_has_inline_data (inode)); +f2fs_balance_fs (sbi, true); +file_update_time (vmf->vma->vm_file);down_read (&F2FS_I (inode)->i_mmap_sem);lock_page (page);
@@ -120,8 +122,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);
Signature · 1 line
2.18.0.rc1
Jaegeuk Kim
maintainerHi Chao,
I was testing this.
https://github.com/jaegeuk/f2fs/commit/76be33b9f1fce70dd2d3f04f66d0f78b418fe3f5
Quoted 49 lines · Chao Yu
As Dinosaur Huang reported, there is a potential deadlock in between GC and
mkwrite():Thread A Thread B
-do_page_mkwrite
-f2fs_vm_page_mkwrite
-lock_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)
-f2fs_gc
-do_garbage_collect
-ra_data_block
-grab_cache_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)In order to fix this, we just move
f2fs_balance_fs()out of page lock's coverage inf2fs_vm_page_mkwrite().Reported-by Dinosaur Huang <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/f2fs/file.c +2
-2@@ -67,6 +67,8 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)f2fs_bug_on (sbi,f2fs_has_inline_data (inode)); +f2fs_balance_fs (sbi, true); +file_update_time (vmf->vma->vm_file);down_read (&F2FS_I (inode)->i_mmap_sem);lock_page (page);@@ -120,8 +122,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);Signature · 1 line
2.18.0.rc1
Hi Jaeguek,
Quoted 5 lines · Jaegeuk Kim
Hi Chao,
I was testing this.
https://github.com/jaegeuk/f2fs/commit/76be33b9f1fce70dd2d3f04f66d0f78b418fe3f5
The patch looks good.
BTW, do you mind adding below call stack into your patch? I guess it describes this ABBA deadlock with more details. :)
Thanks,
Quoted 53 lines · Chao Yu
Quoted 49 lines
As Dinosaur Huang reported, there is a potential deadlock in between GC and
mkwrite():Thread A Thread B
-do_page_mkwrite
-f2fs_vm_page_mkwrite
-lock_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)
-f2fs_gc
-do_garbage_collect
-ra_data_block
-grab_cache_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)In order to fix this, we just move
f2fs_balance_fs()out of page lock's coverage inf2fs_vm_page_mkwrite().Reported-by Dinosaur Huang <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/f2fs/file.c +2
-2@@ -67,6 +67,8 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)f2fs_bug_on (sbi,f2fs_has_inline_data (inode)); +f2fs_balance_fs (sbi, true); +file_update_time (vmf->vma->vm_file);down_read (&F2FS_I (inode)->i_mmap_sem);lock_page (page);@@ -120,8 +122,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);Signature · 1 line
2.18.0.rc1.