Commit c296c0bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-fixes' 



Guangguan Wang says:

====================
net: several fixes for smc

v1 -> v2:
rewrite patch #2 suggested by Paolo.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 429fde2d c5b8ee50

net/smc/af_smc.c

+16 −2
Original line number Diff line number Diff line
@@ -2032,6 +2032,8 @@ static int smc_listen_prfx_check(struct smc_sock *new_smc, 
	if (pclc->hdr.typev1 == SMC_TYPE_N)

		return 0;

	pclc_prfx = smc_clc_proposal_get_prefix(pclc);

	if (!pclc_prfx)

		return -EPROTO;

	if (smc_clc_prfx_match(newclcsock, pclc_prfx))

		return SMC_CLC_DECL_DIFFPREFIX;
@@ -2145,6 +2147,8 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc, 
	pclc_smcd = smc_get_clc_msg_smcd(pclc);

	smc_v2_ext = smc_get_clc_v2_ext(pclc);

	smcd_v2_ext = smc_get_clc_smcd_v2_ext(smc_v2_ext);

	if (!pclc_smcd || !smc_v2_ext || !smcd_v2_ext)

		goto not_found;



	mutex_lock(&smcd_dev_list.mutex);

	if (pclc_smcd->ism.chid) {
@@ -2221,7 +2225,9 @@ static void smc_find_ism_v1_device_serv(struct smc_sock *new_smc, 
	int rc = 0;



	/* check if ISM V1 is available */

	if (!(ini->smcd_version & SMC_V1) || !smcd_indicated(ini->smc_type_v1))

	if (!(ini->smcd_version & SMC_V1) ||

	    !smcd_indicated(ini->smc_type_v1) ||

	    !pclc_smcd)

		goto not_found;

	ini->is_smcd = true; /* prepare ISM check */

	ini->ism_peer_gid[0].gid = ntohll(pclc_smcd->ism.gid);
@@ -2272,7 +2278,8 @@ static void smc_find_rdma_v2_device_serv(struct smc_sock *new_smc, 
		goto not_found;



	smc_v2_ext = smc_get_clc_v2_ext(pclc);

	if (!smc_clc_match_eid(ini->negotiated_eid, smc_v2_ext, NULL, NULL))

	if (!smc_v2_ext ||

	    !smc_clc_match_eid(ini->negotiated_eid, smc_v2_ext, NULL, NULL))

		goto not_found;



	/* prepare RDMA check */
@@ -2881,6 +2888,13 @@ __poll_t smc_poll(struct file *file, struct socket *sock, 
			} else {

				sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);

				set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);



				if (sk->sk_state != SMC_INIT) {

					/* Race breaker the same way as tcp_poll(). */

					smp_mb__after_atomic();

					if (atomic_read(&smc->conn.sndbuf_space))

						mask |= EPOLLOUT | EPOLLWRNORM;

				}

			}

			if (atomic_read(&smc->conn.bytes_to_rcv))

				mask |= EPOLLIN | EPOLLRDNORM;

net/smc/smc_clc.c

+16 −1
Original line number Diff line number Diff line
@@ -352,8 +352,11 @@ static bool smc_clc_msg_prop_valid(struct smc_clc_msg_proposal *pclc) 
	struct smc_clc_msg_hdr *hdr = &pclc->hdr;

	struct smc_clc_v2_extension *v2_ext;



	v2_ext = smc_get_clc_v2_ext(pclc);

	pclc_prfx = smc_clc_proposal_get_prefix(pclc);

	if (!pclc_prfx ||

	    pclc_prfx->ipv6_prefixes_cnt > SMC_CLC_MAX_V6_PREFIX)

		return false;



	if (hdr->version == SMC_V1) {

		if (hdr->typev1 == SMC_TYPE_N)

			return false;
@@ -365,6 +368,13 @@ static bool smc_clc_msg_prop_valid(struct smc_clc_msg_proposal *pclc) 
			sizeof(struct smc_clc_msg_trail))

			return false;

	} else {

		v2_ext = smc_get_clc_v2_ext(pclc);

		if ((hdr->typev2 != SMC_TYPE_N &&

		     (!v2_ext || v2_ext->hdr.eid_cnt > SMC_CLC_MAX_UEID)) ||

		    (smcd_indicated(hdr->typev2) &&

		     v2_ext->hdr.ism_gid_cnt > SMCD_CLC_MAX_V2_GID_ENTRIES))

			return false;



		if (ntohs(hdr->length) !=

			sizeof(*pclc) +

			sizeof(struct smc_clc_msg_smcd) +
@@ -764,6 +774,11 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, 
						SMC_CLC_RECV_BUF_LEN : datlen;

		iov_iter_kvec(&msg.msg_iter, ITER_DEST, &vec, 1, recvlen);

		len = sock_recvmsg(smc->clcsock, &msg, krflags);

		if (len < recvlen) {

			smc->sk.sk_err = EPROTO;

			reason_code = -EPROTO;

			goto out;

		}

		datlen -= len;

	}

	if (clcm->type == SMC_CLC_DECLINE) {

net/smc/smc_clc.h

+19 −3
Original line number Diff line number Diff line
@@ -336,8 +336,12 @@ struct smc_clc_msg_decline_v2 { /* clc decline message */ 
static inline struct smc_clc_msg_proposal_prefix *

smc_clc_proposal_get_prefix(struct smc_clc_msg_proposal *pclc)

{

	u16 offset = ntohs(pclc->iparea_offset);



	if (offset > sizeof(struct smc_clc_msg_smcd))

		return NULL;

	return (struct smc_clc_msg_proposal_prefix *)

	       ((u8 *)pclc + sizeof(*pclc) + ntohs(pclc->iparea_offset));

	       ((u8 *)pclc + sizeof(*pclc) + offset);

}



static inline bool smcr_indicated(int smc_type)
@@ -376,8 +380,14 @@ static inline struct smc_clc_v2_extension * 
smc_get_clc_v2_ext(struct smc_clc_msg_proposal *prop)

{

	struct smc_clc_msg_smcd *prop_smcd = smc_get_clc_msg_smcd(prop);

	u16 max_offset;



	if (!prop_smcd || !ntohs(prop_smcd->v2_ext_offset))

	max_offset = offsetof(struct smc_clc_msg_proposal_area, pclc_v2_ext) -

		     offsetof(struct smc_clc_msg_proposal_area, pclc_smcd) -

		     offsetofend(struct smc_clc_msg_smcd, v2_ext_offset);



	if (!prop_smcd || !ntohs(prop_smcd->v2_ext_offset) ||

	    ntohs(prop_smcd->v2_ext_offset) > max_offset)

		return NULL;



	return (struct smc_clc_v2_extension *)
@@ -390,9 +400,15 @@ smc_get_clc_v2_ext(struct smc_clc_msg_proposal *prop) 
static inline struct smc_clc_smcd_v2_extension *

smc_get_clc_smcd_v2_ext(struct smc_clc_v2_extension *prop_v2ext)

{

	u16 max_offset = offsetof(struct smc_clc_msg_proposal_area, pclc_smcd_v2_ext) -

		offsetof(struct smc_clc_msg_proposal_area, pclc_v2_ext) -

		offsetof(struct smc_clc_v2_extension, hdr) -

		offsetofend(struct smc_clnt_opts_area_hdr, smcd_v2_ext_offset);



	if (!prop_v2ext)

		return NULL;

	if (!ntohs(prop_v2ext->hdr.smcd_v2_ext_offset))

	if (!ntohs(prop_v2ext->hdr.smcd_v2_ext_offset) ||

	    ntohs(prop_v2ext->hdr.smcd_v2_ext_offset) > max_offset)

		return NULL;



	return (struct smc_clc_smcd_v2_extension *)

net/smc/smc_core.c

+7 −2
Original line number Diff line number Diff line
@@ -1818,7 +1818,9 @@ void smcr_link_down_cond_sched(struct smc_link *lnk) 
{

	if (smc_link_downing(&lnk->state)) {

		trace_smcr_link_down(lnk, __builtin_return_address(0));

		schedule_work(&lnk->link_down_wrk);

		smcr_link_hold(lnk); /* smcr_link_put in link_down_wrk */

		if (!schedule_work(&lnk->link_down_wrk))

			smcr_link_put(lnk);

	}

}
@@ -1850,11 +1852,14 @@ static void smc_link_down_work(struct work_struct *work) 
	struct smc_link_group *lgr = link->lgr;



	if (list_empty(&lgr->list))

		return;

		goto out;

	wake_up_all(&lgr->llc_msg_waiter);

	down_write(&lgr->llc_conf_mutex);

	smcr_link_down(link);

	up_write(&lgr->llc_conf_mutex);



out:

	smcr_link_put(link); /* smcr_link_hold by schedulers of link_down_work */

}



static int smc_vlan_by_tcpsk_walk(struct net_device *lower_dev,