mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 01:09:38 -05:00
Code Activity

ocfs2/dlm: fix race between convert and migration

Browse source 
Commit ac7cf246df ("ocfs2/dlm: fix race between convert and recovery")
checks if lockres master has changed to identify whether new master has
finished recovery or not.  This will introduce a race that right after
old master does umount ( means master will change), a new convert
request comes.

In this case, it will reset lockres state to DLM_RECOVERING and then
retry convert, and then fail with lockres->l_action being set to
OCFS2_AST_INVALID, which will cause inconsistent lock level between
ocfs2 and dlm, and then finally BUG.

Since dlm recovery will clear lock->convert_pending in
dlm_move_lockres_to_recovery_list, we can use it to correctly identify
the race case between convert and recovery.  So fix it.

Fixes: ac7cf246df ("ocfs2/dlm: fix race between convert and recovery")
Link: http://lkml.kernel.org/r/57CE1569.8010704@huawei.com
Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Signed-off-by: Jun Piao <piaojun@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joseph Qi 2016-09-19 14:43:55 -07:00 • committed by Linus Torvalds
parent 9bb627be47
commit e6f0c6e617
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/ocfs2/dlm/dlmconvert.c
View file

@ -268,7 +268,6 @@ enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm,
struct dlm_lock *lock, int flags, int type) struct dlm_lock *lock, int flags, int type)
{ {
enum dlm_status status; enum dlm_status status;
u8 old_owner = res->owner;
mlog(0, "type=%d, convert_type=%d, busy=%d\n", lock->ml.type, mlog(0, "type=%d, convert_type=%d, busy=%d\n", lock->ml.type,
lock->ml.convert_type, res->state & DLM_LOCK_RES_IN_PROGRESS); lock->ml.convert_type, res->state & DLM_LOCK_RES_IN_PROGRESS);
@ -335,7 +334,6 @@ enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm,
spin_lock(&res->spinlock); spin_lock(&res->spinlock);
res->state &= ~DLM_LOCK_RES_IN_PROGRESS; res->state &= ~DLM_LOCK_RES_IN_PROGRESS;
lock->convert_pending = 0;
/* if it failed, move it back to granted queue. /* if it failed, move it back to granted queue.
* if master returns DLM_NORMAL and then down before sending ast, * if master returns DLM_NORMAL and then down before sending ast,
* it may have already been moved to granted queue, reset to * it may have already been moved to granted queue, reset to
@ -344,12 +342,14 @@ enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm,
if (status != DLM_NOTQUEUED) if (status != DLM_NOTQUEUED)
dlm_error(status); dlm_error(status);
dlm_revert_pending_convert(res, lock); dlm_revert_pending_convert(res, lock);
} else if ((res->state & DLM_LOCK_RES_RECOVERING) || } else if (!lock->convert_pending) {
(old_owner != res->owner)) { mlog(0, "%s: res %.*s, owner died and lock has been moved back "
mlog(0, "res %.*s is in recovering or has been recovered.\n", "to granted list, retry convert.\n",
res->lockname.len, res->lockname.name); dlm->name, res->lockname.len, res->lockname.name);
status = DLM_RECOVERING; status = DLM_RECOVERING;
} }
lock->convert_pending = 0;
bail: bail:
spin_unlock(&res->spinlock); spin_unlock(&res->spinlock);