mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>,
	davem@davemloft.net, kuba@kernel.org,
	matthieu.baerts@tessares.net, mptcp@lists.linux.dev,
	Paolo Abeni <pabeni@redhat.com>,
	Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 11/13] mptcp: setsockopt: SO_DEBUG and no-op options
Date: Thu, 15 Apr 2021 16:45:00 -0700	[thread overview]
Message-ID: <20210415234502.224225-12-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20210415234502.224225-1-mathew.j.martineau@linux.intel.com>

From: Florian Westphal <fw@strlen.de>

Handle SO_DEBUG and set it on all subflows.
Ignore those values not implemented on TCP sockets.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 net/mptcp/sockopt.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 7eb637488dc2..390433b7f324 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -77,6 +77,9 @@ static void mptcp_sol_socket_sync_intval(struct mptcp_sock *msk, int optname, in
 		bool slow = lock_sock_fast(ssk);
 
 		switch (optname) {
+		case SO_DEBUG:
+			sock_valbool_flag(ssk, SOCK_DBG, !!val);
+			break;
 		case SO_KEEPALIVE:
 			if (ssk->sk_prot->keepalive)
 				ssk->sk_prot->keepalive(ssk, !!val);
@@ -150,6 +153,7 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
 	case SO_KEEPALIVE:
 		mptcp_sol_socket_sync_intval(msk, optname, val);
 		return 0;
+	case SO_DEBUG:
 	case SO_MARK:
 	case SO_PRIORITY:
 	case SO_SNDBUF:
@@ -246,9 +250,21 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
 	case SO_RCVBUFFORCE:
 	case SO_MARK:
 	case SO_INCOMING_CPU:
+	case SO_DEBUG:
 		return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);
 	case SO_LINGER:
 		return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);
+	case SO_NO_CHECK:
+	case SO_DONTROUTE:
+	case SO_BROADCAST:
+	case SO_BSDCOMPAT:
+	case SO_PASSCRED:
+	case SO_PASSSEC:
+	case SO_RXQ_OVFL:
+	case SO_WIFI_STATUS:
+	case SO_NOFCS:
+	case SO_SELECT_ERR_QUEUE:
+		return 0;
 	}
 
 	return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen);
-- 
2.31.1


  parent reply	other threads:[~2021-04-15 23:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-15 23:44 [PATCH net-next 00/13] mptcp: Improve socket option handling Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 01/13] mptcp: revert "mptcp: forbit mcast-related sockopt on MPTCP sockets" Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 02/13] mptcp: move sockopt function into a new file Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 03/13] mptcp: only admit explicitly supported sockopt Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 04/13] mptcp: add skeleton to sync msk socket options to subflows Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 05/13] mptcp: tag sequence_seq with socket state Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 06/13] mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 07/13] mptcp: setsockopt: handle receive/send buffer and device bind Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 08/13] mptcp: setsockopt: support SO_LINGER Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 09/13] mptcp: setsockopt: add SO_MARK support Mat Martineau
2021-04-15 23:44 ` [PATCH net-next 10/13] mptcp: setsockopt: add SO_INCOMING_CPU Mat Martineau
2021-04-15 23:45 ` Mat Martineau [this message]
2021-04-15 23:45 ` [PATCH net-next 12/13] mptcp: sockopt: add TCP_CONGESTION and TCP_INFO Mat Martineau
2021-04-15 23:45 ` [PATCH net-next 13/13] selftests: mptcp: add packet mark test case Mat Martineau
2021-04-16 22:30 ` [PATCH net-next 00/13] mptcp: Improve socket option handling patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210415234502.224225-12-mathew.j.martineau@linux.intel.com \
    --to=mathew.j.martineau@linux.intel.com \
    --cc=davem@davemloft.net \
    --cc=fw@strlen.de \
    --cc=kuba@kernel.org \
    --cc=matthieu.baerts@tessares.net \
    --cc=mptcp@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).