[net,0/9] mptcp: fixes for v6.5

Message ID 20230704-upstream-net-20230704-misc-fixes-6-5-rc1-v1-0-d7e67c274ca5@tessares.net
Headers
Series mptcp: fixes for v6.5 |

Message

Matthieu Baerts July 4, 2023, 8:44 p.m. UTC
  Here is a first batch of fixes for v6.5 and older.

The fixes are not linked to each others.

Patch 1 ensures subflows are unhashed before cleaning the backlog to
avoid races. This fixes another recent fix from v6.4.

Patch 2 does not rely on implicit state check in mptcp_listen() to avoid
races when receiving an MP_FASTCLOSE. A regression from v5.17.

The rest fixes issues in the selftests.

Patch 3 makes sure errors when setting up the environment are no longer
ignored. For v5.17+.

Patch 4 uses 'iptables-legacy' if available to be able to run on older
kernels. A fix for v5.13 and newer.

Patch 5 catches errors when issues are detected with packet marks. Also
for v5.13+.

Patch 6 uses the correct variable instead of an undefined one. Even if
there was no visible impact, it can help to find regressions later. An
issue visible in v5.19+.

Patch 7 makes sure errors with some sub-tests are reported to have the
selftest marked as failed as expected. Also for v5.19+.

Patch 8 adds a kernel config that is required to execute MPTCP
selftests. It is valid for v5.9+.

Patch 9 fixes issues when validating the userspace path-manager with
32-bit arch, an issue affecting v5.19+.

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Matthieu Baerts (7):
      selftests: mptcp: connect: fail if nft supposed to work
      selftests: mptcp: sockopt: use 'iptables-legacy' if available
      selftests: mptcp: sockopt: return error if wrong mark
      selftests: mptcp: userspace_pm: use correct server port
      selftests: mptcp: userspace_pm: report errors with 'remove' tests
      selftests: mptcp: depend on SYN_COOKIES
      selftests: mptcp: pm_nl_ctl: fix 32-bit support

Paolo Abeni (2):
      mptcp: ensure subflow is unhashed before cleaning the backlog
      mptcp: do not rely on implicit state check in mptcp_listen()

 net/mptcp/protocol.c                               |  7 +++++-
 tools/testing/selftests/net/mptcp/config           |  1 +
 tools/testing/selftests/net/mptcp/mptcp_connect.sh |  3 +++
 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 29 ++++++++++++----------
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c      | 10 ++++----
 tools/testing/selftests/net/mptcp/userspace_pm.sh  |  4 ++-
 6 files changed, 34 insertions(+), 20 deletions(-)
---
base-commit: 14bb236b29922c4f57d8c05bfdbcb82677f917c9
change-id: 20230704-upstream-net-20230704-misc-fixes-6-5-rc1-c52608649559

Best regards,
  

Comments

patchwork-bot+netdevbpf@kernel.org July 5, 2023, 10 a.m. UTC | #1
Hello:

This series was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:

On Tue, 04 Jul 2023 22:44:32 +0200 you wrote:
> Here is a first batch of fixes for v6.5 and older.
> 
> The fixes are not linked to each others.
> 
> Patch 1 ensures subflows are unhashed before cleaning the backlog to
> avoid races. This fixes another recent fix from v6.4.
> 
> [...]

Here is the summary with links:
  - [net,1/9] mptcp: ensure subflow is unhashed before cleaning the backlog
    https://git.kernel.org/netdev/net/c/3fffa15bfef4
  - [net,2/9] mptcp: do not rely on implicit state check in mptcp_listen()
    https://git.kernel.org/netdev/net/c/0226436acf24
  - [net,3/9] selftests: mptcp: connect: fail if nft supposed to work
    https://git.kernel.org/netdev/net/c/221e4550454a
  - [net,4/9] selftests: mptcp: sockopt: use 'iptables-legacy' if available
    https://git.kernel.org/netdev/net/c/a5a5990c099d
  - [net,5/9] selftests: mptcp: sockopt: return error if wrong mark
    https://git.kernel.org/netdev/net/c/9ac4c28eb70c
  - [net,6/9] selftests: mptcp: userspace_pm: use correct server port
    https://git.kernel.org/netdev/net/c/d8566d0e0392
  - [net,7/9] selftests: mptcp: userspace_pm: report errors with 'remove' tests
    https://git.kernel.org/netdev/net/c/966c6c3adfb1
  - [net,8/9] selftests: mptcp: depend on SYN_COOKIES
    https://git.kernel.org/netdev/net/c/6c8880fcaa5c
  - [net,9/9] selftests: mptcp: pm_nl_ctl: fix 32-bit support
    https://git.kernel.org/netdev/net/c/61d965805026

You are awesome, thank you!