Skip to content

RFC mptcp: refactor incoming options parsing

Paolo Abeni mptcp 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest6 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6mptcp: consolidate synack processing.include/net/mptcp.h net/ipv4/tcp_input.c net/mptcp/options.c +1 more+24 -290 replies
2/6mptcp: move option parsing into mptcp_incoming_options()include/linux/tcp.h include/net/mptcp.h net/ipv4/tcp_input.c +4 more+114 -1231 reply
3/6mptcp: avoid a WARN on bad input.net/mptcp/options.c+2 -20 replies
4/6mptcp: fix 'use_ack' option access.net/mptcp/options.c+1 -10 replies
5/6mptcp: initialize data_fin field for mpc packetsnet/mptcp/options.c+1 -00 replies
6/6mptcp: cleanup option parsingnet/mptcp/subflow.c+3 -20 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [MPTCP] [RFC PATCH 0/6] mptcp: refactor incoming options parsing

This is an alternative solution for the pending option parsing solution, previous attempt here:

https://lists.01.org/hyperkitty/list/mptcp(a)lists.01.org/thread/7FW4C3W4WS42GWTRWFQWCTCUYGKLIHFJ/

instead of adding (many) explicitly 'clear MPTCP options' operation to the TCP code, it moves completely the options parsing into the MPTCP code - see patch 2/6.

This addresses also the problems with the previois attempt for no-mptcp-opt pkts.

patch 1/6 is a needed pre-requisites, while patch 3,4,5 are smaller somewhat releated fixes.

patch 6/6 is just a minor clean-up and likely could be squashed into 6/6.

Stress test with syzkaller repro survived a few hours run without any splash, while I can hit WARN_ON() on top of current export branch + pending -net fixes in a few mins with the same test.

Overall I'm personally more confident in this approach than in the previous one. Any comments more than welcome! Specifically I'm wondering if this should target -net or net-next...

Paolo Abeni (6):
mptcp: consolidate synack processing.
mptcp: move option parsing into mptcp_incoming_options()
mptcp: avoid a WARN on bad input.
mptcp: fix 'use_ack' option access.
mptcp: initialize data_fin field for mpc packets
mptcp: cleanup option parsing

 include/linux/tcp.h  | 51 ------------------------
 include/net/mptcp.h  |  3 --
 net/ipv4/tcp_input.c |  7 ----
 net/mptcp/options.c  | 95 +++++++++++++++++++-------------------------
 net/mptcp/protocol.c |  6 +--
 net/mptcp/protocol.h | 43 +++++++++++++++++++-
 net/mptcp/subflow.c  | 81 +++++++++++++++++++++++--------------
 7 files changed, 137 insertions(+), 149 deletions(-)
Signature · 1 line
2.21.1