Skip to content

mptcp: fix MP_JOIN failure handling

Paolo Abeni mptcp netdev 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 5 repliesIn review
  2. v13 patches 5 repliesSuperseded

Changes in v2 from the cover letter

- be more conservative about drop_req initialization

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3mptcp: add new sock flag to deal with join subflowsinclude/linux/tcp.h include/net/mptcp.h net/ipv4/tcp_minisocks.c +2 more+17 -152 replies
2/3inet_connection_sock: factor out destroy helper.include/net/inet_connection_sock.h net/ipv4/inet_connection_sock.c+9 -51 reply
3/3mptcp: cope better with MP_JOIN failurenet/mptcp/subflow.c+9 -61 reply

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchChristoph PaaschMat Martineau
1/3R-b R-b
2/3R-b R-b
3/3R-b R-b

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

Read the v2 thread

Cover letter [PATCH net-next v2 0/3] mptcp: fix MP_JOIN failure handling

Currently if we hit an MP_JOIN failure on the third ack, the child socket is closed with reset, but the request socket is not deleted, causing weird behaviors.

The main problem is that MPTCP's MP_JOIN code needs to plug it's own 'valid 3rd ack' checks and the current TCP callbacks do not allow that.

This series tries to address the above shortcoming introducing a new MPTCP specific bit in a 'struct tcp_request_sock' hole, and leveraging that to allow tcp_check_req releasing the request socket when needed.

The above allows cleaning-up a bit current MPTCP hooking in tcp_check_req().

An alternative solution, possibly cleaner but more invasive, would be changing the 'bool *own_req' syn_recv_sock() argument into 'int *req_status' and let MPTCP set it to 'REQ_DROP'.

v1 -> v2:
- be more conservative about drop_req initialization

RFC -> v1:
- move the drop_req bit inside tcp_request_sock (Eric)

Paolo Abeni (3):
mptcp: add new sock flag to deal with join subflows
inet_connection_sock: factor out destroy helper.
mptcp: cope better with MP_JOIN failure

 include/linux/tcp.h                |  3 +++
 include/net/inet_connection_sock.h |  8 ++++++++
 include/net/mptcp.h                | 17 ++++++++++-------
 net/ipv4/inet_connection_sock.c    |  6 +-----
 net/ipv4/tcp_minisocks.c           |  2 +-
 net/mptcp/protocol.c               |  7 -------
 net/mptcp/subflow.c                | 18 ++++++++++++------
 7 files changed, 35 insertions(+), 26 deletions(-)
Signature · 1 line
2.21.3