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

Commit 01d2f7e2 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

net/smc: sockopts TCP_NODELAY and TCP_CORK 



Setting sockopt TCP_NODELAY or resetting sockopt TCP_CORK
triggers data transfer.

For a corked SMC socket RDMA writes are deferred, if there is
still sufficient send buffer space available.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee9dfbef

net/smc/af_smc.c

+19 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, 
{

	struct sock *sk = sock->sk;

	struct smc_sock *smc;

	int rc;

	int val, rc;



	smc = smc_sk(sk);
@@ -1307,6 +1307,10 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, 
	if (rc)

		return rc;



	if (optlen < sizeof(int))

		return rc;

	get_user(val, (int __user *)optval);



	lock_sock(sk);

	switch (optname) {

	case TCP_ULP:
@@ -1322,6 +1326,20 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, 
				rc = -EINVAL;

		}

		break;

	case TCP_NODELAY:

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

			if (val)

				mod_delayed_work(system_wq, &smc->conn.tx_work,

						 0);

		}

		break;

	case TCP_CORK:

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

			if (!val)

				mod_delayed_work(system_wq, &smc->conn.tx_work,

						 0);

		}

		break;

	default:

		break;

	}

net/smc/smc_tx.c

+21 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/sched/signal.h>



#include <net/sock.h>

#include <net/tcp.h>



#include "smc.h"

#include "smc_wr.h"
@@ -26,6 +27,7 @@ 
#include "smc_tx.h"



#define SMC_TX_WORK_DELAY	HZ

#define SMC_TX_CORK_DELAY	(HZ >> 2)	/* 250 ms */



/***************************** sndbuf producer *******************************/
@@ -115,6 +117,13 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags) 
	return rc;

}



static bool smc_tx_is_corked(struct smc_sock *smc)

{

	struct tcp_sock *tp = tcp_sk(smc->clcsock->sk);



	return (tp->nonagle & TCP_NAGLE_CORK) ? true : false;

}



/* sndbuf producer: main API called by socket layer.

 * called under sock lock.

 */
@@ -209,6 +218,15 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) 
		/* since we just produced more new data into sndbuf,

		 * trigger sndbuf consumer: RDMA write into peer RMBE and CDC

		 */

		if ((msg->msg_flags & MSG_MORE || smc_tx_is_corked(smc)) &&

		    (atomic_read(&conn->sndbuf_space) >

						(conn->sndbuf_size >> 1)))

			/* for a corked socket defer the RDMA writes if there

			 * is still sufficient sndbuf_space available

			 */

			schedule_delayed_work(&conn->tx_work,

					      SMC_TX_CORK_DELAY);

		else

			smc_tx_sndbuf_nonempty(conn);

	} /* while (msg_data_left(msg)) */
@@ -409,7 +427,7 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn) 
			}

			rc = 0;

			if (conn->alert_token_local) /* connection healthy */

				schedule_delayed_work(&conn->tx_work,

				mod_delayed_work(system_wq, &conn->tx_work,

						 SMC_TX_WORK_DELAY);

		}

		goto out_unlock;