[net-next,00/13] mptcp: Improve socket option handling

Message

Mat Martineau April 15, 2021, 11:44 p.m. UTC

MPTCP sockets have previously had limited socket option support. The
architecture of MPTCP sockets (one userspace-facing MPTCP socket that
manages one or more in-kernel TCP subflow sockets) adds complexity for
passing options through to lower levels. This patch set adds MPTCP
support for socket options commonly used with TCP.

Patch 1 reverts an interim socket option fix (a socket option blocklist)
that was merged in the net tree for v5.12.

Patch 2 moves the socket option code to a separate file, with no
functional changes.

Patch 3 adds an allowlist for socket options that are known to function
with MPTCP. Later patches in this set add more allowed options.

Patches 4 and 5 add infrastructure for syncing MPTCP-level options with
the TCP subflows.

Patches 6-12 add support for specific socket options.

Patch 13 adds a socket option self test.


Florian Westphal (10):
  mptcp: add skeleton to sync msk socket options to subflows
  mptcp: tag sequence_seq with socket state
  mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY
  mptcp: setsockopt: handle receive/send buffer and device bind
  mptcp: setsockopt: support SO_LINGER
  mptcp: setsockopt: add SO_MARK support
  mptcp: setsockopt: add SO_INCOMING_CPU
  mptcp: setsockopt: SO_DEBUG and no-op options
  mptcp: sockopt: add TCP_CONGESTION and TCP_INFO
  selftests: mptcp: add packet mark test case

Matthieu Baerts (1):
  mptcp: revert "mptcp: forbit mcast-related sockopt on MPTCP sockets"

Paolo Abeni (2):
  mptcp: move sockopt function into a new file
  mptcp: only admit explicitly supported sockopt

 net/mptcp/Makefile                            |   2 +-
 net/mptcp/protocol.c                          | 219 ++---
 net/mptcp/protocol.h                          |  16 +
 net/mptcp/sockopt.c                           | 756 ++++++++++++++++++
 net/mptcp/subflow.c                           |   5 +
 tools/testing/selftests/net/mptcp/Makefile    |   2 +-
 .../selftests/net/mptcp/mptcp_connect.c       |  23 +-
 .../selftests/net/mptcp/mptcp_sockopt.sh      | 276 +++++++
 8 files changed, 1122 insertions(+), 177 deletions(-)
 create mode 100644 net/mptcp/sockopt.c
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh


base-commit: 3a1aa533f7f676aad68f8dbbbba10b9502903770

Comments

[e-mail] April 16, 2021, 10:30 p.m. UTC | #1

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Thu, 15 Apr 2021 16:44:49 -0700 you wrote:
> MPTCP sockets have previously had limited socket option support. The
> architecture of MPTCP sockets (one userspace-facing MPTCP socket that
> manages one or more in-kernel TCP subflow sockets) adds complexity for
> passing options through to lower levels. This patch set adds MPTCP
> support for socket options commonly used with TCP.
> 
> Patch 1 reverts an interim socket option fix (a socket option blocklist)
> that was merged in the net tree for v5.12.
> 
> [...]

Here is the summary with links:
  - [net-next,01/13] mptcp: revert "mptcp: forbit mcast-related sockopt on MPTCP sockets"
    https://git.kernel.org/netdev/net-next/c/bd005f53862b
  - [net-next,02/13] mptcp: move sockopt function into a new file
    https://git.kernel.org/netdev/net-next/c/0abdde82b163
  - [net-next,03/13] mptcp: only admit explicitly supported sockopt
    https://git.kernel.org/netdev/net-next/c/d9e4c1291810
  - [net-next,04/13] mptcp: add skeleton to sync msk socket options to subflows
    https://git.kernel.org/netdev/net-next/c/7896248983ef
  - [net-next,05/13] mptcp: tag sequence_seq with socket state
    https://git.kernel.org/netdev/net-next/c/df00b087da24
  - [net-next,06/13] mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY
    https://git.kernel.org/netdev/net-next/c/1b3e7ede1365
  - [net-next,07/13] mptcp: setsockopt: handle receive/send buffer and device bind
    https://git.kernel.org/netdev/net-next/c/5d0a6bc82d38
  - [net-next,08/13] mptcp: setsockopt: support SO_LINGER
    https://git.kernel.org/netdev/net-next/c/268b12387460
  - [net-next,09/13] mptcp: setsockopt: add SO_MARK support
    https://git.kernel.org/netdev/net-next/c/36704413db79
  - [net-next,10/13] mptcp: setsockopt: add SO_INCOMING_CPU
    https://git.kernel.org/netdev/net-next/c/6f0d7198084c
  - [net-next,11/13] mptcp: setsockopt: SO_DEBUG and no-op options
    https://git.kernel.org/netdev/net-next/c/a03c99b253c2
  - [net-next,12/13] mptcp: sockopt: add TCP_CONGESTION and TCP_INFO
    https://git.kernel.org/netdev/net-next/c/aa1fbd94e5c7
  - [net-next,13/13] selftests: mptcp: add packet mark test case
    https://git.kernel.org/netdev/net-next/c/dc65fe82fb07

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html