mptcp: fix delegated action races

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.

Fixes: bcd97734318d ("mptcp: use delegate action to schedule 3rd ack retrans")
Cc: stable@vger.kernel.org
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231004-send-net-20231004-v1-1-28de4ac663ae@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index e252539b1e195416674f348856c1da20a8f2d2db..c3b83cb390d9d82a7b8dec49b6bf5090636689c4 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -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);
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index ed61d6850cce899195240a1eb15a2c03129bbb26..3612545fa62e046b62a743fba72f9bc0fd7a4233 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -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);

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 918c1a2357906312c1c8317fd0115df8f117079e..9c1f8d1d63d24abad84605837c5b67b827aec1af 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -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);
 }