f2fs: Avoid double lock for cp_rwsem
PATCH 1/1 f2fs: Avoid double lock for cp_rwsem
Call stack :f2fs_write_checkpoint()
-> block_operations(sbi)
f2fs_lock_all(sbi);
down_write(&sbi->cp_rwsem); => write lock held
<>
-> f2fs_sync_node_pages()
if (is_inline_node(page))
flush_inline_data()
page = f2fs_pagecache_get_page()
if (!page)
goto iput_out;
iput_out:
iput(inode);
-> f2fs_evict_inode()
f2fs_truncate_blocks()
f2fs_lock_op()
down_read(&sbi->cp_rwsem); => read lock fail--- fs/f2fs/checkpoint.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/f2fs/checkpoint.c +4 -6
@@ -1219,21 +1219,19 @@ static int block_operations(struct f2fs_sb_info *sbi) goto retry_flush_quotas; } -retry_flush_nodes:down_write (&sbi->node_write);if (get_pages (sbi,F2FS_DIRTY_NODES )) {up_write (&sbi->node_write); +f2fs_unlock_all (sbi);atomic_inc (&sbi->wb_sync_req[NODE ]); err =f2fs_sync_node_pages (sbi, &wbc, false,FS_CP_NODE_IO );atomic_dec (&sbi->wb_sync_req[NODE ]); -if (err) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); +up_write (&sbi->node_change); +if (err) goto out; - }cond_resched (); - goto retry_flush_nodes; + goto retry_flush_quotas; }/*
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Chao Yu
maintainerHi Sayali,
Quoted 6 lines · Sayali Lokhande
Call stack :
f2fs_write_checkpoint()
->block_operations(sbi)f2fs_lock_all(sbi); down_write(&sbi->cp_rwsem); => write lock held<>
It looks the full race condition should be?
Thread B
- open()
- igrab()
- write() write inline data
- unlink()
Quoted 3 lines
->
f2fs_sync_node_pages()
if (is_inline_node(page))
flush_inline_data()
ilookup()
Quoted 4 lines
page = f2fs_pagecache_get_page()
if (!page)
goto iput_out;
iput_out: - close()
- iput()
Quoted 16 lines
iput(inode); -> f2fs_evict_inode() f2fs_truncate_blocks() f2fs_lock_op() down_read(&sbi->cp_rwsem); => read lock failSigned-off-by Sayali Lokhande <[email protected]>--- fs/f2fs/checkpoint.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/f2fs/checkpoint.c +0
-0
fs/f2fs/checkpoint.c static int block_operations(struct f2fs_sb_info *sbi) · line 1225
Quoted 8 lines
fs/f2fs/checkpoint.c +0
-1@@ -1219,21 +1219,19 @@ static int block_operations(struct f2fs_sb_info *sbi) goto retry_flush_quotas; } -retry_flush_nodes:down_write (&sbi->node_write);if (get_pages (sbi,F2FS_DIRTY_NODES )) {up_write (&sbi->node_write);
Call up_write(&sbi->node_change) here could wake up threads earlier who hang on this lock, how do you think?
Thanks,
Quoted 18 lines
fs/f2fs/checkpoint.c +4
-5+f2fs_unlock_all (sbi);atomic_inc (&sbi->wb_sync_req[NODE ]); err =f2fs_sync_node_pages (sbi, &wbc, false,FS_CP_NODE_IO );atomic_dec (&sbi->wb_sync_req[NODE ]); -if (err) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); +up_write (&sbi->node_change); +if (err) goto out; - }cond_resched (); - goto retry_flush_nodes; + goto retry_flush_quotas; }/*
Jaegeuk Kim
maintainerQuoted 18 lines · Sayali Lokhande
Call stack :
f2fs_write_checkpoint()
->block_operations(sbi)f2fs_lock_all(sbi); down_write(&sbi->cp_rwsem); => write lock held <> -> f2fs_sync_node_pages() if (is_inline_node(page)) flush_inline_data() page = f2fs_pagecache_get_page() if (!page) goto iput_out; iput_out: iput(inode); -> f2fs_evict_inode() f2fs_truncate_blocks() f2fs_lock_op() down_read(&sbi->cp_rwsem); => read lock fail
How about this, since we don't actually need to flush inline_data?
fs/f2fs/node.c +1 -1
@@ -1871,7 +1871,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, }/* flush inline_data */ -if (is_inline_node (page)) { +if (is_inline_node (page) && io_type !=FS_CP_NODE_IO ) {clear_inline_node (page);unlock_page (page);flush_inline_data (sbi,ino_of_node (page));
Quoted 39 lines
Signed-off-by Sayali Lokhande <[email protected]>--- fs/f2fs/checkpoint.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/f2fs/checkpoint.c +4
-6@@ -1219,21 +1219,19 @@ static int block_operations(struct f2fs_sb_info *sbi) goto retry_flush_quotas; } -retry_flush_nodes:down_write (&sbi->node_write);if (get_pages (sbi,F2FS_DIRTY_NODES )) {up_write (&sbi->node_write); +f2fs_unlock_all (sbi);atomic_inc (&sbi->wb_sync_req[NODE ]); err =f2fs_sync_node_pages (sbi, &wbc, false,FS_CP_NODE_IO );atomic_dec (&sbi->wb_sync_req[NODE ]); -if (err) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); +up_write (&sbi->node_change); +if (err) goto out; - }cond_resched (); - goto retry_flush_nodes; + goto retry_flush_quotas; }/* Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Jaegeuk Kim
maintainerQuoted 20 lines · Jaegeuk Kim
Quoted 18 lines · Sayali Lokhande
Call stack :
f2fs_write_checkpoint()
->block_operations(sbi)f2fs_lock_all(sbi); down_write(&sbi->cp_rwsem); => write lock held <> -> f2fs_sync_node_pages() if (is_inline_node(page)) flush_inline_data() page = f2fs_pagecache_get_page() if (!page) goto iput_out; iput_out: iput(inode); -> f2fs_evict_inode() f2fs_truncate_blocks() f2fs_lock_op() down_read(&sbi->cp_rwsem); => read lock fail
Quoted 1 line
How about this, since we don't actually need to flush
inline_data?
Hmm, nvm. This causes no space panic regressed during xfstests.
Quoted 50 lines
fs/f2fs/node.c +1
-1@@ -1871,7 +1871,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, }/* flush inline_data */ -if (is_inline_node (page)) { +if (is_inline_node (page) && io_type !=FS_CP_NODE_IO ) {clear_inline_node (page);unlock_page (page);flush_inline_data (sbi,ino_of_node (page));Quoted 36 lines
Signed-off-by Sayali Lokhande <[email protected]>--- fs/f2fs/checkpoint.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/f2fs/checkpoint.c +4
-6@@ -1219,21 +1219,19 @@ static int block_operations(struct f2fs_sb_info *sbi) goto retry_flush_quotas; } -retry_flush_nodes:down_write (&sbi->node_write);if (get_pages (sbi,F2FS_DIRTY_NODES )) {up_write (&sbi->node_write); +f2fs_unlock_all (sbi);atomic_inc (&sbi->wb_sync_req[NODE ]); err =f2fs_sync_node_pages (sbi, &wbc, false,FS_CP_NODE_IO );atomic_dec (&sbi->wb_sync_req[NODE ]); -if (err) { -up_write (&sbi->node_change); -f2fs_unlock_all (sbi); +up_write (&sbi->node_change); +if (err) goto out; - }cond_resched (); - goto retry_flush_nodes; + goto retry_flush_quotas; }
Quoted 10 lines
Quoted 4 lines
fs/f2fs/checkpoint.c +0
-0/* Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project_______________________________________________
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