RDS: Rewrite connection cleanup, fixing oops on rmmod
This fixes a bug where a connection was unexpectedly not on *any* list while being destroyed. It also cleans up some code duplication and regularizes some function names. * Grab appropriate lock in conn_free() and explain in comment * Ensure via locking that a conn is never not on either a dev's list or the nodev list * Add rds_xx_remove_conn() to match rds_xx_add_conn() * Make rds_xx_add_conn() return void * Rename remove_{,nodev_}conns() to destroy_{,nodev_}conns() and unify their implementation in a helper function * Document lock ordering as nodev conn_lock before dev_conn_lock Reported-by: Yosef Etigin <yosefe@voltaire.com> Signed-off-by: Andy Grover <andy.grover@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
f1cffcbfcc
commit
745cbccac3
14
net/rds/ib.h
14
net/rds/ib.h
@@ -267,9 +267,17 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn,
|
||||
|
||||
/* ib_rdma.c */
|
||||
int rds_ib_update_ipaddr(struct rds_ib_device *rds_ibdev, __be32 ipaddr);
|
||||
int rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn);
|
||||
void rds_ib_remove_nodev_conns(void);
|
||||
void rds_ib_remove_conns(struct rds_ib_device *rds_ibdev);
|
||||
void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn);
|
||||
void rds_ib_remove_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn);
|
||||
void __rds_ib_destroy_conns(struct list_head *list, spinlock_t *list_lock);
|
||||
static inline void rds_ib_destroy_nodev_conns(void)
|
||||
{
|
||||
__rds_ib_destroy_conns(&ib_nodev_conns, &ib_nodev_conns_lock);
|
||||
}
|
||||
static inline void rds_ib_destroy_conns(struct rds_ib_device *rds_ibdev)
|
||||
{
|
||||
__rds_ib_destroy_conns(&rds_ibdev->conn_list, &rds_ibdev->spinlock);
|
||||
}
|
||||
struct rds_ib_mr_pool *rds_ib_create_mr_pool(struct rds_ib_device *);
|
||||
void rds_ib_get_mr_info(struct rds_ib_device *rds_ibdev, struct rds_info_rdma_connection *iinfo);
|
||||
void rds_ib_destroy_mr_pool(struct rds_ib_mr_pool *);
|
||||
|
Reference in New Issue
Block a user