Skip to contentSkip to conversation

ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker

PATCH New akpm at linux-foundation.org 2 participants 2 messages Dec 15, 2014 – Dec 17, 2014 OCFS2

lore
Share & tools
lore

akpm at linux-foundation.org

author
#0 lore raw

PATCH 5/15 ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker

From: Joseph Qi <[email protected]>
Subject: ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker

ac4fef4d23ed ("ocfs2/dlm: do not purge lockres that is queued for assert master") may have the following possible race case:

dlm_dispatch_assert_master dlm_wq
========================================================================
queue_work(dlm->quedlm_worker,

	&dlm->dispatched_work);
                                 dispatch work,
				 dlm_lockres_drop_inflight_worker
				 *BUG_ON(res->inflight_assert_workers == 0)*

dlm_lockres_grab_inflight_worker
inflight_assert_workers++

So ensure inflight_assert_workers to be increased first.

Signed-off-by Joseph Qi <[email protected]>
Signed-off-by Xue jiufei <[email protected]>
Cc Joel Becker <[email protected]>
Cc Mark Fasheh <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 fs/ocfs2/dlm/dlmmaster.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
fs/ocfs2/dlm/dlmmaster.c renamed from fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-fix-race-between-dispatched_work-and-dlm_lockres_grab_inflight_worker +3 -9
diff -puN fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-fix-race-between-dispatched_work-and-dlm_lockres_grab_inflight_worker fs/ocfs2/dlm/dlmmaster.c
@@ -685,14 +685,6 @@ void __dlm_lockres_grab_inflight_worker(
 			res->inflight_assert_workers);
 }
 
-static void dlm_lockres_grab_inflight_worker(struct dlm_ctxt *dlm,
-		struct dlm_lock_resource *res)
-{
-	spin_lock(&res->spinlock);
-	__dlm_lockres_grab_inflight_worker(dlm, res);
-	spin_unlock(&res->spinlock);
-}
-
 static void __dlm_lockres_drop_inflight_worker(struct dlm_ctxt *dlm,
 		struct dlm_lock_resource *res)
 {

@@ -1636,6 +1628,7 @@ send_response:
 		}
 		mlog(0, "%u is the owner of %.*s, cleaning everyone else\n",
 			     dlm->node_num, res->lockname.len, res->lockname.name);
+		spin_lock(&res->spinlock);
 		ret = dlm_dispatch_assert_master(dlm, res, 0, request->node_idx,
 						 DLM_ASSERT_MASTER_MLE_CLEANUP);
 		if (ret < 0) {

@@ -1643,7 +1636,8 @@ send_response:
 			response = DLM_MASTER_RESP_ERROR;
 			dlm_lockres_put(res);
 		} else
-			dlm_lockres_grab_inflight_worker(dlm, res);
+			__dlm_lockres_grab_inflight_worker(dlm, res);
+		spin_unlock(&res->spinlock);
 	} else {
 		if (res)
 			dlm_lockres_put(res);

_

#1 lore raw

PATCH 5/15 ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker

Quoted 9 lines · Andrew Morton

From: Joseph Qi <[email protected]>
Subject: ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker

ac4fef4d23ed ("ocfs2/dlm: do not purge lockres that is queued for assert master") may have the following possible race case:

dlm_dispatch_assert_master dlm_wq
========================================================================
queue_work(dlm->quedlm_worker,

Quoted 8 lines
	&dlm->dispatched_work);
                                 dispatch work,
				 dlm_lockres_drop_inflight_worker
				 *BUG_ON(res->inflight_assert_workers == 0)*

dlm_lockres_grab_inflight_worker
inflight_assert_workers++

So ensure inflight_assert_workers to be increased first.

Good catch, thank you Joseph.

Reviewed-by Mark Fasheh <[email protected]>
	--Mark

--
Mark Fasheh