File 0001-ocfs2-NFS-hangs-in-__ocfs2_cluster_lock-du... of Package cluster-fs

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-ocfs2-NFS-hangs-in-__ocfs2_cluster_lock-due-to-race-.patch of Package cluster-fs

From 52dcccb8f1167a78e4e4aeb881e2a33fc1bbcfee Mon Sep 17 00:00:00 2001
From: Eric Ren <zren@suse.com>
Date: Fri, 22 Jan 2016 12:17:50 +0800
Subject: [PATCH] ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with
 ocfs2_unblock_lock

Orabug: 20933419

NFS on a 2 node ocfs2 cluster each node exporting dir.  The lock causing
the hang is the global bit map inode lock.  Node 1 is master, has the lock
granted in PR mode; Node 2 is in the converting list (PR -> EX).  There
are no holders of the lock on the master node so it should downconvert to
NL and grant EX to node 2 but that does not happen.  BLOCKED + QUEUED in
lock res are set and it is on osb blocked list.  Threads are waiting in
__ocfs2_cluster_lock on BLOCKED.  One thread wants EX, rest want PR.  So
it is as though the downconvert thread needs to be kicked to complete the
conv.

The hang is caused by an EX req coming into __ocfs2_cluster_lock on the
heels of a PR req after it sets BUSY (drops l_lock, releasing EX thread),
forcing the incoming EX to wait on BUSY without doing anything.  PR has
called ocfs2_dlm_lock, which sets the node 1 lock from NL -> PR, queues
ast.

At this time, upconvert (PR ->EX) arrives from node 2, finds conflict with
node 1 lock in PR, so the lock res is put on dlm thread's dirty listt.

After ret from ocf2_dlm_lock, PR thread now waits behind EX on BUSY till
awoken by ast.

Now it is dlm_thread that serially runs dlm_shuffle_lists, ast, bast, in
that order.  dlm_shuffle_lists ques a bast on behalf of node 2 (which will
							      be run by dlm_thread
							      right after the ast).
ast does its part, sets
UPCONVERT_FINISHING, clears BUSY and wakes its waiters.  Next, dlm_thread
runs bast.  It sets BLOCKED and kicks dc thread.  dc thread runs
ocfs2_unblock_lock, but since UPCONVERT_FINISHING set, skips doing
anything and reques.

Inside of __ocfs2_cluster_lock, since EX has been waiting on BUSY ahead of
PR, it wakes up first, finds BLOCKED set and skips doing anything but
clearing UPCONVERT_FINISHING (which was actually "meant" for the PR
			      thread), and this time waits on BLOCKED.  Next, the PR thread
comes out of
wait but since UPCONVERT_FINISHING is not set, it skips updating the
l_ro_holders and goes straight to wait on BLOCKED.  So there, we have a
hang!  Threads in __ocfs2_cluster_lock wait on BLOCKED, lock res in osb
blocked list.  Only when dc thread is awoken, it will run
ocfs2_unblock_lock and things will unhang.

One way to fix this is to wake the dc thread on the flag after clearing
UPCONVERT_FINISHING

Signed-off-by: Tariq Saeed <tariq.x.saeed@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Reviewed-by: Wengang Wang <wen.gang.wang@oracle.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Backported-by: Eric Ren <zren@suse.com>
---
 fs/ocfs2/dlmglue.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index d762083..cb07ca3 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -1373,6 +1373,7 @@ static int __ocfs2_cluster_lock(struct ocfs2_super *osb,
 	unsigned long flags;
 	unsigned int gen;
 	int noqueue_attempted = 0;
+	int kick_dc = 0;
 
 	ocfs2_init_mask_waiter(&mw);
 
@@ -1501,7 +1502,12 @@ update_holders:
 unlock:
 	lockres_clear_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING);
 
+	/* ocfs2_unblock_lock reques on seeing OCFS2_LOCK_UPCONVERT_FINISHING */
+	kick_dc = (lockres->l_flags & OCFS2_LOCK_BLOCKED);
+
 	spin_unlock_irqrestore(&lockres->l_lock, flags);
+	if (kick_dc)
+		ocfs2_wake_downconvert_thread(osb);
 out:
 	/*
 	 * This is helping work around a lock inversion between the page lock
-- 
2.6.2

Places

File 0001-ocfs2-NFS-hangs-in-__ocfs2_cluster_lock-due-to-race-.patch of Package cluster-fs

Places