github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: greybus: loopback: Hold per-connection mutex across operations

Browse Source 
Commit d9fb3754ec ("greybus: loopback: Relax locking during loopback
operations") changes the holding of the per-connection mutex to be less
restrictive because at the time of that commit per-connection mutexes were
encapsulated by a per-driver level gb_dev.mutex.

Commit 8e1d6c336d ("greybus: loopback: drop bus aggregate calculation")
on the other hand subtracts the driver level gb_dev.mutex but neglects to
move the mutex back to the place it was prior to commit d9fb3754ec
("greybus: loopback: Relax locking during loopback operations"), as a
result several members of the per connection struct gb_loopback are racy.

The solution is restoring the old location of mutex_unlock(&gb->mutex) as
it was in commit d9fb3754ec ("greybus: loopback: Relax locking during
loopback operations").

Fixes: 8e1d6c336d ("greybus: loopback: drop bus aggregate calculation")

Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Reviewed-by: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: Mitch Tasman <tasman@leaflabs.com>
Cc: greybus-dev@lists.linaro.org
Cc: devel@driverdev.osuosl.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bryan O'Donoghue 2017-11-06 01:32:19 +00:00 committed by Greg Kroah-Hartman
parent 31408d16c2
commit 5a70524bbf
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/greybus/loopback.c
View File

@ -605,7 +605,6 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
op_async->ts = ktime_get(); op_async->ts = ktime_get();
op_async->pending = true; op_async->pending = true;
atomic_inc(&gb->outstanding_operations); atomic_inc(&gb->outstanding_operations);
mutex_lock(&gb->mutex);
ret = gb_operation_request_send(operation, ret = gb_operation_request_send(operation,
gb_loopback_async_operation_callback, gb_loopback_async_operation_callback,
0, 0,
@ -622,7 +621,6 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
error: error:
gb_loopback_async_operation_put(op_async); gb_loopback_async_operation_put(op_async);
done: done:
mutex_unlock(&gb->mutex);
return ret; return ret;
} }
@ -1013,7 +1011,6 @@ static int gb_loopback_fn(void *data)
type = gb->type; type = gb->type;
if (ktime_to_ns(gb->ts) == 0) if (ktime_to_ns(gb->ts) == 0)
gb->ts = ktime_get(); gb->ts = ktime_get();
mutex_unlock(&gb->mutex);
/* Else operations to perform */ /* Else operations to perform */
if (gb->async) { if (gb->async) {
@ -1041,6 +1038,7 @@ static int gb_loopback_fn(void *data)
gb_loopback_calculate_stats(gb, !!error); gb_loopback_calculate_stats(gb, !!error);
} }
gb->send_count++; gb->send_count++;
mutex_unlock(&gb->mutex);
if (us_wait) { if (us_wait) {
if (us_wait < 20000) if (us_wait < 20000)