ocfs2: clear links count in ocfs2_mknod() if an error occurs
PATCH 1/2 ocfs2: clear links count in ocfs2_mknod() if an error occurs
In this condition, the inode can not be wiped when error happened. ocfs2_mkdir()
->ocfs2_mknod()
->ocfs2_mknod_locked()
->__ocfs2_mknod_locked()
->ocfs2_set_links_count() // i_links_count is 2
-> ... // an error accrue, goto roll_back or leave.
->ocfs2_commit_trans()
->iput(inode)
->evict()
->ocfs2_evict_inode()
->ocfs2_delete_inode()
->ocfs2_inode_lock()
->ocfs2_inode_lock_update()
->ocfs2_refresh_inode()
->set_nlink(); // inode->i_nlink is 2 now.
/* if wipe is 0, it will goto bail_unlock_inode */
->ocfs2_query_inode_wipe()
->if (inode->i_nlink) return; // wipe is 0.
/* inode can not be wiped */
->ocfs2_wipe_inode()So, we need clear links before the transaction committed.
--- fs/ocfs2/namei.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/ocfs2/namei.c +12 -2
@@ -453,8 +453,12 @@ static int ocfs2_mknod(struct inode *dir, leave:if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
@@ -598,6 +602,8 @@ static int __ocfs2_mknod_locked(struct inode *dir, leave:if (status <0 ) {if (*new_fe_bh) { +if (fe) +ocfs2_set_links_count (fe,0 );brelse (*new_fe_bh); *new_fe_bh =NULL ; }
@@ -2023,8 +2029,12 @@ static int ocfs2_symlink(struct inode *dir, ocfs2_clusters_to_bytes(osb->sb, 1));if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
Signature · 1 line
2.23.0
PATCH 1/2 ocfs2: clear links count in ocfs2_mknod() if an error occurs
Quoted 21 lines · On Tue, 26 May 2020 15:45:35 +0800 Wangyan <[email protected]> wrote:
In this condition, the inode can not be wiped when error happened.
ocfs2_mkdir()
->ocfs2_mknod()->ocfs2_mknod_locked() ->__ocfs2_mknod_locked() ->ocfs2_set_links_count() // i_links_count is 2 -> ... // an error accrue, goto roll_back or leave. ->ocfs2_commit_trans() ->iput(inode) ->evict() ->ocfs2_evict_inode() ->ocfs2_delete_inode() ->ocfs2_inode_lock() ->ocfs2_inode_lock_update() ->ocfs2_refresh_inode() ->set_nlink(); // inode->i_nlink is 2 now. /* if wipe is 0, it will goto bail_unlock_inode */ ->ocfs2_query_inode_wipe() ->if (inode->i_nlink) return; // wipe is 0. /* inode can not be wiped */ ->ocfs2_wipe_inode()
Quoted 1 line
So, we need clear links before the transaction committed.
Do we think these fixes should be backported into -stable kernels?
PATCH 1/2 ocfs2: clear links count in ocfs2_mknod() if an error occurs
Yes, I think these fixes should be backported into -stable kernels.
Quoted 31 lines · Andrew Morton
Quoted 21 lines · On Tue, 26 May 2020 15:45:35 +0800 Wangyan <[email protected]> wrote:
In this condition, the inode can not be wiped when error happened.
ocfs2_mkdir()
->ocfs2_mknod()->ocfs2_mknod_locked() ->__ocfs2_mknod_locked() ->ocfs2_set_links_count() // i_links_count is 2 -> ... // an error accrue, goto roll_back or leave. ->ocfs2_commit_trans() ->iput(inode) ->evict() ->ocfs2_evict_inode() ->ocfs2_delete_inode() ->ocfs2_inode_lock() ->ocfs2_inode_lock_update() ->ocfs2_refresh_inode() ->set_nlink(); // inode->i_nlink is 2 now. /* if wipe is 0, it will goto bail_unlock_inode */ ->ocfs2_query_inode_wipe() ->if (inode->i_nlink) return; // wipe is 0. /* inode can not be wiped */ ->ocfs2_wipe_inode()Quoted 1 line
So, we need clear links before the transaction committed.
Do we think these fixes should be backported into -stable kernels?
.
PATCH 1/2 ocfs2: clear links count in ocfs2_mknod() if an error occurs
In reply to WangyanHi,
Quoted 34 lines · Wangyan
In this condition, the inode can not be wiped when error happened.
ocfs2_mkdir()
->ocfs2_mknod()->ocfs2_mknod_locked() ->__ocfs2_mknod_locked() ->ocfs2_set_links_count() // i_links_count is 2 -> ... // an error accrue, goto roll_back or leave. ->ocfs2_commit_trans() ->iput(inode) ->evict() ->ocfs2_evict_inode() ->ocfs2_delete_inode() ->ocfs2_inode_lock() ->ocfs2_inode_lock_update() ->ocfs2_refresh_inode() ->set_nlink(); // inode->i_nlink is 2 now. /* if wipe is 0, it will goto bail_unlock_inode */ ->ocfs2_query_inode_wipe() ->if (inode->i_nlink) return; // wipe is 0. /* inode can not be wiped */ ->ocfs2_wipe_inode()So, we need clear links before the transaction committed.
Signed-off-by Yan Wang <[email protected]>Reviewed-by Jun Piao <[email protected]>--- fs/ocfs2/namei.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)fs/ocfs2/namei.c +0
-0
fs/ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 459
Quoted 8 lines
fs/ocfs2/namei.c +4
-1@@ -453,8 +453,12 @@ static int ocfs2_mknod(struct inode *dir, leave:if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );
Seems no need to do this rollback under handle?
Only if (status < 0 && new_fe_bh) will be okay.
fs/ocfs2/namei.c static int __ocfs2_mknod_locked(struct inode *dir, · line 606
Quoted 11 lines
fs/ocfs2/namei.c +3
-0ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)@@ -598,6 +602,8 @@ static int __ocfs2_mknod_locked(struct inode *dir, leave:if (status <0 ) {if (*new_fe_bh) { +if (fe) +ocfs2_set_links_count (fe,0 );
Leave this to caller will be enough.
Thanks,
Joseph
Quoted 17 lines
fs/ocfs2/namei.c +5
-1brelse(*new_fe_bh);> *new_fe_bh = NULL; }@@ -2023,8 +2029,12 @@ static int ocfs2_symlink(struct inode *dir, ocfs2_clusters_to_bytes(osb->sb, 1));if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
PATCH 1/2 ocfs2: clear links count in ocfs2_mknod() if an error occurs
Quoted 52 lines · On Mon, 1 Jun 2020 16:30:30 +0800 Joseph Qi <[email protected]> wrote:
Hi,
Quoted 34 lines · Wangyan
In this condition, the inode can not be wiped when error happened.
ocfs2_mkdir()
->ocfs2_mknod()->ocfs2_mknod_locked() ->__ocfs2_mknod_locked() ->ocfs2_set_links_count() // i_links_count is 2 -> ... // an error accrue, goto roll_back or leave. ->ocfs2_commit_trans() ->iput(inode) ->evict() ->ocfs2_evict_inode() ->ocfs2_delete_inode() ->ocfs2_inode_lock() ->ocfs2_inode_lock_update() ->ocfs2_refresh_inode() ->set_nlink(); // inode->i_nlink is 2 now. /* if wipe is 0, it will goto bail_unlock_inode */ ->ocfs2_query_inode_wipe() ->if (inode->i_nlink) return; // wipe is 0. /* inode can not be wiped */ ->ocfs2_wipe_inode()So, we need clear links before the transaction committed.
Signed-off-by Yan Wang <[email protected]>Reviewed-by Jun Piao <[email protected]>--- fs/ocfs2/namei.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)fs/ocfs2/namei.c +0
-0fs/ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 459
Quoted 8 lines
fs/ocfs2/namei.c +4
-1@@ -453,8 +453,12 @@ static int ocfs2_mknod(struct inode *dir, leave:if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );Seems no need to do this rollback under handle?
Only if (status < 0 &&new_fe_bh) will be okay.Quoted 3 lines
fs/ocfs2/namei.c +1
-0ocfs2_commit_trans (osb, handle); + }
Quoted 10 lines
fs/ocfs2/namei.c static int __ocfs2_mknod_locked(struct inode *dir, · line 606
Quoted 8 lines
fs/ocfs2/namei.c +2
-0ocfs2_inode_unlock (dir,1 );if (did_block_signals)@@ -598,6 +602,8 @@ static int __ocfs2_mknod_locked(struct inode *dir, leave:if (status <0 ) {if (*new_fe_bh) { +if (fe) +ocfs2_set_links_count (fe,0 );Leave this to caller will be enough.
Are we still awaiting a response to these review comments?
I've been sitting on this patch series for over two years! I assume the problem isn't terribly serious.
Can we please come to a decision on how to proceed? Thanks.
The current patches from the mm tree are below.
From: Wangyan <[email protected]>
Subject: ocfs2: clear links count in ocfs2_mknod() if an error occurs
In this condition, the inode can not be wiped when error happened. ocfs2_mkdir()
->ocfs2_mknod()
->ocfs2_mknod_locked()
->__ocfs2_mknod_locked()
->ocfs2_set_links_count() // i_links_count is 2
-> ... // an error accrue, goto roll_back or leave.
->ocfs2_commit_trans()
->iput(inode)
->evict()
->ocfs2_evict_inode()
->ocfs2_delete_inode()
->ocfs2_inode_lock()
->ocfs2_inode_lock_update()
->ocfs2_refresh_inode()
->set_nlink(); // inode->i_nlink is 2 now.
/* if wipe is 0, it will goto bail_unlock_inode */
->ocfs2_query_inode_wipe()
->if (inode->i_nlink) return; // wipe is 0.
/* inode can not be wiped */
->ocfs2_wipe_inode()So, we need clear links before the transaction committed.
---
fs/ocfs2/namei.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/ocfs2/namei.c renamed from fs/ocfs2/namei.c~ocfs2-clear-links-count-in-ocfs2_mknod-if-an-error-occurs +12 -2
@@ -454,8 +454,12 @@ roll_back: leave:if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
@@ -599,6 +603,8 @@ static int __ocfs2_mknod_locked(struct i leave:if (status <0 ) {if (*new_fe_bh) { +if (fe) +ocfs2_set_links_count (fe,0 );brelse (*new_fe_bh); *new_fe_bh =NULL ; }
@@ -2028,8 +2034,12 @@ bail: ocfs2_clusters_to_bytes(osb->sb, 1));if (status <0 && did_quota_inode)dquot_free_inode (inode); -if (handle) +if (handle) { +if (status <0 && new_fe_bh !=NULL ) +ocfs2_set_links_count ((struct ocfs2_dinode *) + new_fe_bh->b_data,0 );ocfs2_commit_trans (osb, handle); + }ocfs2_inode_unlock (dir,1 );if (did_block_signals)
_
From: Wangyan <[email protected]>
Subject: ocfs2: fix ocfs2 corrupt when iputting an inode
In this condition, it will cause an bug on error.ocfs2_mkdir()
->ocfs2_mknod()
->ocfs2_mknod_locked()
->__ocfs2_mknod_locked()
//Assume inode->i_generation is genN.
->inode->i_generation = osb->s_next_generation++;
// The inode lockres has been initialized.
->ocfs2_populate_inode()
->ocfs2_create_new_inode_locks()
->An error happened, returned value is non-zero
// free the start_bit x in bg_blkno
->ocfs2_free_suballoc_bits()
->... /* Another process execute mkdir success in this place,
and it occupied the start_bit x in bg_blkno
which has been freed before. Its inode->i_generation
is genN + 1 */
->iput(inode)
->evict()
->ocfs2_evict_inode()
->ocfs2_delete_inode()
->ocfs2_inode_lock()
->ocfs2_inode_lock_update()
/* Bug on here, genN != genN + 1 */
->mlog_bug_on_msg(inode->i_generation !=
le32_to_cpu(fe->i_generation))So, we need not to reclaim the inode when the inode->ip_inode_lockres has been initialized. It will be freed in iput().
---
fs/ocfs2/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ocfs2/namei.c renamed from fs/ocfs2/namei.c~ocfs2-fix-ocfs2-corrupt-when-iputting-an-inode +2 -1
@@ -641,7 +641,8 @@ static int ocfs2_mknod_locked(struct ocf status =__ocfs2_mknod_locked (dir, inode, dev, new_fe_bh, parent_fe_bh, handle, inode_ac, fe_blkno, suballoc_loc, suballoc_bit); -if (status <0 ) { +if (status <0 && !(OCFS2_I (inode)->ip_inode_lockres.l_flags & +OCFS2_LOCK_INITIALIZED )) {u64 bg_blkno =ocfs2_which_suballoc_group (fe_blkno, suballoc_bit);int tmp =ocfs2_free_suballoc_bits (handle, inode_ac->ac_inode, inode_ac->ac_bh, suballoc_bit, bg_blkno,1 );
_
_______________________________________________
Ocfs2-devel mailing list
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Hi Andrew,
Quoted 8 lines · Andrew Morton
I've been sitting on this patch series for over two years! I assume the problem isn't terribly serious.
Can we please come to a decision on how to proceed? Thanks.
The current patches from the mm tree are below.
It seems I commented before, but without any response.
I'll take a look and send a new version base on the latest base today.
Thanks,
Joseph
_______________________________________________
Ocfs2-devel mailing list
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel