Skip to content

mptcp: inet diag listen dump support

Florian Westphal mptcp 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 2 repliesIn review
  2. v23 patches 1 replySuperseded
  3. v14 patches 4 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4mptcp: diag: switch to context structurenet/mptcp/mptcp_diag.c+11 -30 replies
2/4mptcp: remove locking in mptcp_diag_fill_infonet/mptcp/sockopt.c+0 -60 replies
3/4mptcp: listen diag dump supportnet/mptcp/mptcp_diag.c+91 -00 replies
4/4selftests/mptcp: add diag listen teststools/testing/selftests/net/mptcp/diag.sh+38 -00 replies

Reviews trailers per patch

None of the 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMat Martineau
SeriesR-b
1/4
2/4
3/4
4/4

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

Read the v3 thread

Cover letter [PATCH mptcp-next v3 0/4] mptcp: inet diag listen dump support

Changes in v3: fix intendation, fix uninitialised var (Mat)
extend mptcp diag tests

Changes in v2: drop patch 4 and prefer msk->first (Paolo Abeni)

Done in a not-very-elegant way:
Iterate over tcp listen hash, then pick out the tcp sockets with mptcp-ctx structure attached, then take the conn->sk for dumping.

First patch is preparation/cleanup.
Second patch gets rid of locking to avoid a lockdep splat. If the socket lock is really needed (I don't see where) I can workaround this by dropping locks temporarily when iterating the listen hash table, but its a bit more awkward.

Sample output:
ss -Mil

State        Recv-Q Send-Q Local Address:Port  Peer Address:Port
LISTEN       0      20     127.0.0.1:12000     0.0.0.0:*

subflows_max:2

Florian Westphal (4):
mptcp: diag: switch to context structure
mptcp: remove locking in mptcp_diag_fill_info
mptcp: listen diag dump support
selftests/mptcp: add diag listen tests

 net/mptcp/mptcp_diag.c                    | 105 +++++++++++++++++++++-
 net/mptcp/sockopt.c                       |   6 --
 tools/testing/selftests/net/mptcp/diag.sh |  38 ++++++++
 3 files changed, 140 insertions(+), 9 deletions(-)
Signature · 1 line
2.35.1