Commit a2351c5d authored by Ursula Braun's avatar Ursula Braun Committed by Jakub Kicinski
Browse files

net/smc: separate SMCD and SMCR link group lists 



Currently SMCD and SMCR link groups are maintained in one list.
To facilitate abnormal termination handling they are split into
a separate list for SMCR link groups and separate lists for SMCD
link groups per SMCD device.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent 0ea1671f

include/net/smc.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct smcd_dev { 
	struct workqueue_struct *event_wq;

	u8 pnetid[SMC_MAX_PNETID_LEN];

	bool pnetid_by_user;

	struct list_head lgr_list;

};



struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,

net/smc/smc_core.c

+17 −7
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static void smc_lgr_free_work(struct work_struct *work) 
static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)

{

	struct smc_link_group *lgr;

	struct list_head *lgr_list;

	struct smc_link *lnk;

	u8 rndvec[3];

	int rc = 0;
@@ -233,6 +234,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
		/* SMC-D specific settings */

		lgr->peer_gid = ini->ism_gid;

		lgr->smcd = ini->ism_dev;

		lgr_list = &ini->ism_dev->lgr_list;

	} else {

		/* SMC-R specific settings */

		lgr->role = smc->listen_smc ? SMC_SERV : SMC_CLNT;
@@ -245,6 +247,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
		lnk->link_id = SMC_SINGLE_LINK;

		lnk->smcibdev = ini->ib_dev;

		lnk->ibport = ini->ib_port;

		lgr_list = &smc_lgr_list.list;

		lnk->path_mtu =

			ini->ib_dev->pattr[ini->ib_port - 1].active_mtu;

		if (!ini->ib_dev->initialized)
@@ -275,7 +278,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
	}

	smc->conn.lgr = lgr;

	spin_lock_bh(&smc_lgr_list.lock);

	list_add(&lgr->list, &smc_lgr_list.list);

	list_add(&lgr->list, lgr_list);

	spin_unlock_bh(&smc_lgr_list.lock);

	return 0;
@@ -512,9 +515,8 @@ void smc_smcd_terminate(struct smcd_dev *dev, u64 peer_gid, unsigned short vlan) 


	/* run common cleanup function and build free list */

	spin_lock_bh(&smc_lgr_list.lock);

	list_for_each_entry_safe(lgr, l, &smc_lgr_list.list, list) {

		if (lgr->is_smcd && lgr->smcd == dev &&

		    (!peer_gid || lgr->peer_gid == peer_gid) &&

	list_for_each_entry_safe(lgr, l, &dev->lgr_list, list) {

		if ((!peer_gid || lgr->peer_gid == peer_gid) &&

		    (vlan == VLAN_VID_MASK || lgr->vlan_id == vlan)) {

			__smc_lgr_terminate(lgr);

			list_move(&lgr->list, &lgr_free_list);
@@ -604,10 +606,12 @@ static bool smcd_lgr_match(struct smc_link_group *lgr, 
int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)

{

	struct smc_connection *conn = &smc->conn;

	struct list_head *lgr_list;

	struct smc_link_group *lgr;

	enum smc_lgr_role role;

	int rc = 0;



	lgr_list = ini->is_smcd ? &ini->ism_dev->lgr_list : &smc_lgr_list.list;

	ini->cln_first_contact = SMC_FIRST_CONTACT;

	role = smc->listen_smc ? SMC_SERV : SMC_CLNT;

	if (role == SMC_CLNT && ini->srv_first_contact)
@@ -616,7 +620,7 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini) 


	/* determine if an existing link group can be reused */

	spin_lock_bh(&smc_lgr_list.lock);

	list_for_each_entry(lgr, &smc_lgr_list.list, list) {

	list_for_each_entry(lgr, lgr_list, list) {

		write_lock_bh(&lgr->conns_lock);

		if ((ini->is_smcd ?

		     smcd_lgr_match(lgr, ini->ism_dev, ini->ism_gid) :
@@ -1029,11 +1033,17 @@ void smc_core_exit(void) 
{

	struct smc_link_group *lgr, *lg;

	LIST_HEAD(lgr_freeing_list);

	struct smcd_dev *smcd;



	spin_lock_bh(&smc_lgr_list.lock);

	if (!list_empty(&smc_lgr_list.list))

	list_splice_init(&smc_lgr_list.list, &lgr_freeing_list);

	spin_unlock_bh(&smc_lgr_list.lock);



	spin_lock(&smcd_dev_list.lock);

	list_for_each_entry(smcd, &smcd_dev_list.list, list)

		list_splice_init(&smcd->lgr_list, &lgr_freeing_list);

	spin_unlock(&smcd_dev_list.lock);



	list_for_each_entry_safe(lgr, lg, &lgr_freeing_list, list) {

		list_del_init(&lgr->list);

		if (!lgr->is_smcd) {

net/smc/smc_ism.c

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name, 


	spin_lock_init(&smcd->lock);

	INIT_LIST_HEAD(&smcd->vlan);

	INIT_LIST_HEAD(&smcd->lgr_list);

	smcd->event_wq = alloc_ordered_workqueue("ism_evt_wq-%s)",

						 WQ_MEM_RECLAIM, name);

	if (!smcd->event_wq) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE