mptcp: Fixes and maintainer email update for v6.6
Subsystems (4)
Mat Martineau
maintainercover mptcp: Fixes and maintainer email update for v6.6
Patch 1 addresses a race condition in MPTCP "delegated actions" infrastructure. Affects v5.19 and later.
Patch 2 removes an unnecessary restriction that did not allow additional outgoing subflows using the local address of the initial MPTCP subflow. v5.16 and later.
Patch 3 updates Matthieu's email address.
---
Geliang Tang (1):
mptcp: userspace pm allow creating id 0 subflow
Matthieu Baerts (1):
MAINTAINERS: update Matthieu's email address
Paolo Abeni (1):
mptcp: fix delegated action races
.mailmap | 1 + MAINTAINERS | 2 +- net/mptcp/pm_userspace.c | 6 ------ net/mptcp/protocol.c | 28 ++++++++++++++-------------- net/mptcp/protocol.h | 35 ++++++++++++----------------------- net/mptcp/subflow.c | 10 ++++++++-- 6 files changed, 36 insertions(+), 46 deletions(-)
---
base-commit: 0add5c597f3253a9c6108a0a81d57f44ab0d9d30
change-id: 20231004-send-net-20231004-7e1422eddf40
Best regards,
Signature · 1 line
Mat Martineau <[email protected]>
Mat Martineau
maintainerPATCH 1/3 mptcp: fix delegated action races
From: Paolo Abeni <[email protected]>
The delegated action infrastructure is prone to the following
race: different CPUs can try to schedule different delegated actions on the same subflow at the same time.
Each of them will check different bits via mptcp_subflow_delegate(), and will try to schedule the action on the related per-cpu napi instance.
Depending on the timing, both can observe an empty delegated list node, causing the same entry to be added simultaneously on two different lists.
The root cause is that the delegated actions infra does not provide a single synchronization point. Address the issue reserving an additional bit to mark the subflow as scheduled for delegation. Acquiring such bit guarantee the caller to own the delegated list node, and being able to safely schedule the subflow.
Clear such bit only when the subflow scheduling is completed, ensuring proper barrier in place.
Additionally swap the meaning of the delegated_action bitmask, to allow the usage of the existing helper to set multiple bit at once.
--- net/mptcp/protocol.c | 28 ++++++++++++++-------------- net/mptcp/protocol.h | 35 ++++++++++++----------------------- net/mptcp/subflow.c | 10 ++++++++-- 3 files changed, 34 insertions(+), 39 deletions(-)
net/mptcp/protocol.c +14 -14
@@ -3425,24 +3425,21 @@ static void schedule_3rdack_retransmission(struct sock *ssk)sk_reset_timer (ssk, &icsk->icsk_delack_timer, timeout); } -void mptcp_subflow_process_delegated (struct sock *ssk) +void mptcp_subflow_process_delegated (struct sock *ssk,long status) {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk);struct sock *sk = subflow->conn; -if (test_bit (MPTCP_DELEGATE_SEND , &subflow->delegated_status)) { +if (status &BIT (MPTCP_DELEGATE_SEND )) {mptcp_data_lock (sk);if (!sock_owned_by_user (sk))__mptcp_subflow_push_pending (sk, ssk, true);else __set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->cb_flags);mptcp_data_unlock (sk); -mptcp_subflow_delegated_done (subflow,MPTCP_DELEGATE_SEND ); } -if (test_bit (MPTCP_DELEGATE_ACK , &subflow->delegated_status)) { +if (status &BIT (MPTCP_DELEGATE_ACK ))schedule_3rdack_retransmission (ssk); -mptcp_subflow_delegated_done (subflow,MPTCP_DELEGATE_ACK ); - } }static int mptcp_hash (struct sock *sk)
@@ -3968,14 +3965,17 @@ static int mptcp_napi_poll(struct napi_struct *napi, int budget)struct sock *ssk =mptcp_subflow_tcp_sock (subflow);bh_lock_sock_nested (ssk); -if (!sock_owned_by_user (ssk) && -mptcp_subflow_has_delegated_action (subflow)) -mptcp_subflow_process_delegated (ssk); -/* ... elsewhere tcp_release_cb_override already processed -* the action or will do at next release_sock(). -* In both case must dequeue the subflow here - on the same -* CPU that scheduled it. -*/ +if (!sock_owned_by_user (ssk)) { +mptcp_subflow_process_delegated (ssk,xchg (&subflow->delegated_status,0 )); + }else { +/* tcp_release_cb_override already processed +* the action or will do at next release_sock(). +* In both case must dequeue the subflow here - on the same +* CPU that scheduled it. +*/ +smp_wmb (); +clear_bit (MPTCP_DELEGATE_SCHEDULED , &subflow->delegated_status); + }bh_unlock_sock (ssk);sock_put (ssk);
net/mptcp/protocol.h +12 -23
@@ -444,9 +444,11 @@ struct mptcp_delegated_action { DECLARE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions); -#define MPTCP_DELEGATE_SEND 0 -#define MPTCP_DELEGATE_ACK 1 +#define MPTCP_DELEGATE_SCHEDULED 0 +#define MPTCP_DELEGATE_SEND 1 +#define MPTCP_DELEGATE_ACK 2 +#define MPTCP_DELEGATE_ACTIONS_MASK (~BIT(MPTCP_DELEGATE_SCHEDULED))/* MPTCP subflow context */ struct mptcp_subflow_context {struct list_head node;/* conn_list of subflows */
@@ -564,23 +566,24 @@ mptcp_subflow_get_mapped_dsn(const struct mptcp_subflow_context *subflow)return subflow->map_seq +mptcp_subflow_get_map_offset (subflow); } -void mptcp_subflow_process_delegated (struct sock *ssk); +void mptcp_subflow_process_delegated (struct sock *ssk,long actions);static inline void mptcp_subflow_delegate (struct mptcp_subflow_context *subflow,int action) { +long old, set_bits =BIT (MPTCP_DELEGATE_SCHEDULED ) |BIT (action);struct mptcp_delegated_action *delegated;bool schedule;/* the caller held the subflow bh socket lock */ lockdep_assert_in_softirq (); -/* The implied barrier pairs with mptcp_subflow_delegated_done(), and -* ensures the below list check sees list updates done prior to status -* bit changes +/* The implied barrier pairs with tcp_release_cb_override() +* mptcp_napi_poll(), and ensures the below list check sees list +* updates done prior to delegated status bits changes */ -if (!test_and_set_bit (action, &subflow->delegated_status)) { -/* still on delegated list from previous scheduling */ -if (!list_empty (&subflow->delegated_node)) + old =set_mask_bits (&subflow->delegated_status,0 , set_bits); +if (!(old &BIT (MPTCP_DELEGATE_SCHEDULED ))) { +if (WARN_ON_ONCE (!list_empty (&subflow->delegated_node)))return ; delegated =this_cpu_ptr (&mptcp_delegated_actions);
@@ -605,20 +608,6 @@ mptcp_subflow_delegated_next(struct mptcp_delegated_action *delegated)return ret; } -static inline bool mptcp_subflow_has_delegated_action (const struct mptcp_subflow_context *subflow) -{ -return !!READ_ONCE (subflow->delegated_status); -} - -static inline void mptcp_subflow_delegated_done (struct mptcp_subflow_context *subflow,int action) -{ -/* pairs with mptcp_subflow_delegate, ensures delegate_node is updated before -* touching the status bit -*/ -smp_wmb (); -clear_bit (action, &subflow->delegated_status); -} -int mptcp_is_enabled (const struct net *net);unsigned int mptcp_get_add_addr_timeout (const struct net *net);int mptcp_is_checksum_enabled (const struct net *net);
net/mptcp/subflow.c +8 -2
@@ -1956,9 +1956,15 @@ static void subflow_ulp_clone(const struct request_sock *req,static void tcp_release_cb_override (struct sock *ssk) {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); +long status; -if (mptcp_subflow_has_delegated_action (subflow)) -mptcp_subflow_process_delegated (ssk); +/* process and clear all the pending actions, but leave the subflow into +* the napi queue. To respect locking, only the same CPU that originated +* the action can touch the list. mptcp_napi_poll will take care of it. +*/ + status =set_mask_bits (&subflow->delegated_status,MPTCP_DELEGATE_ACTIONS_MASK ,0 ); +if (status) +mptcp_subflow_process_delegated (ssk, status);tcp_release_cb (ssk); }
Signature · 1 line
2.41.0
Mat Martineau
maintainerPATCH 2/3 mptcp: userspace pm allow creating id 0 subflow
In reply to Mat MartineauFrom: Geliang Tang <[email protected]>
This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow creating additional subflows with the local addr ID 0.
There is no reason not to allow additional subflows from this local
address: we should be able to create new subflows from the initial endpoint. This limitation was breaking fullmesh support from userspace.
--- net/mptcp/pm_userspace.c | 6 ------ 1 file changed, 6 deletions(-)
net/mptcp/pm_userspace.c +0 -6
@@ -307,12 +307,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) goto create_err; } -if (addr_l.id ==0 ) { -NL_SET_ERR_MSG_ATTR (info->extack, laddr,"missing local addr id" ); - err = -EINVAL ; - goto create_err; - } - err =mptcp_pm_parse_addr (raddr, info, &addr_r);if (err <0 ) {NL_SET_ERR_MSG_ATTR (info->extack, raddr,"error parsing remote addr" );
Signature · 1 line
2.41.0
Mat Martineau
maintainerPATCH 3/3 MAINTAINERS: update Matthieu's email address
In reply to Mat MartineauFrom: Matthieu Baerts <[email protected]>
Use my kernel.org account instead.
The other one will bounce by the end of the year.
--- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
.mailmap +1 -0
@@ -377,6 +377,7 @@ Matthew Wilcox <[email protected]> <[email protected]> Matthew Wilcox <[email protected]> <[email protected]> Matthew Wilcox <[email protected]> <[email protected]> Matthias Fuchs <[email protected]> <[email protected]> +Matthieu Baerts <[email protected]> <[email protected]> Matthieu CASTET <[email protected]> Matti Vaittinen <[email protected]> <[email protected]> Matt Ranostay <[email protected]> <[email protected]>
MAINTAINERS +1 -1
@@ -14942,7 +14942,7 @@ K: macsec K: \bmdo_ NETWORKING [MPTCP] -M: Matthieu Baerts <[email protected]> +M: Matthieu Baerts <[email protected]> M: Mat Martineau <[email protected]> L: [email protected] L: [email protected]
Signature · 1 line
2.41.0
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 04 Oct 2023 13:38:10 -0700 you wrote:
Patch 1 addresses a race condition in MPTCP "delegated actions" infrastructure. Affects v5.19 and later.
Patch 2 removes an unnecessary restriction that did not allow additional outgoing subflows using the local address of the initial MPTCP subflow. v5.16 and later.
[...]
Here is the summary with links:
- [net,1/3] mptcp: fix delegated action races
https://git.kernel.org/netdev/net/c/a5efdbcece83
- [net,2/3] mptcp: userspace pm allow creating id 0 subflow
https://git.kernel.org/netdev/net/c/e5ed101a6028 - [net,3/3] MAINTAINERS: update Matthieu's email address https://git.kernel.org/netdev/net/c/8eed6ee362b0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html