diff options
| author | Philipp Reisner | 2011-04-13 23:46:05 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:45:17 +0100 |
| commit | d3fcb4908d8cce7f29cff16bbef3b08933148003 (patch) | |
| tree | fc457ab337f19aa265a3b5cc4d5bcacc5b664315 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Converted drbd_cfg_mutex into drbd_cfg_rwsem (diff) | |
| download | kernel-qcow2-linux-d3fcb4908d8cce7f29cff16bbef3b08933148003.tar.gz kernel-qcow2-linux-d3fcb4908d8cce7f29cff16bbef3b08933148003.tar.xz kernel-qcow2-linux-d3fcb4908d8cce7f29cff16bbef3b08933148003.zip | |
drbd: protect all idr accesses that might sleep with drbd_cfg_rwsem
With this commit the locking for all accesses to IDRs is complete:
* Non sleeping read accesses are protected by RCU
* sleeping read accesses are protocted by a read lock on drbd_cfg_rwsem
* accesses that add anything are protected by a write lock
* accesses that remove an object are protoected by a write lock
and a call to synchronize_rcu() after it is removed from the IDR
and before the object is actually free()ed.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 2b0b0ab90f21..fd3859407a05 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -964,7 +964,10 @@ retry: if (drbd_send_protocol(tconn) == -EOPNOTSUPP) return -1; - return !idr_for_each(&tconn->volumes, drbd_connected, tconn); + down_read(&drbd_cfg_rwsem); + h = !idr_for_each(&tconn->volumes, drbd_connected, tconn); + up_read(&drbd_cfg_rwsem); + return h; out_release_sockets: if (tconn->data.socket) { @@ -4084,7 +4087,9 @@ static void drbd_disconnect(struct drbd_tconn *tconn) drbd_thread_stop(&tconn->asender); drbd_free_sock(tconn); + down_read(&drbd_cfg_rwsem); idr_for_each(&tconn->volumes, drbd_disconnected, tconn); + up_read(&drbd_cfg_rwsem); conn_info(tconn, "Connection closed\n"); if (conn_highest_role(tconn) == R_PRIMARY && conn_highest_pdsk(tconn) >= D_UNKNOWN) @@ -4821,10 +4826,14 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn) do { clear_bit(SIGNAL_ASENDER, &tconn->flags); flush_signals(current); + down_read(&drbd_cfg_rwsem); idr_for_each_entry(&tconn->volumes, mdev, i) { - if (drbd_finish_peer_reqs(mdev)) + if (drbd_finish_peer_reqs(mdev)) { + up_read(&drbd_cfg_rwsem); return 1; /* error */ + } } + up_read(&drbd_cfg_rwsem); set_bit(SIGNAL_ASENDER, &tconn->flags); spin_lock_irq(&tconn->req_lock); |