summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2010-05-24 13:16:57 -0700
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:15:19 -0700
commitfc19de38be924728fea76026c0d1a6c4b6156084 (patch)
tree31deb86bc1d6b11a2c671ee3c126fc7c27e02264 /net
parentf3c6808d3d8513db2b0543538fc35c25a60fe7a7 (diff)
RDS/IB: disconnect when IB devices are removed
Currently IB device removal destroys connections which are associated with the device. This prevents connections from being re-established when replacement devices are added. Instead we'll queue shutdown work on the connections as their devices are removed. When we see that devices are added we triger connection attempts on all connections that don't currently have a device. The result is that RDS sockets can resume device-independent work (bcopy, not RDMA) across IB device removal and restoration. Signed-off-by: Zach Brown <zach.brown@oracle.com>
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/net/rds/ib.c b/net/rds/ib.c
index 1732f8effb5..b21e24fd060 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -59,6 +59,27 @@ struct list_head rds_ib_devices;
DEFINE_SPINLOCK(ib_nodev_conns_lock);
LIST_HEAD(ib_nodev_conns);
+void rds_ib_nodev_connect(void)
+{
+ struct rds_ib_connection *ic;
+
+ spin_lock(&ib_nodev_conns_lock);
+ list_for_each_entry(ic, &ib_nodev_conns, ib_node)
+ rds_conn_connect_if_down(ic->conn);
+ spin_unlock(&ib_nodev_conns_lock);
+}
+
+void rds_ib_dev_shutdown(struct rds_ib_device *rds_ibdev)
+{
+ struct rds_ib_connection *ic;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rds_ibdev->spinlock, flags);
+ list_for_each_entry(ic, &rds_ibdev->conn_list, ib_node)
+ rds_conn_drop(ic->conn);
+ spin_unlock_irqrestore(&rds_ibdev->spinlock, flags);
+}
+
/*
* rds_ib_destroy_mr_pool() blocks on a few things and mrs drop references
* from interrupt context so we push freing off into a work struct in krdsd.
@@ -156,6 +177,8 @@ void rds_ib_add_one(struct ib_device *device)
ib_set_client_data(device, &rds_ib_client, rds_ibdev);
atomic_inc(&rds_ibdev->refcount);
+ rds_ib_nodev_connect();
+
put_dev:
rds_ib_dev_put(rds_ibdev);
free_attr:
@@ -205,7 +228,7 @@ void rds_ib_remove_one(struct ib_device *device)
if (!rds_ibdev)
return;
- rds_ib_destroy_conns(rds_ibdev);
+ rds_ib_dev_shutdown(rds_ibdev);
/*
* prevent future connection attempts from getting a reference to this