lkml.org 
[lkml]   [2015]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 099/129] ocfs2: dlm: fix race between purge and get lock resource
    Date
    3.16.7-ckt12 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Junxiao Bi <junxiao.bi@oracle.com>

    commit b1432a2a35565f538586774a03bf277c27fc267d upstream.

    There is a race window in dlm_get_lock_resource(), which may return a
    lock resource which has been purged. This will cause the process to
    hang forever in dlmlock() as the ast msg can't be handled due to its
    lock resource not existing.

    dlm_get_lock_resource {
    ...
    spin_lock(&dlm->spinlock);
    tmpres = __dlm_lookup_lockres_full(dlm, lockid, namelen, hash);
    if (tmpres) {
    spin_unlock(&dlm->spinlock);
    >>>>>>>> race window, dlm_run_purge_list() may run and purge
    the lock resource
    spin_lock(&tmpres->spinlock);
    ...
    spin_unlock(&tmpres->spinlock);
    }
    }

    Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
    Cc: Joseph Qi <joseph.qi@huawei.com>
    Cc: Mark Fasheh <mfasheh@suse.com>
    Cc: Joel Becker <jlbec@evilplan.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    fs/ocfs2/dlm/dlmmaster.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
    index 9d405d6d2504..7b9f96899812 100644
    --- a/fs/ocfs2/dlm/dlmmaster.c
    +++ b/fs/ocfs2/dlm/dlmmaster.c
    @@ -768,6 +768,19 @@ lookup:
    if (tmpres) {
    spin_unlock(&dlm->spinlock);
    spin_lock(&tmpres->spinlock);
    +
    + /*
    + * Right after dlm spinlock was released, dlm_thread could have
    + * purged the lockres. Check if lockres got unhashed. If so
    + * start over.
    + */
    + if (hlist_unhashed(&tmpres->hash_node)) {
    + spin_unlock(&tmpres->spinlock);
    + dlm_lockres_put(tmpres);
    + tmpres = NULL;
    + goto lookup;
    + }
    +
    /* Wait on the thread that is mastering the resource */
    if (tmpres->owner == DLM_LOCK_RES_OWNER_UNKNOWN) {
    __dlm_wait_on_lockres(tmpres);

    \
     
     \ /
      Last update: 2015-05-22 11:21    [W:3.232 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site