Commit 82281bc0 authored by Sebastien Buisson's avatar Sebastien Buisson Committed by Greg Kroah-Hartman

staging: lustre: osc: fix race issues thanks to oap_lock

Fix 'data race condition' defects found by Coverity version 6.5.0:

Data race condition (MISSING_LOCK)

Accessing variable without holding lock. Elsewhere,
this variable is accessed with lock held.

This patch is dedicated to code fragments involving oap_lock.
Signed-off-by: default avatarSebastien Buisson <sbuisson@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2744
Reviewed-on: http://review.whamcloud.com/6572Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06d2fccd
...@@ -1147,7 +1147,9 @@ static int osc_extent_make_ready(const struct lu_env *env, ...@@ -1147,7 +1147,9 @@ static int osc_extent_make_ready(const struct lu_env *env,
last->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE); last->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE);
LASSERT(last->oap_count > 0); LASSERT(last->oap_count > 0);
LASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE); LASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE);
spin_lock(&last->oap_lock);
last->oap_async_flags |= ASYNC_COUNT_STABLE; last->oap_async_flags |= ASYNC_COUNT_STABLE;
spin_unlock(&last->oap_lock);
} }
/* for the rest of pages, we don't need to call osf_refresh_count() /* for the rest of pages, we don't need to call osf_refresh_count()
...@@ -1156,7 +1158,9 @@ static int osc_extent_make_ready(const struct lu_env *env, ...@@ -1156,7 +1158,9 @@ static int osc_extent_make_ready(const struct lu_env *env,
list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) {
if (!(oap->oap_async_flags & ASYNC_COUNT_STABLE)) { if (!(oap->oap_async_flags & ASYNC_COUNT_STABLE)) {
oap->oap_count = PAGE_SIZE - oap->oap_page_off; oap->oap_count = PAGE_SIZE - oap->oap_page_off;
spin_lock(&last->oap_lock);
oap->oap_async_flags |= ASYNC_COUNT_STABLE; oap->oap_async_flags |= ASYNC_COUNT_STABLE;
spin_unlock(&last->oap_lock);
} }
} }
...@@ -2327,6 +2331,10 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, ...@@ -2327,6 +2331,10 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
oap->oap_cmd = cmd; oap->oap_cmd = cmd;
oap->oap_page_off = ops->ops_from; oap->oap_page_off = ops->ops_from;
oap->oap_count = ops->ops_to - ops->ops_from; oap->oap_count = ops->ops_to - ops->ops_from;
/*
* No need to hold a lock here,
* since this page is not in any list yet.
*/
oap->oap_async_flags = 0; oap->oap_async_flags = 0;
oap->oap_brw_flags = brw_flags; oap->oap_brw_flags = brw_flags;
......
...@@ -168,8 +168,10 @@ static int osc_io_submit(const struct lu_env *env, ...@@ -168,8 +168,10 @@ static int osc_io_submit(const struct lu_env *env,
} }
cl_page_list_move(qout, qin, page); cl_page_list_move(qout, qin, page);
spin_lock(&oap->oap_lock);
oap->oap_async_flags = ASYNC_URGENT|ASYNC_READY; oap->oap_async_flags = ASYNC_URGENT|ASYNC_READY;
oap->oap_async_flags |= ASYNC_COUNT_STABLE; oap->oap_async_flags |= ASYNC_COUNT_STABLE;
spin_unlock(&oap->oap_lock);
osc_page_submit(env, opg, crt, brw_flags); osc_page_submit(env, opg, crt, brw_flags);
list_add_tail(&oap->oap_pending_item, &list); list_add_tail(&oap->oap_pending_item, &list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment