Unverified Commit a161cb25 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!827 [OLK-5.10] net/smc: aligning the connect behaviour with TCP 

Merge Pull Request from: @giree2 
 
net/smc:  aligning the connect behaviour with TCP 
 
Link:https://gitee.com/openeuler/kernel/pulls/827

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 35ba7dd5 74696496

net/smc/af_smc.c

+46 −4
Original line number Diff line number Diff line
@@ -1112,9 +1112,29 @@ static int smc_connect(struct socket *sock, struct sockaddr *addr, 
		goto out_err;



	lock_sock(sk);

	switch (sock->state) {

	default:

		rc = -EINVAL;

		goto out;

	case SS_CONNECTED:

		rc = sk->sk_state == SMC_ACTIVE ? -EISCONN : -EINVAL;

		goto out;

	case SS_CONNECTING:

		if (sk->sk_state == SMC_ACTIVE)

			goto connected;

		break;

	case SS_UNCONNECTED:

		sock->state = SS_CONNECTING;

		break;

	}



	switch (sk->sk_state) {

	default:

		goto out;

	case SMC_CLOSED:

		rc = sock_error(sk) ? : -ECONNABORTED;

		sock->state = SS_UNCONNECTED;

		goto out;

	case SMC_ACTIVE:

		rc = -EISCONN;

		goto out;
@@ -1133,21 +1153,25 @@ static int smc_connect(struct socket *sock, struct sockaddr *addr, 
	if (rc && rc != -EINPROGRESS)

		goto out;



	if (smc->use_fallback)

	if (smc->use_fallback) {

		sock->state = rc ? SS_CONNECTING : SS_CONNECTED;

		goto out;

	}

	sock_hold(&smc->sk); /* sock put in passive closing */

	if (flags & O_NONBLOCK) {

		if (queue_work(smc_hs_wq, &smc->connect_work))

			smc->connect_nonblock = 1;

		rc = -EINPROGRESS;

		goto out;

	} else {

		rc = __smc_connect(smc);

		if (rc < 0)

			goto out;

		else

			rc = 0; /* success cases including fallback */

	}



connected:

	rc = 0;

	sock->state = SS_CONNECTED;

out:

	release_sock(sk);

out_err:
@@ -1249,6 +1273,7 @@ struct sock *smc_accept_dequeue(struct sock *parent, 
		}

		if (new_sock) {

			sock_graft(new_sk, new_sock);

			new_sock->state = SS_CONNECTED;

			if (isk->use_fallback) {

				smc_sk(new_sk)->clcsock->file = new_sock->file;

				isk->clcsock->file->private_data = isk->clcsock;
@@ -1878,7 +1903,7 @@ static int smc_listen(struct socket *sock, int backlog) 


	rc = -EINVAL;

	if ((sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) ||

	    smc->connect_nonblock)

	    smc->connect_nonblock || sock->state != SS_UNCONNECTED)

		goto out;



	rc = 0;
@@ -2151,6 +2176,17 @@ static int smc_shutdown(struct socket *sock, int how) 


	lock_sock(sk);



	if (sock->state == SS_CONNECTING) {

		if (sk->sk_state == SMC_ACTIVE)

			sock->state = SS_CONNECTED;

		else if (sk->sk_state == SMC_PEERCLOSEWAIT1 ||

			 sk->sk_state == SMC_PEERCLOSEWAIT2 ||

			 sk->sk_state == SMC_APPCLOSEWAIT1 ||

			 sk->sk_state == SMC_APPCLOSEWAIT2 ||

			 sk->sk_state == SMC_APPFINCLOSEWAIT)

			sock->state = SS_DISCONNECTING;

	}



	rc = -ENOTCONN;

	if ((sk->sk_state != SMC_ACTIVE) &&

	    (sk->sk_state != SMC_PEERCLOSEWAIT1) &&
@@ -2164,6 +2200,7 @@ static int smc_shutdown(struct socket *sock, int how) 
		sk->sk_shutdown = smc->clcsock->sk->sk_shutdown;

		if (sk->sk_shutdown == SHUTDOWN_MASK) {

			sk->sk_state = SMC_CLOSED;

			sk->sk_socket->state = SS_UNCONNECTED;

			sock_put(sk);

		}

		goto out;
@@ -2189,6 +2226,10 @@ static int smc_shutdown(struct socket *sock, int how) 
	/* map sock_shutdown_cmd constants to sk_shutdown value range */

	sk->sk_shutdown |= how + 1;



	if (sk->sk_state == SMC_CLOSED)

		sock->state = SS_UNCONNECTED;

	else

		sock->state = SS_DISCONNECTING;

out:

	release_sock(sk);

	return rc ? rc : rc1;
@@ -2485,6 +2526,7 @@ static int smc_create(struct net *net, struct socket *sock, int protocol, 


	rc = -ENOBUFS;

	sock->ops = &smc_sock_ops;

	sock->state = SS_UNCONNECTED;

	sk = smc_sock_alloc(net, sock, protocol);

	if (!sk)

		goto out;