Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9651b934 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: prevent new connections on link group 



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: default avatarKarsten Graul <kgraul@linux.vnet.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52bedf37

net/smc/af_smc.c

+0 −9
Original line number Diff line number Diff line
@@ -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)

{

net/smc/smc_core.c

+10 −9
Original line number Diff line number Diff line
@@ -308,6 +308,15 @@ 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)

{
@@ -315,15 +324,7 @@ void smc_lgr_terminate(struct smc_link_group *lgr) 
	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);

net/smc/smc_core.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

net/smc/smc_llc.c

+1 −0
Original line number Diff line number Diff line
@@ -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);