[net,0/9] mptcp: Fixes for 5.19

Message

Mat Martineau June 28, 2022, 1:02 a.m. UTC

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

Comments

[e-mail] June 29, 2022, 4 a.m. UTC | #1

Hello:

This series was applied to netdev/net.git (master)
by Jakub Kicinski <[e-mail]>:

On Mon, 27 Jun 2022 18:02:34 -0700 you wrote:
> 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.
> 
> [...]

Here is the summary with links:
  - [net,1/9] mptcp: fix error mibs accounting
    https://git.kernel.org/netdev/net/c/0c1f78a49af7
  - [net,2/9] mptcp: introduce MAPPING_BAD_CSUM
    https://git.kernel.org/netdev/net/c/31bf11de146c
  - [net,3/9] mptcp: invoke MP_FAIL response when needed
    https://git.kernel.org/netdev/net/c/76a13b315709
  - [net,4/9] mptcp: fix shutdown vs fallback race
    https://git.kernel.org/netdev/net/c/d51991e2e314
  - [net,5/9] mptcp: consistent map handling on failure
    https://git.kernel.org/netdev/net/c/f745a3ebdfb9
  - [net,6/9] mptcp: fix race on unaccepted mptcp sockets
    https://git.kernel.org/netdev/net/c/6aeed9045071
  - [net,7/9] selftests: mptcp: more stable diag tests
    https://git.kernel.org/netdev/net/c/42fb6cddec3b
  - [net,8/9] mptcp: fix conflict with <netinet/in.h>
    https://git.kernel.org/netdev/net/c/06e445f740c1
  - [net,9/9] selftests: mptcp: Initialize variables to quiet gcc 12 warnings
    https://git.kernel.org/netdev/net/c/fd37c2ecb21f

You are awesome, thank you!