Skip to content

Commit

Permalink
net/smc: prevent new connections on link group
Browse files Browse the repository at this point in the history
When the processing of a DELETE LINK message has started,
new connections should not be added to the link group that
is about to terminate.

Signed-off-by: Karsten Graul <kgraul@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Karsten Graul authored and David S. Miller committed Mar 1, 2018
1 parent 52bedf3 commit 9651b93
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
9 changes: 0 additions & 9 deletions net/smc/af_smc.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,6 @@ static void smc_link_save_peer_info(struct smc_link *link,
link->peer_mtu = clc->qp_mtu;
}

static void smc_lgr_forget(struct smc_link_group *lgr)
{
spin_lock_bh(&smc_lgr_list.lock);
/* do not use this link group for new connections */
if (!list_empty(&lgr->list))
list_del_init(&lgr->list);
spin_unlock_bh(&smc_lgr_list.lock);
}

/* setup for RDMA connection of client */
static int smc_connect_rdma(struct smc_sock *smc)
{
Expand Down
19 changes: 10 additions & 9 deletions net/smc/smc_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,22 +308,23 @@ void smc_lgr_free(struct smc_link_group *lgr)
kfree(lgr);
}

void smc_lgr_forget(struct smc_link_group *lgr)
{
spin_lock_bh(&smc_lgr_list.lock);
/* do not use this link group for new connections */
if (!list_empty(&lgr->list))
list_del_init(&lgr->list);
spin_unlock_bh(&smc_lgr_list.lock);
}

/* terminate linkgroup abnormally */
void smc_lgr_terminate(struct smc_link_group *lgr)
{
struct smc_connection *conn;
struct smc_sock *smc;
struct rb_node *node;

spin_lock_bh(&smc_lgr_list.lock);
if (list_empty(&lgr->list)) {
/* termination already triggered */
spin_unlock_bh(&smc_lgr_list.lock);
return;
}
/* do not use this link group for new connections */
list_del_init(&lgr->list);
spin_unlock_bh(&smc_lgr_list.lock);
smc_lgr_forget(lgr);

write_lock_bh(&lgr->conns_lock);
node = rb_first(&lgr->conns_all);
Expand Down
1 change: 1 addition & 0 deletions net/smc/smc_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ struct smc_sock;
struct smc_clc_msg_accept_confirm;

void smc_lgr_free(struct smc_link_group *lgr);
void smc_lgr_forget(struct smc_link_group *lgr);
void smc_lgr_terminate(struct smc_link_group *lgr);
int smc_buf_create(struct smc_sock *smc);
int smc_rmb_rtoken_handling(struct smc_connection *conn,
Expand Down
1 change: 1 addition & 0 deletions net/smc/smc_llc.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ static void smc_llc_rx_delete_link(struct smc_link *link,
smc_lgr_terminate(lgr);
} else {
if (lgr->role == SMC_SERV) {
smc_lgr_forget(lgr);
smc_llc_send_delete_link(link, SMC_LLC_REQ);
} else {
smc_llc_send_delete_link(link, SMC_LLC_RESP);
Expand Down

0 comments on commit 9651b93

Please sign in to comment.