diff options
| author | Geliang Tang <geliang.tang@suse.com> | 2022-04-26 14:57:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-27 10:45:54 +0100 |
| commit | 9c81be0dbc89ccb76ce34c3a88425bf3a0d57ebb (patch) | |
| tree | b621f259c152b69feda0ae214ed3b0ea3f401b2b /net | |
| parent | 4293248c6704b854bf816aa1967e433402bee11c (diff) | |
| download | linux-stable-9c81be0dbc89ccb76ce34c3a88425bf3a0d57ebb.tar.gz linux-stable-9c81be0dbc89ccb76ce34c3a88425bf3a0d57ebb.tar.bz2 linux-stable-9c81be0dbc89ccb76ce34c3a88425bf3a0d57ebb.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/pm.c | 10 | ||||
| -rw-r--r-- | net/mptcp/protocol.h | 1 | ||||
| -rw-r--r-- | net/mptcp/subflow.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 5c36870d3420..971e843a304c 100644 --- 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); - 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; + } } /* path manager helpers */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 61d600693ffd..cc66c81a8fab 100644 --- 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; + bool mp_fail_response_expect; u32 remote_nonce; u64 thmac; u32 local_nonce; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 30ffb00661bb..ca2352ad20d4 100644 --- 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); + } else { + WRITE_ONCE(subflow->mp_fail_response_expect, true); } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; |