Skip to content

Commit

Permalink
RDS/IB: disconnect when IB devices are removed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zach Brown authored and Andy Grover committed Sep 9, 2010
1 parent f3c6808 commit fc19de3
Showing 1 changed file with 24 additions and 1 deletion.
25 changes: 24 additions & 1 deletion net/rds/ib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fc19de3

Please sign in to comment.