ocfs2: ocfs2_inode_lock_tracker does not distinguish lock level
PATCH 1/1 ocfs2: ocfs2_inode_lock_tracker does not distinguish lock level
ocfs2_inode_lock_tracker as a variant of ocfs2_inode_lock, is used to prevent deadlock due to recursive lock acquisition.
But this function does not distinguish
whether the requested level is EX or PR.
If a RP lock has been attained, this function
will immediately return success afterwards even
an EX lock is requested.
But actually the return value does not mean that the process got a EX lock, because ocfs2_inode_lock has not been called.
When taking lock levels into account, we face some different situations.
1. no lock is held
In this case, just lock the inode and return 0
2. We are holding a lock
For this situation, things diverges into several cases
wanted holding what to do ex ex see 2.1 below ex pr see 2.2 below pr ex see 2.1 below pr pr see 2.1 below
2.1 lock level that is been held is compatible with the wanted level, so no lock action will be tacken.
2.2 Otherwise, an upgrade is needed, but it is forbidden.
Reason why upgrade within a process is forbidden is that lock upgrade may cause dead lock. The following illustrate how it happens.
process 1 process 2ocfs2_inode_lock_tracker(ex=0)
<====== ocfs2_inode_lock_tracker(ex=1)
ocfs2_inode_lock_tracker(ex=1)
--- fs/ocfs2/dlmglue.c | 119 +++++++++++++++++++++++++++++++++++++++-------------- fs/ocfs2/dlmglue.h | 1 + 2 files changed, 90 insertions(+), 30 deletions(-)
fs/ocfs2/dlmglue.c +89 -30
@@ -788,35 +788,34 @@ static inline void ocfs2_add_holder(struct ocfs2_lock_res *lockres,spin_unlock (&lockres->l_lock); } -static inline void ocfs2_remove_holder (struct ocfs2_lock_res *lockres, -struct ocfs2_lock_holder *oh) -{ -spin_lock (&lockres->l_lock); -list_del (&oh->oh_list); -spin_unlock (&lockres->l_lock); - -put_pid (oh->oh_owner_pid); -} - -static inline int ocfs2_is_locked_by_me (struct ocfs2_lock_res *lockres) +static struct ocfs2_lock_holder * +ocfs2_pid_holder (struct ocfs2_lock_res *lockres, +struct pid *pid) {struct ocfs2_lock_holder *oh; -struct pid *pid; -/* look in the list of holders for one with the current task as owner */ spin_lock (&lockres->l_lock); - pid =task_pid (current);list_for_each_entry (oh, &lockres->l_holders, oh_list) {if (oh->oh_owner_pid == pid) {spin_unlock (&lockres->l_lock); -return 1 ; +return oh; } }spin_unlock (&lockres->l_lock); +return NULL ; +} -return 0 ; +static inline void ocfs2_remove_holder (struct ocfs2_lock_res *lockres, +struct ocfs2_lock_holder *oh) +{ +spin_lock (&lockres->l_lock); +list_del (&oh->oh_list); +spin_unlock (&lockres->l_lock); + +put_pid (oh->oh_owner_pid); } +static inline void ocfs2_inc_holders (struct ocfs2_lock_res *lockres,int level) {
@@ -2610,34 +2609,93 @@ void ocfs2_inode_unlock(struct inode *inode,* * return < 0 on error, return == 0 if there's no lock holder on the stack * before this call, return == 1 if this call would be a recursive locking. +* return == -1 if this lock attempt will cause an upgrade which is forbidden. +* +* When taking lock levels into account,we face some different situations. +* +* 1. no lock is held +* In this case, just lock the inode as requested and return 0 +* +* 2. We are holding a lock +* For this situation, things diverges into several cases +* +* wanted holding what to do +* ex ex see 2.1 below +* ex pr see 2.2 below +* pr ex see 2.1 below +* pr pr see 2.1 below +* +* 2.1 lock level that is been held is compatible +* with the wanted level, so no lock action will be tacken. +* +* 2.2 Otherwise, an upgrade is needed, but it is forbidden. +* +* Reason why upgrade within a process is forbidden is that +* lock upgrade may cause dead lock. The following illustrates +* how it happens. +* +* thread on node1 thread on node2 +* ocfs2_inode_lock_tracker(ex=0) +* +* <====== ocfs2_inode_lock_tracker(ex=1) +* +* ocfs2_inode_lock_tracker(ex=1) */ int ocfs2_inode_lock_tracker (struct inode *inode,struct buffer_head **ret_bh,int ex,struct ocfs2_lock_holder *oh) { -int status; -int arg_flags =0 , has_locked; +int status =0 ;struct ocfs2_lock_res *lockres; +struct ocfs2_lock_holder *tmp_oh; +struct pid *pid =task_pid (current); + lockres = &OCFS2_I (inode)->ip_inode_lockres; - has_locked =ocfs2_is_locked_by_me (lockres); -/* Just get buffer head if the cluster lock has been taken */ -if (has_locked) - arg_flags =OCFS2_META_LOCK_GETBH ; + tmp_oh =ocfs2_pid_holder (lockres, pid); -if (likely (!has_locked || ret_bh)) { - status =ocfs2_inode_lock_full (inode, ret_bh, ex, arg_flags); +if (!tmp_oh) { +/* +* This corresponds to the case 1. +* We haven't got any lock before. +*/ + status =ocfs2_inode_lock_full (inode, ret_bh, ex,0 );if (status <0 ) {if (status != -ENOENT )mlog_errno (status);return status; } - } -if (!has_locked) + + oh->oh_ex = ex;ocfs2_add_holder (lockres, oh); +return 0 ; + } -return has_locked; +if (unlikely (ex && !tmp_oh->oh_ex)) { +/* +* case 2.2 upgrade may cause dead lock, forbid it. +*/ +mlog (ML_ERROR ,"Recursive locking is not permitted to " +"upgrade to EX level from PR level.\n" ); +dump_stack (); +return -EINVAL ; + } + +/* +* case 2.1 OCFS2_META_LOCK_GETBH flag make ocfs2_inode_lock_full. +* ignore the lock level and just update it. +*/ +if (ret_bh) { + status =ocfs2_inode_lock_full (inode, ret_bh, ex, +OCFS2_META_LOCK_GETBH ); +if (status <0 ) { +if (status != -ENOENT ) +mlog_errno (status); +return status; + } + } +return tmp_oh ?1 :0 ; } void ocfs2_inode_unlock_tracker(struct inode *inode,
@@ -2649,12 +2707,13 @@ void ocfs2_inode_unlock_tracker(struct inode *inode, lockres = &OCFS2_I (inode)->ip_inode_lockres;/* had_lock means that the currect process already takes the cluster -* lock previously. If had_lock is 1, we have nothing to do here, and -* it will get unlocked where we got the lock. +* lock previously. +* If had_lock is 1, we have nothing to do here. +* If had_lock is 0, we will release the lock. */ if (!had_lock) { +ocfs2_inode_unlock (inode, oh->oh_ex);ocfs2_remove_holder (lockres, oh); -ocfs2_inode_unlock (inode, ex); } }
fs/ocfs2/dlmglue.h +1 -0
@@ -96,6 +96,7 @@ struct ocfs2_trim_fs_info {struct ocfs2_lock_holder {struct list_head oh_list;struct pid *oh_owner_pid; +int oh_ex; };/* ocfs2_inode_lock_full() 'arg_flags' flags */
Signature · 1 line
2.13.6
Hello Joseph, Changwei and Jun/Alex,
Please help to take a look at this patch,
since the previous patch really has vulnerability in logic, although our test cases did not hit it.
Thanks
Gang
Quoted 1 line
Quoted 1 line
Quoted 1 line
Larry Chen <[email protected]> 2018/5/10 13:32 >>>
ocfs2_inode_lock_tracker as a variant of ocfs2_inode_lock, is used to prevent deadlock due to recursive lock acquisition.
But this function does not distinguish
whether the requested level is EX or PR.
If a RP lock has been attained, this function
will immediately return success afterwards even
an EX lock is requested.
But actually the return value does not mean that the process got a EX lock, because ocfs2_inode_lock has not been called.
When taking lock levels into account, we face some different situations.
1. no lock is held
In this case, just lock the inode and return 0
2. We are holding a lock
For this situation, things diverges into several cases
wanted holding what to do ex ex see 2.1 below ex pr see 2.2 below pr ex see 2.1 below pr pr see 2.1 below
2.1 lock level that is been held is compatible with the wanted level, so no lock action will be tacken.
2.2 Otherwise, an upgrade is needed, but it is forbidden.
Reason why upgrade within a process is forbidden is that lock upgrade may cause dead lock. The following illustrate how it happens.
process 1 process 2ocfs2_inode_lock_tracker(ex=0)
<====== ocfs2_inode_lock_tracker(ex=1)
ocfs2_inode_lock_tracker(ex=1)
--- fs/ocfs2/dlmglue.c | 119 +++++++++++++++++++++++++++++++++++++++-------------- fs/ocfs2/dlmglue.h | 1 + 2 files changed, 90 insertions(+), 30 deletions(-)
fs/ocfs2/dlmglue.c +89 -30
@@ -788,35 +788,34 @@ static inline void ocfs2_add_holder(struct ocfs2_lock_res *lockres,spin_unlock (&lockres->l_lock); } -static inline void ocfs2_remove_holder (struct ocfs2_lock_res *lockres, -struct ocfs2_lock_holder *oh) -{ -spin_lock (&lockres->l_lock); -list_del (&oh->oh_list); -spin_unlock (&lockres->l_lock); - -put_pid (oh->oh_owner_pid); -} - -static inline int ocfs2_is_locked_by_me (struct ocfs2_lock_res *lockres) +static struct ocfs2_lock_holder * +ocfs2_pid_holder (struct ocfs2_lock_res *lockres, +struct pid *pid) {struct ocfs2_lock_holder *oh; -struct pid *pid; -/* look in the list of holders for one with the current task as owner */ spin_lock (&lockres->l_lock); - pid =task_pid (current);list_for_each_entry (oh, &lockres->l_holders, oh_list) {if (oh->oh_owner_pid == pid) {spin_unlock (&lockres->l_lock); -return 1 ; +return oh; } }spin_unlock (&lockres->l_lock); +return NULL ; +} -return 0 ; +static inline void ocfs2_remove_holder (struct ocfs2_lock_res *lockres, +struct ocfs2_lock_holder *oh) +{ +spin_lock (&lockres->l_lock); +list_del (&oh->oh_list); +spin_unlock (&lockres->l_lock); + +put_pid (oh->oh_owner_pid); } +static inline void ocfs2_inc_holders (struct ocfs2_lock_res *lockres,int level) {
@@ -2610,34 +2609,93 @@ void ocfs2_inode_unlock(struct inode *inode,* * return < 0 on error, return == 0 if there's no lock holder on the stack * before this call, return == 1 if this call would be a recursive locking. +* return == -1 if this lock attempt will cause an upgrade which is forbidden. +* +* When taking lock levels into account,we face some different situations. +* +* 1. no lock is held +* In this case, just lock the inode as requested and return 0 +* +* 2. We are holding a lock +* For this situation, things diverges into several cases +* +* wanted holding what to do +* ex ex see 2.1 below +* ex pr see 2.2 below +* pr ex see 2.1 below +* pr pr see 2.1 below +* +* 2.1 lock level that is been held is compatible +* with the wanted level, so no lock action will be tacken. +* +* 2.2 Otherwise, an upgrade is needed, but it is forbidden. +* +* Reason why upgrade within a process is forbidden is that +* lock upgrade may cause dead lock. The following illustrates +* how it happens. +* +* thread on node1 thread on node2 +* ocfs2_inode_lock_tracker(ex=0) +* +* <====== ocfs2_inode_lock_tracker(ex=1) +* +* ocfs2_inode_lock_tracker(ex=1) */ int ocfs2_inode_lock_tracker (struct inode *inode,struct buffer_head **ret_bh,int ex,struct ocfs2_lock_holder *oh) { -int status; -int arg_flags =0 , has_locked; +int status =0 ;struct ocfs2_lock_res *lockres; +struct ocfs2_lock_holder *tmp_oh; +struct pid *pid =task_pid (current); + lockres = &OCFS2_I (inode)->ip_inode_lockres; - has_locked =ocfs2_is_locked_by_me (lockres); -/* Just get buffer head if the cluster lock has been taken */ -if (has_locked) - arg_flags =OCFS2_META_LOCK_GETBH ; + tmp_oh =ocfs2_pid_holder (lockres, pid); -if (likely (!has_locked || ret_bh)) { - status =ocfs2_inode_lock_full (inode, ret_bh, ex, arg_flags); +if (!tmp_oh) { +/* +* This corresponds to the case 1. +* We haven't got any lock before. +*/ + status =ocfs2_inode_lock_full (inode, ret_bh, ex,0 );if (status <0 ) {if (status != -ENOENT )mlog_errno (status);return status; } - } -if (!has_locked) + + oh->oh_ex = ex;ocfs2_add_holder (lockres, oh); +return 0 ; + } -return has_locked; +if (unlikely (ex && !tmp_oh->oh_ex)) { +/* +* case 2.2 upgrade may cause dead lock, forbid it. +*/ +mlog (ML_ERROR ,"Recursive locking is not permitted to " +"upgrade to EX level from PR level.\n" ); +dump_stack (); +return -EINVAL ; + } + +/* +* case 2.1 OCFS2_META_LOCK_GETBH flag make ocfs2_inode_lock_full. +* ignore the lock level and just update it. +*/ +if (ret_bh) { + status =ocfs2_inode_lock_full (inode, ret_bh, ex, +OCFS2_META_LOCK_GETBH ); +if (status <0 ) { +if (status != -ENOENT ) +mlog_errno (status); +return status; + } + } +return tmp_oh ?1 :0 ; } void ocfs2_inode_unlock_tracker(struct inode *inode,
@@ -2649,12 +2707,13 @@ void ocfs2_inode_unlock_tracker(struct inode *inode, lockres = &OCFS2_I (inode)->ip_inode_lockres;/* had_lock means that the currect process already takes the cluster -* lock previously. If had_lock is 1, we have nothing to do here, and -* it will get unlocked where we got the lock. +* lock previously. +* If had_lock is 1, we have nothing to do here. +* If had_lock is 0, we will release the lock. */ if (!had_lock) { +ocfs2_inode_unlock (inode, oh->oh_ex);ocfs2_remove_holder (lockres, oh); -ocfs2_inode_unlock (inode, ex); } }
fs/ocfs2/dlmglue.h +1 -0
@@ -96,6 +96,7 @@ struct ocfs2_trim_fs_info {struct ocfs2_lock_holder {struct list_head oh_list;struct pid *oh_owner_pid; +int oh_ex; };/* ocfs2_inode_lock_full() 'arg_flags' flags */
Signature · 7 lines
2.13.6 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel at oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Quoted 36 lines · On Thu, 10 May 2018 13:32:30 +0800 Larry Chen <[email protected]> wrote:
ocfs2_inode_lock_trackeras a variant ofocfs2_inode_lock, is used to prevent deadlock due to recursive lock acquisition.But this function does not distinguish
whether the requested level is EX or PR.If a RP lock has been attained, this function
will immediately return success afterwards even
an EX lock is requested.But actually the return value does not mean that the process got a EX lock, because
ocfs2_inode_lockhas not been called.When taking lock levels into account, we face some different situations.
1. no lock is held
In this case, just lock the inode and return 02. We are holding a lock
For this situation, things diverges into several caseswanted holding what to do ex ex see 2.1 below ex pr see 2.2 below pr ex see 2.1 below pr pr see 2.1 below2.1 lock level that is been held is compatible with the wanted level, so no lock action will be tacken.
2.2 Otherwise, an upgrade is needed, but it is forbidden.
Reason why upgrade within a process is forbidden is that lock upgrade may cause dead lock. The following illustrate how it happens.
Quoted 6 lines
process 1 process 2
ocfs2_inode_lock_tracker(ex=0)<====== ocfs2_inode_lock_tracker(ex=1)
ocfs2_inode_lock_tracker(ex=1)
Nice changelog, but it gives no information about the severity of the
bug: how often does it hit and what is the end-user impact.
This info is needed so that I and others can decide which kernel version(s) need the patch, so please always include it when fixing a bug, thanks.
Hello Andrew,
Quoted 42 lines · Andrew Morton
Quoted 40 lines · On Thu, 10 May 2018 13:32:30 +0800 Larry Chen <[email protected]> wrote:
ocfs2_inode_lock_trackeras a variant ofocfs2_inode_lock, is used to prevent deadlock due to recursive lock acquisition.But this function does not distinguish
whether the requested level is EX or PR.If a RP lock has been attained, this function
will immediately return success afterwards even
an EX lock is requested.But actually the return value does not mean that the process got a EX lock, because
ocfs2_inode_lockhas not been called.When taking lock levels into account, we face some different situations.
1. no lock is held
In this case, just lock the inode and return 02. We are holding a lock
For this situation, things diverges into several caseswanted holding what to do
ex ex see 2.1 below
ex pr see 2.2 below
pr ex see 2.1 below
pr pr see 2.1 below2.1 lock level that is been held is compatible with the wanted level, so no lock action will be tacken.
2.2 Otherwise, an upgrade is needed, but it is forbidden.
Reason why upgrade within a process is forbidden is that lock upgrade may cause dead lock. The following illustrate how it happens.
process 1 process 2
ocfs2_inode_lock_tracker(ex=0)<====== ocfs2_inode_lock_tracker(ex=1)
Quoted 8 lines
Quoted 2 lines
ocfs2_inode_lock_tracker(ex=1)Nice changelog, but it gives no information about the severity of the
bug: how often does it hit and what is the end-user impact.This info is needed so that I and others can decide which kernel version(s) need the patch, so please always include it when fixing a bug, thanks.
Thanks for your review and feel sorry for not providing enough information.
For the status quo of ocfs2, without this patch, neither a bug nor end-user impact will be caused because the wrong logic is avoided.
But I'm afraid this generic interface, may be called by other developers in future and used in this situation.
??? a processocfs2_inode_lock_tracker(ex=0)ocfs2_inode_lock_tracker(ex=1)
By the way, should I resend this patch with this info included?
Thanks
Larry
Quoted 1 line
Quoted 12 lines · On Fri, 11 May 2018 12:16:51 +0800 Larry Chen <[email protected]> wrote:
Quoted 6 lines
Nice changelog, but it gives no information about the severity of the
bug: how often does it hit and what is the end-user impact.This info is needed so that I and others can decide which kernel version(s) need the patch, so please always include it when fixing a bug, thanks.
Thanks for your review and feel sorry for not providing enough information.
For the status quo of ocfs2, without this patch, neither a bug nor end-user impact will be caused because the wrong logic is avoided.
Quoted 6 lines
But I'm afraid this generic interface, may be called by other developers in future and used in this situation.
??? a process
ocfs2_inode_lock_tracker(ex=0)ocfs2_inode_lock_tracker(ex=1)
OK, thanks.
Quoted 1 line
By the way, should I resend this patch with this info included?
I pasted the above into my copy of the changelog so we're good.