Commit 90b49784 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-smc-fixes-2020-11-18' 

Karsten Graul says:

====================
net/smc: fixes 2020-11-18

Patch 1 fixes the matching of link groups because with SMC-Dv2 the vlanid
should no longer be part of this matching. Patch 2 removes a sparse message.
====================

Link: https://lore.kernel.org/r/20201118214038.24039-1-kgraul@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2d8f6481 41a0be3f

net/smc/af_smc.c

+2 −1
Original line number Diff line number Diff line
@@ -979,7 +979,8 @@ static int __smc_connect(struct smc_sock *smc) 


	/* check if smc modes and versions of CLC proposal and accept match */

	rc = smc_connect_check_aclc(ini, aclc);

	version = aclc->hdr.version == SMC_V1 ? SMC_V1 : version;

	version = aclc->hdr.version == SMC_V1 ? SMC_V1 : SMC_V2;

	ini->smcd_version = version;

	if (rc)

		goto vlan_cleanup;

net/smc/smc_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1309,7 +1309,8 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini) 
				    ini->ism_peer_gid[ini->ism_selected]) :

		     smcr_lgr_match(lgr, ini->ib_lcl, role, ini->ib_clcqpn)) &&

		    !lgr->sync_err &&

		    lgr->vlan_id == ini->vlan_id &&

		    (ini->smcd_version == SMC_V2 ||

		     lgr->vlan_id == ini->vlan_id) &&

		    (role == SMC_CLNT || ini->is_smcd ||

		     lgr->conns_num < SMC_RMBS_PER_LGR_MAX)) {

			/* link group found */

net/smc/smc_ib.c

+3 −3
Original line number Diff line number Diff line
@@ -198,9 +198,9 @@ int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport, 
		rcu_read_lock();

		ndev = rdma_read_gid_attr_ndev_rcu(attr);

		if (!IS_ERR(ndev) &&

		    ((!vlan_id && !is_vlan_dev(attr->ndev)) ||

		     (vlan_id && is_vlan_dev(attr->ndev) &&

		      vlan_dev_vlan_id(attr->ndev) == vlan_id)) &&

		    ((!vlan_id && !is_vlan_dev(ndev)) ||

		     (vlan_id && is_vlan_dev(ndev) &&

		      vlan_dev_vlan_id(ndev) == vlan_id)) &&

		    attr->gid_type == IB_GID_TYPE_ROCE) {

			rcu_read_unlock();

			if (gid)

CRA Git | Maintained and supported by SUSTech CRA and CCSE