Skip to content

Multipath TCP part 3: Multiple subflows and path management

Mat Martineau netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest17 patches 5 repliesIn review
  2. v217 patches 1 replySuperseded
  3. v117 patches 1 replySuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17mptcp: Add ADD_ADDR handlinginclude/linux/tcp.h include/net/mptcp.h net/mptcp/crypto.c +2 more+262 -180 replies
2/17mptcp: Add path manager interfacenet/mptcp/Makefile net/mptcp/options.c net/mptcp/pm.c +3 more+264 -190 replies
3/17mptcp: Add handling of incoming MP_JOIN requestsinclude/linux/tcp.h include/net/mptcp.h net/ipv4/tcp_minisocks.c +5 more+390 -460 replies
4/17mptcp: Add handling of outgoing MP_JOIN requestsinclude/net/mptcp.h net/mptcp/options.c net/mptcp/protocol.c +2 more+287 -174 replies
5/17mptcp: Implement path manager interface commandsnet/mptcp/pm.c net/mptcp/protocol.c net/mptcp/protocol.h+129 -50 replies
6/17mptcp: update per unacked sequence on pkt receptionnet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h+49 -60 replies
7/17mptcp: queue data for mptcp level retransmissionnet/mptcp/protocol.c net/mptcp/protocol.h+147 -80 replies
8/17mptcp: introduce MPTCP retransmission timernet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h+93 -20 replies
9/17mptcp: implement memory accounting for mptcp rtx queuenet/mptcp/protocol.c+39 -30 replies
10/17mptcp: allow partial cleaning of rtx head dfragnet/mptcp/protocol.c net/mptcp/protocol.h+26 -00 replies
11/17mptcp: rework mptcp_sendmsg_frag to accept optional dfragnet/mptcp/protocol.c+74 -490 replies
12/17mptcp: implement and use MPTCP-level retransmissionnet/mptcp/protocol.c net/mptcp/protocol.h+95 -40 replies
13/17mptcp: allow dumping subflow context to userspaceMAINTAINERS include/uapi/linux/inet_diag.h include/uapi/linux/mptcp.h +4 more+146 -10 replies
14/17mptcp: add and use MIB counter infrastructureinclude/net/mptcp.h include/net/netns/mib.h net/ipv4/af_inet.c +6 more+172 -150 replies
15/17mptcp: add netlink-based PMinclude/uapi/linux/mptcp.h net/mptcp/Makefile net/mptcp/pm.c +2 more+928 -20 replies
16/17selftests: add PM netlink functional teststools/testing/selftests/net/mptcp/.gitignore tools/testing/selftests/net/mptcp/Makefile tools/testing/selftests/net/mptcp/pm_netlink.sh +1 more+751 -30 replies
17/17selftests: add test-cases for MPTCP MP_JOINtools/testing/selftests/net/mptcp/Makefile tools/testing/selftests/net/mptcp/mptcp_connect.c tools/testing/selftests/net/mptcp/mptcp_join.sh+383 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH net-next v3 00/17] Multipath TCP part 3: Multiple subflows and path management

v2 -> v3: Remove 'inline' in .c files, fix uapi bit macros, and rebase.

v1 -> v2: Rebase on current net-next, fix for netlink limit setting, and update .gitignore for selftest.

This patch set allows more than one TCP subflow to be established and used for a multipath TCP connection. Subflows are added to an existing connection using the MP_JOIN option during the 3-way handshake. With multiple TCP subflows available, sent data is now stored in the MPTCP socket so it may be retransmitted on any TCP subflow if there is no DATA_ACK before a timeout. If an MPTCP-level timeout occurs, data is retransmitted using an available subflow. Storing this sent data requires the addition of memory accounting at the MPTCP level, which was previously delegated to the single subflow. Incoming DATA_ACKs now free data from the MPTCP-level retransmit buffer.

IP addresses available for new subflow connections can now be advertised and received with the ADD_ADDR option, and the corresponding REMOVE_ADDR option likewise advertises that an address is no longer available.

The MPTCP path manager netlink interface has commands to set in-kernel limits for the number of concurrent subflows and control the advertisement of IP addresses between peers.

To track and debug MPTCP connections there are new MPTCP MIB counters, and subflow context can be requested using inet_diag. The MPTCP self-tests now validate multiple-subflow operation and the netlink path manager interface.

Clone/fetch:
https://github.com/multipath-tcp/mptcp_net-next.git (tag: netdev-for-5.7-part3-v3)

Browse:
https://github.com/multipath-tcp/mptcp_net-next/tree/netdev-for-5.7-part3-v3

Thank you for your review. You can find us at [email protected] and
https://is.gd/mptcp_upstream

Davide Caratti (1):
mptcp: allow dumping subflow context to userspace

Florian Westphal (2):
mptcp: allow partial cleaning of rtx head dfrag
mptcp: add and use MIB counter infrastructure

Paolo Abeni (9):
mptcp: update per unacked sequence on pkt reception
mptcp: queue data for mptcp level retransmission
mptcp: introduce MPTCP retransmission timer
mptcp: implement memory accounting for mptcp rtx queue
mptcp: rework mptcp_sendmsg_frag to accept optional dfrag
mptcp: implement and use MPTCP-level retransmission
mptcp: add netlink-based PM
selftests: add PM netlink functional tests
selftests: add test-cases for MPTCP MP_JOIN

Peter Krystad (5):
mptcp: Add ADD_ADDR handling
mptcp: Add path manager interface
mptcp: Add handling of incoming MP_JOIN requests
mptcp: Add handling of outgoing MP_JOIN requests
mptcp: Implement path manager interface commands

 MAINTAINERS                                   |   1 +
 include/linux/tcp.h                           |  26 +-
 include/net/mptcp.h                           |  26 +
 include/net/netns/mib.h                       |   3 +
 include/uapi/linux/inet_diag.h                |   1 +
 include/uapi/linux/mptcp.h                    |  89 ++
 net/ipv4/af_inet.c                            |   4 +
 net/ipv4/proc.c                               |   2 +
 net/ipv4/tcp_minisocks.c                      |   6 +
 net/mptcp/Makefile                            |   3 +-
 net/mptcp/crypto.c                            |  17 +-
 net/mptcp/diag.c                              | 104 +++
 net/mptcp/mib.c                               |  69 ++
 net/mptcp/mib.h                               |  40 +
 net/mptcp/options.c                           | 515 ++++++++++-
 net/mptcp/pm.c                                | 242 +++++
 net/mptcp/pm_netlink.c                        | 857 ++++++++++++++++++
 net/mptcp/protocol.c                          | 588 ++++++++++--
 net/mptcp/protocol.h                          | 187 +++-
 net/mptcp/subflow.c                           | 337 ++++++-
 net/mptcp/token.c                             |  27 +
 tools/testing/selftests/net/mptcp/.gitignore  |   1 +
 tools/testing/selftests/net/mptcp/Makefile    |   7 +-
 .../selftests/net/mptcp/mptcp_connect.c       |  28 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 357 ++++++++
 .../testing/selftests/net/mptcp/pm_netlink.sh | 130 +++
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 616 +++++++++++++
 27 files changed, 4158 insertions(+), 125 deletions(-)
 create mode 100644 include/uapi/linux/mptcp.h
 create mode 100644 net/mptcp/diag.c
 create mode 100644 net/mptcp/mib.c
 create mode 100644 net/mptcp/mib.h
 create mode 100644 net/mptcp/pm.c
 create mode 100644 net/mptcp/pm_netlink.c
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_join.sh
 create mode 100755 tools/testing/selftests/net/mptcp/pm_netlink.sh
 create mode 100644 tools/testing/selftests/net/mptcp/pm_nl_ctl.c

base-commit: 5bb7357f45315138f623d08a615d23dd6ac26cf3

Signature · 1 line
2.26.0