mptcp: replace per-addr listener sockets
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest4 patches 14 repliesIn review
- v34 patches 4 repliesSuperseded
- v25 patches 6 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 4 patches | 8 replies | Superseded |
Changes in v4 from the cover letter
add handler4/handler6 wrappers in patch two to avoid build barf with CONFIG_IPV6=m. No other changes.
Patches in v4 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | mptcp: prefer ip address in syn skb instead of listen sk bound addressnet/ net/ net/ | +19 | 0 replies | |
| 2/4 | tcp: add mptcp join demultiplex hooksinclude/ net/ net/ | +26 | 0 replies | |
| 3/4 | mptcp: handle join requests via pernet listen socketinclude/ net/ net/ +3 more | +258 | 10 replies | |
| 4/4 | mptcp: remove per-address listening socketsnet/ | +0 | 4 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.
Cover letter [PATCH mptcp-next v4 0/4] mptcp: replace per-addr listener sockets
Changes since v3:
add handler4/handler6 wrappers in patch two to avoid build barf with CONFIG_IPV6=m. No other changes.
Changes since v2:
- drop first patch again, no longer needed
- move announce list check to the new join hook (Paolo)
- add joinhook for timewait sockets
- hide join6 member for !ipv6 build
Changes since v2:
- avoid unneeded sk refcount inc/dec pair
- use more descriptive name for function name
- fix typo in rfc number (Mathieu)
- don't increment listner refcount, caller assumes noref
Not changed:
- hook location, plain tcp sockets take precedence.
- per-netns listener
Global listener means other namespaces are affected in case of backlog overflow. Pernet listeners avoid that, so I don't see a strong argument for tcp refactoring that would allow global sk.
This series introduces a hidden per-netns pseudo "listener" socket to handle mptcp join requests with a valid token but that do not match an existing listening socket.
First patch is a minor preparation patch: MPTCP Join requests packets that fail to find a suitable socket by means of standard address/port demultiplexing will be steered to a pseudo-listener, similar to TPROXY interception.
This pseudo listener isn't bound to an address or port (all zero), so we need to fetch the port number from the tcp header and not the listener sk.
Patch two adds a stub to the tcp demux code.
This has no functionality, its extra to make tcp datapath change stand out.
Third patch is the bulk work, it adds per netns listener and implements token-based socket demultiplexing.
Last patch zaps the per-address sockets from mptcp, they are not needed anymore.
Florian Westphal (4):
mptcp: prefer ip address in syn skb instead of listen sk bound address
tcp: add mptcp join demultiplex hooks
mptcp: handle join requests via pernet listen socket
mptcp: remove per-address listening sockets
include/net/mptcp.h | 27 +++++ net/ipv4/tcp_ipv4.c | 7 ++ net/ipv6/tcp_ipv6.c | 26 +++-- net/mptcp/ctrl.c | 229 ++++++++++++++++++++++++++++++++++++++++- net/mptcp/pm_netlink.c | 82 +++------------ net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 4 +- net/mptcp/subflow.c | 9 +- 8 files changed, 299 insertions(+), 87 deletions(-)
Signature · 1 line
2.34.1