Skip to content

mptcp: Fixes for 5.19

Mat Martineau mptcp netdev 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 0 repliesApplied 9/9

Patches in v1 All 9 applied

#Subject and filesSizeRepliesApplied
1/9mptcp: fix error mibs accountingnet/mptcp/options.c net/mptcp/pm.c net/mptcp/subflow.c+4 -60 repliesApplied
2/9mptcp: introduce MAPPING_BAD_CSUMnet/mptcp/subflow.c+9 -90 repliesApplied
3/9mptcp: invoke MP_FAIL response when needednet/mptcp/pm.c net/mptcp/protocol.c net/mptcp/protocol.h +1 more+82 -450 repliesApplied
4/9mptcp: fix shutdown vs fallback racenet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h +1 more+19 -60 repliesApplied
5/9mptcp: consistent map handling on failurenet/mptcp/subflow.c+9 -100 repliesApplied
6/9mptcp: fix race on unaccepted mptcp socketsnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/subflow.c+59 -00 repliesApplied
7/9selftests: mptcp: more stable diag teststools/testing/selftests/net/mptcp/diag.sh+40 -80 repliesApplied
8/9mptcp: fix conflict with <netinet/in.h>include/uapi/linux/mptcp.h+5 -40 repliesApplied
9/9selftests: mptcp: Initialize variables to quiet gcc 12 warningstools/testing/selftests/net/mptcp/mptcp_connect.c tools/testing/selftests/net/mptcp/mptcp_inq.c tools/testing/selftests/net/mptcp/mptcp_sockopt.c+3 -30 repliesApplied

Reviews trailers per patch

1 of 9 patches has a Reviewed-by or Acked-by.

PatchPaolo Abeni
1/9
2/9
3/9
4/9
5/9
6/9
7/9
8/9
9/9A-b

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

Read the v1 thread

Cover letter [PATCH net 0/9] mptcp: Fixes for 5.19

Several categories of fixes from the mptcp tree:

Patches 1-3 are fixes related to MP_FAIL and FASTCLOSE, to make sure MIBs are accurate, and to handle MP_FAIL transmission and responses at the correct times. sk_timer conflicts are also resolved.

Patches 4 and 6 handle two separate race conditions, one at socket shutdown and one with unaccepted subflows.

Patch 5 makes sure read operations are not blocked during fallback to TCP.

Patch 7 improves the diag selftest, which were incorrectly failing on slow machines (like the VMs used for CI testing).

Patch 8 avoids possible symbol redefinition errors in the userspace mptcp.h file.

Patch 9 fixes a selftest build issue with gcc 12.

Geliang Tang (1):
mptcp: invoke MP_FAIL response when needed

Mat Martineau (1):
selftests: mptcp: Initialize variables to quiet gcc 12 warnings

Ossama Othman (1):
mptcp: fix conflict with <netinet/in.h>

Paolo Abeni (6):
mptcp: fix error mibs accounting
mptcp: introduce MAPPING_BAD_CSUM
mptcp: fix shutdown vs fallback race
mptcp: consistent map handling on failure
mptcp: fix race on unaccepted mptcp sockets
selftests: mptcp: more stable diag tests

 include/uapi/linux/mptcp.h                    |   9 +-
 net/mptcp/options.c                           |   7 +-
 net/mptcp/pm.c                                |  10 +-
 net/mptcp/protocol.c                          |  84 +++++++-----
 net/mptcp/protocol.h                          |  24 +++-
 net/mptcp/subflow.c                           | 127 ++++++++++++++----
 tools/testing/selftests/net/mptcp/diag.sh     |  48 +++++--
 .../selftests/net/mptcp/mptcp_connect.c       |   2 +-
 tools/testing/selftests/net/mptcp/mptcp_inq.c |   2 +-
 .../selftests/net/mptcp/mptcp_sockopt.c       |   2 +-
 10 files changed, 227 insertions(+), 88 deletions(-)

base-commit: cb8092d70a6f5f01ec1490fce4d35efed3ed996c

Signature · 1 line
2.37.0