Skip to content

mptcp: Refactor ADD_ADDR/RM_ADDR handling

Mat Martineau mptcp netdev 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 0 repliesApplied 6/6

Patches in v1 All 6 applied

#Subject and filesSizeRepliesApplied
1/6mptcp: move drop_other_suboptions check under pm locknet/mptcp/options.c net/mptcp/pm.c net/mptcp/protocol.h+31 -180 repliesApplied
2/6mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separatenet/mptcp/pm.c net/mptcp/pm_netlink.c net/mptcp/protocol.h+18 -80 repliesApplied
3/6mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each othernet/mptcp/pm.c+10 -30 repliesApplied
4/6mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signalnet/mptcp/pm.c net/mptcp/protocol.h+10 -60 repliesApplied
5/6mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORTnet/mptcp/pm.c net/mptcp/pm_netlink.c net/mptcp/protocol.h+3 -210 repliesApplied
6/6selftests: mptcp: add_addr and echo race testtools/testing/selftests/net/mptcp/mptcp_join.sh+15 -00 repliesApplied

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH net-next 0/6] mptcp: Refactor ADD_ADDR/RM_ADDR handling

This patch set changes the way MPTCP ADD_ADDR and RM_ADDR options are handled to improve the reliability of sending and updating address advertisements. The information used to populate outgoing advertisement option headers is now stored separately to avoid rare cases where a more recent request would overwrite something that had not been sent yet. While the peers would recover from this, it's better to avoid the problem in the first place.

Patch 1 moves an advertisement option check under a lock so the changes made in the next several patches will not introduce a race.

Patches 2-4 make sure ADD_ADDR, ADD_ADDR echo, and RM_ADDR options use separate flags and data.

Patch 5 removes some now-redundant flags.

Patch 6 adds a selftest that confirms the advertisement reliability improvements.

Yonglong Li (6):
mptcp: move drop_other_suboptions check under pm lock
mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate
mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other
mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal
mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT
selftests: mptcp: add_addr and echo race test

 net/mptcp/options.c                           | 28 ++++-----
 net/mptcp/pm.c                                | 58 +++++++++++++------
 net/mptcp/pm_netlink.c                        | 10 ++--
 net/mptcp/protocol.h                          | 24 ++++----
 .../testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++
 5 files changed, 83 insertions(+), 52 deletions(-)

base-commit: f6a4e0e8a00ff6fadb29f3646ccd33cc85195a38

Signature · 1 line
2.33.0