fs: Make sure data stored into inode is properly seen before unlocking new inode
Jan Kara
reviewerPATCH 1/1 fs: Make sure data stored into inode is properly seen before unlocking new inode
In theory it could happen that on one CPU we initialize a new inode but clearing of I_NEW | I_LOCK gets reordered before some of the initialization. Thus on another CPU we return not fully uptodate inode from iget_locked().
This seems to fix a corruption issue on ext3 mounted over NFS.
--- fs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Since Al doesn't seem to be online, does anybody else have opinion on this
patch? I can merge it via my tree but I'd like to get a review from someone else.
fs/inode.c +1 -0
@@ -696,6 +696,7 @@ void unlock_new_inode(struct inode *inode)* just created it (so there can be no old holders * that haven't tested I_LOCK). */ +smp_mb ();WARN_ON ((inode->i_state & (I_LOCK |I_NEW )) != (I_LOCK |I_NEW )); inode->i_state &= ~(I_LOCK |I_NEW );wake_up_inode (inode);
Signature · 1 line
1.6.0.2
Quoted 7 lines · Jan Kara
In theory it could happen that on one CPU we initialize a new inode but clearing of
I_NEW|I_LOCKgets reordered before some of the initialization. Thus on another CPU we return not fully uptodate inode fromiget_locked().This seems to fix a corruption issue on ext3 mounted over NFS.
Signed-off-by Jan Kara <[email protected]>
Looks good to me. Impressive that this causes real life issues.
Quoted 6 lines · On Tue, 8 Sep 2009 13:41:03 +0200 Jan Kara <[email protected]> wrote:
In theory it could happen that on one CPU we initialize a new inode but clearing of
I_NEW|I_LOCKgets reordered before some of the initialization. Thus on another CPU we return not fully uptodate inode fromiget_locked().This seems to fix a corruption issue on ext3 mounted over NFS.
Quoted 8 lines
Signed-off-by Jan Kara <[email protected]>--- fs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)Since Al doesn't seem to be online, does anybody else have opinion on this
patch? I can merge it via my tree but I'd like to get a review from someone else.
I'll merge it for 2.6.31.
Please always remember -stable kernels when preparing bugfixes! This one should have had a Cc:stable in the changelog and in the email headers.
fs/inode.c void unlock_new_inode(struct inode *inode) · line 702
Quoted 12 lines
fs/inode.c +1
-0@@ -696,6 +696,7 @@ void unlock_new_inode(struct inode *inode)* just created it (so there can be no old holders * that haven't tested I_LOCK). */ +smp_mb ();WARN_ON ((inode->i_state & (I_LOCK |I_NEW )) != (I_LOCK |I_NEW )); inode->i_state &= ~(I_LOCK |I_NEW );wake_up_inode (inode);
But an uncommented barrier is always a hard thing for a reader to understand. Let's add something to help people. How's this look?
fs/inode.c renamed from fs/inode.c~fs-make-sure-data-stored-into-inode-is-properly-seen-before-unlocking-new-inode-fix +7 -6
@@ -697,12 +697,13 @@ void unlock_new_inode(struct inode *inod }#endif /* -* This is special! We do not need the spinlock -* when clearing I_LOCK, because we're guaranteed -* that nobody else tries to do anything about the -* state of the inode when it is locked, as we -* just created it (so there can be no old holders -* that haven't tested I_LOCK). +* This is special! We do not need the spinlock when clearing I_LOCK, +* because we're guaranteed that nobody else tries to do anything about +* the state of the inode when it is locked, as we just created it (so +* there can be no old holders that haven't tested I_LOCK). +* However we must emit the memory barrier so that other CPUs reliably +* see the clearing of I_LOCK after the other inode initialisation has +* completed. */ smp_mb ();WARN_ON ((inode->i_state & (I_LOCK |I_NEW )) != (I_LOCK |I_NEW ));
_
Jan Kara
reviewerQuoted 14 lines · Andrew Morton
Quoted 11 lines · On Tue, 8 Sep 2009 13:41:03 +0200 Jan Kara <[email protected]> wrote:
In theory it could happen that on one CPU we initialize a new inode but clearing of
I_NEW|I_LOCKgets reordered before some of the initialization. Thus on another CPU we return not fully uptodate inode fromiget_locked().This seems to fix a corruption issue on ext3 mounted over NFS.
Signed-off-by Jan Kara <[email protected]>--- fs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 5 lines
Quoted 3 lines
Since Al doesn't seem to be online, does anybody else have opinion on this
patch? I can merge it via my tree but I'd like to get a review from someone else.I'll merge it for 2.6.31.
Thanks!
Quoted 3 lines
Please always remember -stable kernels when preparing bugfixes! This one should have had a Cc:stable in the changelog and in the email headers.
Good point. Thanks for reminding.
Quoted 28 lines
fs/inode.c void unlock_new_inode(struct inode *inode) · line 702
Quoted 12 lines
fs/inode.c +1
-0@@ -696,6 +696,7 @@ void unlock_new_inode(struct inode *inode)* just created it (so there can be no old holders * that haven't tested I_LOCK). */ +smp_mb ();WARN_ON ((inode->i_state & (I_LOCK |I_NEW )) != (I_LOCK |I_NEW )); inode->i_state &= ~(I_LOCK |I_NEW );wake_up_inode (inode);But an uncommented barrier is always a hard thing for a reader to understand. Let's add something to help people. How's this look?
fs/inode.c renamed from fs/inode.c~fs-make-sure-data-stored-into-inode-is-properly-seen-before-unlocking-new-inode-fix +0
-6@@ -697,12 +697,13 @@ void unlock_new_inode(struct inode *inod }#endif /* -* This is special! We do not need the spinlock -* when clearing I_LOCK, because we're guaranteed -* that nobody else tries to do anything about the -* state of the inode when it is locked, as we -* just created it (so there can be no old holders -* that haven't tested I_LOCK).
fs/inode.c void unlock_new_inode(struct inode *inod · line 709
Quoted 10 lines
fs/inode.c renamed from fs/inode.c~fs-make-sure-data-stored-into-inode-is-properly-seen-before-unlocking-new-inode-fix +7
-0+* This is special! We do not need the spinlock when clearing I_LOCK, +* because we're guaranteed that nobody else tries to do anything about +* the state of the inode when it is locked, as we just created it (so +* there can be no old holders that haven't tested I_LOCK). +* However we must emit the memory barrier so that other CPUs reliably +* see the clearing of I_LOCK after the other inode initialisation has +* completed. */ smp_mb ();WARN_ON ((inode->i_state & (I_LOCK |I_NEW )) != (I_LOCK |I_NEW ));
Looks good.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Al Viro
maintainerQuoted 5 lines · Jan Kara
In theory it could happen that on one CPU we initialize a new inode but clearing of
I_NEW|I_LOCKgets reordered before some of the initialization. Thus on another CPU we return not fully uptodate inode fromiget_locked().This seems to fix a corruption issue on ext3 mounted over NFS.
Nice catch. ACK.
Quoted 3 lines
Since Al doesn't seem to be online, does anybody else have opinion on this
patch? I can merge it via my tree but I'd like to get a review from someone else.
I'm back, actually, and finally had almost crawled from under the pile of mail in mbox. Will apply.