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

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

Merge branch 'smc-fixes' 



Ursula Braun says:

====================
net/smc: fixes 2019-01-30

here are some fixes in different areas of the smc code for the net
tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7596175e 46ad0222

net/smc/af_smc.c

+10 −1
Original line number Diff line number Diff line
@@ -1505,6 +1505,11 @@ static int smc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 


	smc = smc_sk(sk);

	lock_sock(sk);

	if (sk->sk_state == SMC_CLOSED && (sk->sk_shutdown & RCV_SHUTDOWN)) {

		/* socket was connected before, no more data to read */

		rc = 0;

		goto out;

	}

	if ((sk->sk_state == SMC_INIT) ||

	    (sk->sk_state == SMC_LISTEN) ||

	    (sk->sk_state == SMC_CLOSED))
@@ -1840,7 +1845,11 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos, 


	smc = smc_sk(sk);

	lock_sock(sk);



	if (sk->sk_state == SMC_CLOSED && (sk->sk_shutdown & RCV_SHUTDOWN)) {

		/* socket was connected before, no more data to read */

		rc = 0;

		goto out;

	}

	if (sk->sk_state == SMC_INIT ||

	    sk->sk_state == SMC_LISTEN ||

	    sk->sk_state == SMC_CLOSED)

net/smc/smc_cdc.c

+4 −1
Original line number Diff line number Diff line
@@ -125,7 +125,10 @@ static int smcr_cdc_get_slot_and_msg_send(struct smc_connection *conn) 
	if (rc)

		return rc;



	return smc_cdc_msg_send(conn, wr_buf, pend);

	spin_lock_bh(&conn->send_lock);

	rc = smc_cdc_msg_send(conn, wr_buf, pend);

	spin_unlock_bh(&conn->send_lock);

	return rc;

}



int smc_cdc_get_slot_and_msg_send(struct smc_connection *conn)

net/smc/smc_clc.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info) 
	vec.iov_len = sizeof(struct smc_clc_msg_decline);

	len = kernel_sendmsg(smc->clcsock, &msg, &vec, 1,

			     sizeof(struct smc_clc_msg_decline));

	if (len < sizeof(struct smc_clc_msg_decline))

	if (len < 0 || len < sizeof(struct smc_clc_msg_decline))

		len = -EPROTO;

	return len > 0 ? 0 : len;

}

net/smc/smc_core.c

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn) 
{

	struct smc_link_group *lgr = conn->lgr;



	if (!lgr)

		return;

	write_lock_bh(&lgr->conns_lock);

	if (conn->alert_token_local) {

		__smc_lgr_unregister_conn(conn);
@@ -628,6 +630,8 @@ int smc_conn_create(struct smc_sock *smc, bool is_smcd, int srv_first_contact, 
			local_contact = SMC_REUSE_CONTACT;

			conn->lgr = lgr;

			smc_lgr_register_conn(conn); /* add smc conn to lgr */

			if (delayed_work_pending(&lgr->free_work))

				cancel_delayed_work(&lgr->free_work);

			write_unlock_bh(&lgr->conns_lock);

			break;

		}

net/smc/smc_ib.c

+3 −3
Original line number Diff line number Diff line
@@ -289,8 +289,8 @@ int smc_ib_create_protection_domain(struct smc_link *lnk) 


static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv)

{

	struct smc_ib_device *smcibdev =

		(struct smc_ib_device *)ibevent->device;

	struct smc_link *lnk = (struct smc_link *)priv;

	struct smc_ib_device *smcibdev = lnk->smcibdev;

	u8 port_idx;



	switch (ibevent->event) {
@@ -298,7 +298,7 @@ static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv) 
	case IB_EVENT_GID_CHANGE:

	case IB_EVENT_PORT_ERR:

	case IB_EVENT_QP_ACCESS_ERR:

		port_idx = ibevent->element.port_num - 1;

		port_idx = ibevent->element.qp->port - 1;

		set_bit(port_idx, &smcibdev->port_event_mask);

		schedule_work(&smcibdev->port_event_work);

		break;