mptcp: add MP_FAIL response support

This patch adds a new struct member mp_fail_response_expect in struct
mptcp_subflow_context to support MP_FAIL response. In the single subflow
with checksum error and contiguous data special case, a MP_FAIL is sent
in response to another MP_FAIL.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 5c36870d3420b14b9fde0c549c52d4586963858d..971e843a304cb9a21214727188655c6226872fd7 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -290,8 +290,16 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
 
        pr_debug("fail_seq=%llu", fail_seq);
 
 
        pr_debug("fail_seq=%llu", fail_seq);
 

-       if (!mptcp_has_another_subflow(sk) && READ_ONCE(msk->allow_infinite_fallback))
+       if (mptcp_has_another_subflow(sk) || !READ_ONCE(msk->allow_infinite_fallback))
+               return;
+
+       if (!READ_ONCE(subflow->mp_fail_response_expect)) {
+               pr_debug("send MP_FAIL response and infinite map");
+
+               subflow->send_mp_fail = 1;
+               MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX);

                subflow->send_infinite_map = 1;
                subflow->send_infinite_map = 1;

+       }

 }
 
 /* path manager helpers */
 }
 
 /* path manager helpers */

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 61d600693ffd06ef4073d581a22bd223a9a1e2e6..cc66c81a8fabac9842998b988e47d9b41beaad22 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -448,6 +448,7 @@ struct mptcp_subflow_context {
                stale : 1,          /* unable to snd/rcv data, do not use for xmit */
                local_id_valid : 1; /* local_id is correctly initialized */
        enum mptcp_data_avail data_avail;
                stale : 1,          /* unable to snd/rcv data, do not use for xmit */
                local_id_valid : 1; /* local_id is correctly initialized */
        enum mptcp_data_avail data_avail;

+       bool    mp_fail_response_expect;

        u32     remote_nonce;
        u64     thmac;
        u32     local_nonce;
        u32     remote_nonce;
        u64     thmac;
        u32     local_nonce;

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 30ffb00661bb937c8706e9ca4768bd0da0c6459c..ca2352ad20d4d41aeb7e09dc4dfb329050e07937 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1217,6 +1217,8 @@ fallback:
                                tcp_send_active_reset(ssk, GFP_ATOMIC);
                                while ((skb = skb_peek(&ssk->sk_receive_queue)))
                                        sk_eat_skb(ssk, skb);
                                tcp_send_active_reset(ssk, GFP_ATOMIC);
                                while ((skb = skb_peek(&ssk->sk_receive_queue)))
                                        sk_eat_skb(ssk, skb);

+                       } else {
+                               WRITE_ONCE(subflow->mp_fail_response_expect, true);

                        }
                        WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
                        return true;
                        }
                        WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
                        return true;