diff mbox series

[mptcp-next,4/9] mptcp: setsockopt: support SO_LINGER

Message ID 20210317163828.27406-5-fw@strlen.de
State Superseded, archived
Delegated to: Paolo Abeni
Headers show
Series initial SOL_SOCKET support | expand

Commit Message

Florian Westphal March 17, 2021, 4:38 p.m. UTC 
Similar to PRIORITY/KEEPALIVE: needs to be mirrored to all subflows.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 net/mptcp/sockopt.c | 48 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Comments

Matthieu Baerts March 20, 2021, 10:30 a.m. UTC | #1 
Hi Florian,

Thank you for all the work to improve this important sockopt support!

On 17/03/2021 17:38, Florian Westphal wrote:
> Similar to PRIORITY/KEEPALIVE: needs to be mirrored to all subflows.
If SO_LINGER is used with "{ on, 0 second }", should we have a different 
behaviour for MPTCP? I'm thinking about sending an MP_FASTCLOSE, the 
equivalent to TCP RST.

WDYT?

Cheers,
Matt
Florian Westphal March 20, 2021, 11:08 a.m. UTC | #2 
Matthieu Baerts <matthieu.baerts@tessares.net> wrote:
> Hi Florian,
> 
> Thank you for all the work to improve this important sockopt support!
> 
> On 17/03/2021 17:38, Florian Westphal wrote:
> > Similar to PRIORITY/KEEPALIVE: needs to be mirrored to all subflows.
> If SO_LINGER is used with "{ on, 0 second }", should we have a different
> behaviour for MPTCP? I'm thinking about sending an MP_FASTCLOSE, the
> equivalent to TCP RST.
> 
> WDYT?

I think sending a fastclose in this case is a good idea.
diff mbox series

Patch

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 9a87c50e21a4..a78e51ead3ae 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -136,6 +136,45 @@  static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
 	return -ENOPROTOOPT;
 }
 
+static int mptcp_setsockopt_sol_socket_linger(struct mptcp_sock *msk, sockptr_t optval,
+					      unsigned int optlen)
+{
+	struct mptcp_subflow_context *subflow;
+	struct sock *sk = (struct sock *)msk;
+	struct linger ling;
+	sockptr_t kopt;
+	int ret;
+
+	if (optlen < sizeof(ling))
+		return -EINVAL;
+
+	if (copy_from_sockptr(&ling, optval, sizeof(ling)))
+		return -EFAULT;
+
+	kopt = KERNEL_SOCKPTR(&ling);
+	ret = sock_setsockopt(sk->sk_socket, SOL_SOCKET, SO_LINGER, kopt, sizeof(ling));
+	if (ret)
+		return ret;
+
+	lock_sock(sk);
+	mptcp_for_each_subflow(msk, subflow) {
+		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
+		bool slow = lock_sock_fast(ssk);
+
+		if (!ling.l_onoff)
+			sock_reset_flag(ssk, SOCK_LINGER);
+		else {
+			ssk->sk_lingertime = sk->sk_lingertime;
+			sock_set_flag(ssk, SOCK_LINGER);
+		}
+
+		unlock_sock_fast(ssk, slow);
+	}
+
+	release_sock(sk);
+	return 0;
+}
+
 static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
 				       sockptr_t optval, unsigned int optlen)
 {
@@ -175,6 +214,8 @@  static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
 	case SO_RCVBUF:
 	case SO_RCVBUFFORCE:
 		return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);
+	case SO_LINGER:
+		return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);
 	}
 
 	return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen);
@@ -492,6 +533,13 @@  static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk)
 
 	WRITE_ONCE(ssk->sk_sndbuf, sk->sk_sndbuf);
 	WRITE_ONCE(ssk->sk_rcvbuf, sk->sk_rcvbuf);
+
+	if (sock_flag(sk, SOCK_LINGER)) {
+		ssk->sk_lingertime = sk->sk_lingertime;
+		sock_set_flag(ssk, SOCK_LINGER);
+	} else {
+		sock_reset_flag(ssk, SOCK_LINGER);
+	}
 	unlock_sock_fast(ssk, slow);
 }