mptcp: Fixes for ULP, a deadlock, and netlink docs

[PATCH net 0/4] mptcp: Fixes for ULP, a deadlock, and netlink docs

Mat Martineau posted 4 patches 4 years, 1 month ago

Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20211214231604.211016-1-mathew.j.martineau@linux.intel.com

Maintainers: Florian Westphal <fw@strlen.de>, Davide Caratti <dcaratti@redhat.com>, Matthieu Baerts <matthieu.baerts@tessares.net>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Peter Krystad <peter.krystad@linux.intel.com>, Mat Martineau <mathew.j.martineau@linux.intel.com>

include/uapi/linux/mptcp.h | 18 ++++++++++--------
net/mptcp/protocol.c       |  6 ++++--
net/mptcp/sockopt.c        |  1 -
3 files changed, 14 insertions(+), 11 deletions(-)

Expand all Fold all

[PATCH net 0/4] mptcp: Fixes for ULP, a deadlock, and netlink docs

Posted by Mat Martineau 4 years, 1 month ago

Two of the MPTCP fixes in this set are related to the TCP_ULP socket
option with MPTCP sockets operating in "fallback" mode (the connection
has reverted to regular TCP). The other issues are an observed deadlock
and missing parameter documentation in the MPTCP netlink API.


Patch 1 marks TCP_ULP as unsupported earlier in MPTCP setsockopt code,
so the fallback code path in the MPTCP layer does not pass the TCP_ULP
option down to the subflow TCP socket.

Patch 2 makes sure a TCP fallback socket returned to userspace by
accept()ing on a MPTCP listening socket does not allow use of the
"mptcp" TCP_ULP type. That ULP is intended only for use by in-kernel
MPTCP subflows.

Patch 3 fixes the possible deadlock when sending data and there are
socket option changes to sync to the subflows.

Patch 4 makes sure all MPTCP netlink event parameters are documented
in the MPTCP uapi header.


Florian Westphal (2):
  mptcp: remove tcp ulp setsockopt support
  mptcp: clear 'kern' flag from fallback sockets

Matthieu Baerts (1):
  mptcp: add missing documented NL params

Maxim Galaganov (1):
  mptcp: fix deadlock in __mptcp_push_pending()

 include/uapi/linux/mptcp.h | 18 ++++++++++--------
 net/mptcp/protocol.c       |  6 ++++--
 net/mptcp/sockopt.c        |  1 -
 3 files changed, 14 insertions(+), 11 deletions(-)


base-commit: 3dd7d40b43663f58d11ee7a3d3798813b26a48f1
-- 
2.34.1

Re: [PATCH net 0/4] mptcp: Fixes for ULP, a deadlock, and netlink docs

Posted by patchwork-bot+netdevbpf@kernel.org 4 years, 1 month ago

Hello:

This series was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 14 Dec 2021 15:16:00 -0800 you wrote:
> Two of the MPTCP fixes in this set are related to the TCP_ULP socket
> option with MPTCP sockets operating in "fallback" mode (the connection
> has reverted to regular TCP). The other issues are an observed deadlock
> and missing parameter documentation in the MPTCP netlink API.
> 
> 
> Patch 1 marks TCP_ULP as unsupported earlier in MPTCP setsockopt code,
> so the fallback code path in the MPTCP layer does not pass the TCP_ULP
> option down to the subflow TCP socket.
> 
> [...]

Here is the summary with links:
  - [net,1/4] mptcp: remove tcp ulp setsockopt support
    https://git.kernel.org/netdev/net/c/404cd9a22150
  - [net,2/4] mptcp: clear 'kern' flag from fallback sockets
    https://git.kernel.org/netdev/net/c/d6692b3b97bd
  - [net,3/4] mptcp: fix deadlock in __mptcp_push_pending()
    https://git.kernel.org/netdev/net/c/3d79e3756ca9
  - [net,4/4] mptcp: add missing documented NL params
    https://git.kernel.org/netdev/net/c/6813b1928758

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html