diff options
| author | Geliang Tang <geliang.tang@suse.com> | 2022-04-26 23:57:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-27 11:45:54 +0200 |
| commit | 49fa1919d6bcdcf3cf3d080c1943f537f6ed5e70 (patch) | |
| tree | 9763e45a6fa1bd778b2bdff78d32de45a5402345 /net/mptcp/pm.c | |
| parent | mptcp: add MP_FAIL response support (diff) | |
| download | linux-49fa1919d6bcdcf3cf3d080c1943f537f6ed5e70.tar.xz linux-49fa1919d6bcdcf3cf3d080c1943f537f6ed5e70.zip | |
mptcp: reset subflow when MP_FAIL doesn't respond
This patch adds a new msk->flags bit MPTCP_FAIL_NO_RESPONSE, then reuses
sk_timer to trigger a check if we have not received a response from the
peer after sending MP_FAIL. If the peer doesn't respond properly, reset
the subflow.
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/mptcp/pm.c')
| -rw-r--r-- | net/mptcp/pm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 971e843a304c..14f448d82bb2 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -287,6 +287,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct mptcp_sock *msk = mptcp_sk(subflow->conn); + struct sock *s = (struct sock *)msk; pr_debug("fail_seq=%llu", fail_seq); @@ -299,6 +300,13 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) subflow->send_mp_fail = 1; MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); subflow->send_infinite_map = 1; + } else if (s && inet_sk_state_load(s) != TCP_CLOSE) { + pr_debug("MP_FAIL response received"); + + mptcp_data_lock(s); + if (inet_sk_state_load(s) != TCP_CLOSE) + sk_stop_timer(s, &s->sk_timer); + mptcp_data_unlock(s); } } |