Skip to content

mptcp: add SOL_MPTCP getsockopt support

Florian Westphal mptcp 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest5 patches 3 repliesIn review
  2. v25 patches 3 repliesSuperseded
  3. v15 patches 7 repliesSuperseded

Changes in v3 from the cover letter

- address comments from Mat.
This only affects selftest program (init 'fd' to -1). Other than that, the only changes are in commit messages or re-format of code (reverse xmas).

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5mptcp: add new mptcp_fill_diag helperinclude/net/mptcp.h net/mptcp/mptcp_diag.c net/mptcp/sockopt.c+37 -250 replies
2/5mptcp: add MPTCP_INFO getsockoptinclude/linux/socket.h include/uapi/linux/mptcp.h net/mptcp/sockopt.c+44 -10 replies
3/5mptcp: add MPTCP_TCPINFO getsockopt supportinclude/uapi/linux/mptcp.h net/mptcp/sockopt.c+124 -10 replies
4/5mptcp: add MPTCP_SUBFLOW_ADDRS getsockopt supportinclude/uapi/linux/mptcp.h net/mptcp/sockopt.c+108 -01 reply
5/5selftests: mptcp: add mptcp getsockopt test casestools/testing/selftests/net/mptcp/Makefile tools/testing/selftests/net/mptcp/mptcp_sockopt.c tools/testing/selftests/net/mptcp/mptcp_sockopt.sh+674 -30 replies

Reviews trailers per patch

None of the 5 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMat Martineau
SeriesR-b
1/5
2/5
3/5
4/5
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH mptcp-next v3 0/5] mptcp: add SOL_MPTCP getsockopt support

Changes in v3:
- address comments from Mat.
This only affects selftest program (init 'fd' to -1). Other than that, the only changes are in commit messages or re-format of code (reverse xmas).

Changes in v2:
- move #define to start of file (Mat)
- refer to '"multipath-tcp.org"', not mptcp.org (Mat)
- use __kernel_sa_family_t in uapi header (test robot)
- add test cases with invalid inputs (Paolo)
- avoid duplicate mptcp_sockopt.h in Makefile (Paolo)
- remove _u_optlen (Paolo)

original cover letter:

This adds the MPTCP_INFO, MPTCP_TCPINFO and MPTCP_SUBFLOW_ADDRS mptcp getsockopt optnames.

MPTCP_INFO exposes the mptcp_info struct as an alternative to the existing netlink diag interface.

MPTCP_TCPINFO exposes the tcp_info struct.
Unlike SOL_TCP/TCP_INFO, this returns one struct for each active subflow.

MPTCP_SUBFLOW_ADDRS allows userspace to discover the ip addresses/ports used by the local and remote endpoints, one for each active tcp subflow.

MPTCP_TCPINFO and MPTCP_SUBFLOW_ADDRS share the same meta-header that needs to be pre-filled by userspace with the size of the data structures it expects. This is done to allow extension of the involved structs later on, without breaking backwards compatibility.

The meta-structure can also be used to discover the required space to obtain all information, as kernel will fill in the number of active subflows even if there is not enough room for the requested info itself.

More information is available in the individual patches. Last patch adds test cases for the three optnames.

Florian Westphal (5):
mptcp: add new mptcp_fill_diag helper
mptcp: add MPTCP_INFO getsockopt
mptcp: add MPTCP_TCPINFO getsockopt support
mptcp: add MPTCP_SUBFLOW_ADDRS getsockopt support
selftests: mptcp: add mptcp getsockopt test cases

 include/linux/socket.h                        |   1 +
 include/net/mptcp.h                           |   4 +
 include/uapi/linux/mptcp.h                    |  29 +
 net/mptcp/mptcp_diag.c                        |  26 +-
 net/mptcp/sockopt.c                           | 276 ++++++++
 tools/testing/selftests/net/mptcp/Makefile    |   2 +-
 .../selftests/net/mptcp/mptcp_sockopt.c       | 644 ++++++++++++++++++
 .../selftests/net/mptcp/mptcp_sockopt.sh      |  31 +-
 8 files changed, 985 insertions(+), 28 deletions(-)
 create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c
Signature · 1 line
2.31.1