* [PATCH mptcp-net 1/5] mptcp: fix error mibs accounting
2022-06-15 9:16 [PATCH mptcp-net 0/5] mptcp: mp_fail related fixes Paolo Abeni
@ 2022-06-15 9:16 ` Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 2/5] mptcp: introduce MAPPING_BAD_CSUM Paolo Abeni
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 9:16 UTC (permalink / raw)
To: mptcp
The current accounting for MP_FAIL and FASTCLOSE is not very
accurate: both can be increased even when the related option is
not really sent. Move the accounting into the correct place.
Fixes: eb7f33654dc1 ("mptcp: add the mibs for MP_FAIL")
Fixes: 1e75629cb964 ("mptcp: add the mibs for MP_FASTCLOSE")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/options.c | 6 +++---
net/mptcp/pm.c | 1 -
net/mptcp/subflow.c | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index be3b918a6d15..0bfa6662447c 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -765,6 +765,7 @@ static noinline bool mptcp_established_options_rst(struct sock *sk, struct sk_bu
opts->suboptions |= OPTION_MPTCP_RST;
opts->reset_transient = subflow->reset_transient;
opts->reset_reason = subflow->reset_reason;
+ MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX);
return true;
}
@@ -788,6 +789,7 @@ static bool mptcp_established_options_fastclose(struct sock *sk,
opts->rcvr_key = msk->remote_key;
pr_debug("FASTCLOSE key=%llu", opts->rcvr_key);
+ MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX);
return true;
}
@@ -807,7 +809,7 @@ static bool mptcp_established_options_mp_fail(struct sock *sk,
*size = TCPOLEN_MPTCP_FAIL;
opts->suboptions |= OPTION_MPTCP_FAIL;
opts->fail_seq = subflow->map_seq;
-
+ MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX);
pr_debug("MP_FAIL fail_seq=%llu", opts->fail_seq);
return true;
@@ -833,13 +835,11 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) {
*size += opt_size;
remaining -= opt_size;
- MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX);
}
/* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */
if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) {
*size += opt_size;
remaining -= opt_size;
- MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX);
}
return true;
}
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 2a57d95d5492..3c7f07bb124e 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -309,7 +309,6 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
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;
} else {
pr_debug("MP_FAIL response received");
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 5351d54e514a..57d2d8d933d0 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -958,10 +958,8 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff *
subflow->map_data_csum);
if (unlikely(csum)) {
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR);
- if (subflow->mp_join || subflow->valid_csum_seen) {
+ if (subflow->mp_join || subflow->valid_csum_seen)
subflow->send_mp_fail = 1;
- MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPFAILTX);
- }
return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY;
}
--
2.35.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH mptcp-net 2/5] mptcp: introduce MAPPING_BAD_CSUM
2022-06-15 9:16 [PATCH mptcp-net 0/5] mptcp: mp_fail related fixes Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 1/5] mptcp: fix error mibs accounting Paolo Abeni
@ 2022-06-15 9:16 ` Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 3/5] Squash-to: "mptcp: invoke MP_FAIL response when needed" Paolo Abeni
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 9:16 UTC (permalink / raw)
To: mptcp
This allow moving a couple of conditional out of the fast path,
making the code more easy to follow and will simplify the next
patch.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/subflow.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 57d2d8d933d0..98b12a9c4eb5 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -843,7 +843,8 @@ enum mapping_status {
MAPPING_INVALID,
MAPPING_EMPTY,
MAPPING_DATA_FIN,
- MAPPING_DUMMY
+ MAPPING_DUMMY,
+ MAPPING_BAD_CSUM
};
static void dbg_bad_map(struct mptcp_subflow_context *subflow, u32 ssn)
@@ -958,9 +959,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff *
subflow->map_data_csum);
if (unlikely(csum)) {
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR);
- if (subflow->mp_join || subflow->valid_csum_seen)
- subflow->send_mp_fail = 1;
- return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY;
+ return MAPPING_BAD_CSUM;
}
subflow->valid_csum_seen = 1;
@@ -1178,10 +1177,8 @@ static bool subflow_check_data_avail(struct sock *ssk)
status = get_mapping_status(ssk, msk);
trace_subflow_check_data_avail(status, skb_peek(&ssk->sk_receive_queue));
- if (unlikely(status == MAPPING_INVALID))
- goto fallback;
-
- if (unlikely(status == MAPPING_DUMMY))
+ if (unlikely(status == MAPPING_INVALID || status == MAPPING_DUMMY ||
+ status == MAPPING_BAD_CSUM))
goto fallback;
if (status != MAPPING_OK)
@@ -1223,7 +1220,10 @@ static bool subflow_check_data_avail(struct sock *ssk)
fallback:
if (!__mptcp_check_fallback(msk)) {
/* RFC 8684 section 3.7. */
- if (subflow->send_mp_fail) {
+ if (status == MAPPING_BAD_CSUM &&
+ ((subflow->mp_join || subflow->valid_csum_seen))) {
+ subflow->send_mp_fail = 1;
+
if (!READ_ONCE(msk->allow_infinite_fallback)) {
ssk->sk_err = EBADMSG;
tcp_set_state(ssk, TCP_CLOSE);
--
2.35.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH mptcp-net 3/5] Squash-to: "mptcp: invoke MP_FAIL response when needed"
2022-06-15 9:16 [PATCH mptcp-net 0/5] mptcp: mp_fail related fixes Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 1/5] mptcp: fix error mibs accounting Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 2/5] mptcp: introduce MAPPING_BAD_CSUM Paolo Abeni
@ 2022-06-15 9:16 ` Paolo Abeni
2022-06-15 11:41 ` Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 4/5] mptcp: fix shutdown vs fallback race Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 5/5] mptcp: consistent map handling on failure Paolo Abeni
4 siblings, 1 reply; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 9:16 UTC (permalink / raw)
To: mptcp
This tries to address a few issues outstanding in the mentioned
patch:
- we explicitly need to reset the timeout timer for mp_fail's sake
- we need to explicitly generate a tcp ack for mp_fail, otherwise
there are no guarantees for suck option being sent out
- the timeout timer needs handling need some caring, as it's still
shared between mp_fail and msk socket timeout.
- we can re-use msk->first for msk->fail_ssk, as only the first/mpc
subflow can fail without reset. That additionally avoid the need
to clear fail_ssk on the relevant subflow close.
- fail_tout would need some additional annotation. Just to be on the
safe side move its manipulaiton under the ssk socket lock.
Last 2 paragraph of the squash to commit should be replaced with:
"""
It leverages the fact that only the MPC/first subflow can gracefully
fail to avoid unneeded subflows traversal: the failing subflow can
be only msk->first.
A new 'fail_tout' field is added to the subflow context to record the
MP_FAIL response timeout and use such field to reliably share the
timeout timer between the MP_FAIL event and the MPTCP socket close timeout.
Finally, a new ack is generated to send out MP_FAIL notification as soon
as we hit the relevant condition, instead of waiting a possibly unbound
time for the next data packet.
"""
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/pm.c | 4 +++-
net/mptcp/protocol.c | 54 ++++++++++++++++++++++++++++++++++++--------
net/mptcp/protocol.h | 4 ++--
net/mptcp/subflow.c | 24 ++++++++++++++++++--
4 files changed, 72 insertions(+), 14 deletions(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 3c7f07bb124e..45e2a48397b9 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -305,13 +305,15 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
if (!READ_ONCE(msk->allow_infinite_fallback))
return;
- if (!msk->fail_ssk) {
+ if (!subflow->fail_tout) {
pr_debug("send MP_FAIL response and infinite map");
subflow->send_mp_fail = 1;
subflow->send_infinite_map = 1;
+ tcp_send_ack(sk);
} else {
pr_debug("MP_FAIL response received");
+ WRITE_ONCE(subflow->fail_tout, 0);
}
}
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index b74c6ca52aee..2910105a99b0 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -500,7 +500,7 @@ static void mptcp_set_timeout(struct sock *sk)
__mptcp_set_timeout(sk, tout);
}
-static bool tcp_can_send_ack(const struct sock *ssk)
+static inline bool tcp_can_send_ack(const struct sock *ssk)
{
return !((1 << inet_sk_state_load(ssk)) &
(TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN));
@@ -2503,24 +2503,56 @@ static void __mptcp_retrans(struct sock *sk)
mptcp_reset_timer(sk);
}
+/* schedule the timeout timer for the nearest relevant event: either
+ * close timeout or mp_fail timeout. Both of them could be not
+ * scheduled yet
+ */
+void mptcp_reset_timeout(struct mptcp_sock *msk, unsigned long fail_tout)
+{
+ struct sock *sk = (struct sock *)msk;
+ unsigned long timeout, close_timeout;
+
+ if (!fail_tout && !sock_flag(sk, SOCK_DEAD))
+ return;
+
+ close_timeout = inet_csk(sk)->icsk_mtup.probe_timestamp - tcp_jiffies32 + jiffies + TCP_TIMEWAIT_LEN;
+
+ /* the following is basically time_min(close_timeout, fail_tout) */
+ if (!fail_tout)
+ timeout = close_timeout;
+ else if (!sock_flag(sk, SOCK_DEAD))
+ timeout = fail_tout;
+ else if (time_after(close_timeout, fail_tout))
+ timeout = fail_tout;
+ else
+ timeout = close_timeout;
+
+ sk_reset_timer(sk, &sk->sk_timer, timeout);
+}
+
static void mptcp_mp_fail_no_response(struct mptcp_sock *msk)
{
- struct sock *ssk = msk->fail_ssk;
+ struct sock *ssk = msk->first;
bool slow;
+ if (!ssk)
+ return;
+
pr_debug("MP_FAIL doesn't respond, reset the subflow");
slow = lock_sock_fast(ssk);
mptcp_subflow_reset(ssk);
+ WRITE_ONCE(mptcp_subflow_ctx(ssk)->fail_tout, 0);
unlock_sock_fast(ssk, slow);
- msk->fail_ssk = NULL;
+ mptcp_reset_timeout(msk, 0);
}
static void mptcp_worker(struct work_struct *work)
{
struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
struct sock *sk = &msk->sk.icsk_inet.sk;
+ unsigned long fail_tout;
int state;
lock_sock(sk);
@@ -2557,7 +2589,8 @@ static void mptcp_worker(struct work_struct *work)
if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags))
__mptcp_retrans(sk);
- if (msk->fail_ssk && time_after(jiffies, msk->fail_tout))
+ fail_tout = msk->first ? READ_ONCE(mptcp_subflow_ctx(msk->first)->fail_tout) : 0;
+ if (fail_tout && time_after(jiffies, fail_tout))
mptcp_mp_fail_no_response(msk);
unlock:
@@ -2585,8 +2618,6 @@ static int __mptcp_init_sock(struct sock *sk)
WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
WRITE_ONCE(msk->allow_infinite_fallback, true);
msk->recovery = false;
- msk->fail_ssk = NULL;
- msk->fail_tout = 0;
mptcp_pm_data_init(msk);
@@ -2807,7 +2838,9 @@ static void __mptcp_destroy_sock(struct sock *sk)
static void mptcp_close(struct sock *sk, long timeout)
{
struct mptcp_subflow_context *subflow;
+ struct mptcp_sock *msk = mptcp_sk(sk);
bool do_cancel_work = false;
+ unsigned long fail_tout = 0;
lock_sock(sk);
sk->sk_shutdown = SHUTDOWN_MASK;
@@ -2825,10 +2858,13 @@ static void mptcp_close(struct sock *sk, long timeout)
cleanup:
/* orphan all the subflows */
inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32;
- mptcp_for_each_subflow(mptcp_sk(sk), subflow) {
+ mptcp_for_each_subflow(msk, subflow) {
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
bool slow = lock_sock_fast_nested(ssk);
+ if (ssk == msk->first)
+ fail_tout = subflow->fail_tout;
+
sock_orphan(ssk);
unlock_sock_fast(ssk, slow);
}
@@ -2837,13 +2873,13 @@ static void mptcp_close(struct sock *sk, long timeout)
sock_hold(sk);
pr_debug("msk=%p state=%d", sk, sk->sk_state);
if (mptcp_sk(sk)->token)
- mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL);
+ mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);
if (sk->sk_state == TCP_CLOSE) {
__mptcp_destroy_sock(sk);
do_cancel_work = true;
} else {
- sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN);
+ mptcp_reset_timeout(msk, fail_tout);
}
release_sock(sk);
if (do_cancel_work)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index e420a441c056..1d2d71711872 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -306,8 +306,6 @@ struct mptcp_sock {
u32 setsockopt_seq;
char ca_name[TCP_CA_NAME_MAX];
- struct sock *fail_ssk;
- unsigned long fail_tout;
};
#define mptcp_data_lock(sk) spin_lock_bh(&(sk)->sk_lock.slock)
@@ -483,6 +481,7 @@ struct mptcp_subflow_context {
u8 stale_count;
long delegated_status;
+ unsigned long fail_tout;
);
@@ -663,6 +662,7 @@ void mptcp_get_options(const struct sk_buff *skb,
void mptcp_finish_connect(struct sock *sk);
void __mptcp_set_connected(struct sock *sk);
+void mptcp_reset_timeout(struct mptcp_sock *msk, unsigned long fail_tout);
static inline bool mptcp_is_fully_established(struct sock *sk)
{
return inet_sk_state_load(sk) == TCP_ESTABLISHED &&
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 98b12a9c4eb5..040901c1f40c 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1158,6 +1158,27 @@ static bool subflow_can_fallback(struct mptcp_subflow_context *subflow)
return !subflow->fully_established;
}
+static void mptcp_subflow_fail(struct mptcp_sock *msk, struct sock *ssk)
+{
+ struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
+ unsigned long fail_tout;
+
+ /* grecefull failure can happen only on the MPC subflow */
+ if (WARN_ON_ONCE(ssk != READ_ONCE(msk->first)))
+ return;
+
+ /* we don't need extreme accuracy here, use a zero fail_tout as special
+ * value meaning no fail timeout at all;
+ */
+ fail_tout = jiffies + TCP_RTO_MAX;
+ if (!fail_tout)
+ fail_tout = 1;
+ WRITE_ONCE(subflow->fail_tout, fail_tout);
+ tcp_send_ack(ssk);
+
+ mptcp_reset_timeout(msk, subflow->fail_tout);
+}
+
static bool subflow_check_data_avail(struct sock *ssk)
{
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
@@ -1233,8 +1254,7 @@ static bool subflow_check_data_avail(struct sock *ssk)
while ((skb = skb_peek(&ssk->sk_receive_queue)))
sk_eat_skb(ssk, skb);
} else {
- msk->fail_ssk = ssk;
- msk->fail_tout = jiffies + TCP_RTO_MAX;
+ mptcp_subflow_fail(msk, ssk);
}
WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
return true;
--
2.35.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH mptcp-net 3/5] Squash-to: "mptcp: invoke MP_FAIL response when needed"
2022-06-15 9:16 ` [PATCH mptcp-net 3/5] Squash-to: "mptcp: invoke MP_FAIL response when needed" Paolo Abeni
@ 2022-06-15 11:41 ` Paolo Abeni
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 11:41 UTC (permalink / raw)
To: mptcp
On Wed, 2022-06-15 at 11:16 +0200, Paolo Abeni wrote:
> This tries to address a few issues outstanding in the mentioned
> patch:
> - we explicitly need to reset the timeout timer for mp_fail's sake
> - we need to explicitly generate a tcp ack for mp_fail, otherwise
> there are no guarantees for suck option being sent out
> - the timeout timer needs handling need some caring, as it's still
> shared between mp_fail and msk socket timeout.
> - we can re-use msk->first for msk->fail_ssk, as only the first/mpc
> subflow can fail without reset. That additionally avoid the need
> to clear fail_ssk on the relevant subflow close.
> - fail_tout would need some additional annotation. Just to be on the
> safe side move its manipulaiton under the ssk socket lock.
>
> Last 2 paragraph of the squash to commit should be replaced with:
>
> """
> It leverages the fact that only the MPC/first subflow can gracefully
> fail to avoid unneeded subflows traversal: the failing subflow can
> be only msk->first.
>
> A new 'fail_tout' field is added to the subflow context to record the
> MP_FAIL response timeout and use such field to reliably share the
> timeout timer between the MP_FAIL event and the MPTCP socket close timeout.
>
> Finally, a new ack is generated to send out MP_FAIL notification as soon
> as we hit the relevant condition, instead of waiting a possibly unbound
> time for the next data packet.
> """
>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/mptcp/pm.c | 4 +++-
> net/mptcp/protocol.c | 54 ++++++++++++++++++++++++++++++++++++--------
> net/mptcp/protocol.h | 4 ++--
> net/mptcp/subflow.c | 24 ++++++++++++++++++--
> 4 files changed, 72 insertions(+), 14 deletions(-)
>
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 3c7f07bb124e..45e2a48397b9 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -305,13 +305,15 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
> if (!READ_ONCE(msk->allow_infinite_fallback))
> return;
>
> - if (!msk->fail_ssk) {
> + if (!subflow->fail_tout) {
> pr_debug("send MP_FAIL response and infinite map");
>
> subflow->send_mp_fail = 1;
> subflow->send_infinite_map = 1;
> + tcp_send_ack(sk);
> } else {
> pr_debug("MP_FAIL response received");
> + WRITE_ONCE(subflow->fail_tout, 0);
> }
> }
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index b74c6ca52aee..2910105a99b0 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -500,7 +500,7 @@ static void mptcp_set_timeout(struct sock *sk)
> __mptcp_set_timeout(sk, tout);
> }
>
> -static bool tcp_can_send_ack(const struct sock *ssk)
> +static inline bool tcp_can_send_ack(const struct sock *ssk)
> {
> return !((1 << inet_sk_state_load(ssk)) &
> (TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN));
> @@ -2503,24 +2503,56 @@ static void __mptcp_retrans(struct sock *sk)
> mptcp_reset_timer(sk);
> }
>
> +/* schedule the timeout timer for the nearest relevant event: either
> + * close timeout or mp_fail timeout. Both of them could be not
> + * scheduled yet
> + */
> +void mptcp_reset_timeout(struct mptcp_sock *msk, unsigned long fail_tout)
> +{
> + struct sock *sk = (struct sock *)msk;
> + unsigned long timeout, close_timeout;
> +
> + if (!fail_tout && !sock_flag(sk, SOCK_DEAD))
> + return;
> +
> + close_timeout = inet_csk(sk)->icsk_mtup.probe_timestamp - tcp_jiffies32 + jiffies + TCP_TIMEWAIT_LEN;
> +
> + /* the following is basically time_min(close_timeout, fail_tout) */
> + if (!fail_tout)
> + timeout = close_timeout;
> + else if (!sock_flag(sk, SOCK_DEAD))
> + timeout = fail_tout;
> + else if (time_after(close_timeout, fail_tout))
> + timeout = fail_tout;
> + else
> + timeout = close_timeout;
> +
> + sk_reset_timer(sk, &sk->sk_timer, timeout);
> +}
> +
> static void mptcp_mp_fail_no_response(struct mptcp_sock *msk)
> {
> - struct sock *ssk = msk->fail_ssk;
> + struct sock *ssk = msk->first;
> bool slow;
>
> + if (!ssk)
> + return;
> +
> pr_debug("MP_FAIL doesn't respond, reset the subflow");
>
> slow = lock_sock_fast(ssk);
> mptcp_subflow_reset(ssk);
> + WRITE_ONCE(mptcp_subflow_ctx(ssk)->fail_tout, 0);
> unlock_sock_fast(ssk, slow);
>
> - msk->fail_ssk = NULL;
> + mptcp_reset_timeout(msk, 0);
> }
>
> static void mptcp_worker(struct work_struct *work)
> {
> struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
> struct sock *sk = &msk->sk.icsk_inet.sk;
> + unsigned long fail_tout;
> int state;
>
> lock_sock(sk);
> @@ -2557,7 +2589,8 @@ static void mptcp_worker(struct work_struct *work)
> if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags))
> __mptcp_retrans(sk);
>
> - if (msk->fail_ssk && time_after(jiffies, msk->fail_tout))
> + fail_tout = msk->first ? READ_ONCE(mptcp_subflow_ctx(msk->first)->fail_tout) : 0;
For the records, the above apparently trigger an UaF in the CI debug
build on pktdrill tests.
AFAICS that is cause by the listener mptcp socket being destroyed while
the MPC is still in accept queue: the MPC socket is freed, but msk-
>first is not updated accordingly.
Note that the above issue is not related to this patch-series, but it
makes it much more easy to reproduce.
/P
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH mptcp-net 4/5] mptcp: fix shutdown vs fallback race
2022-06-15 9:16 [PATCH mptcp-net 0/5] mptcp: mp_fail related fixes Paolo Abeni
` (2 preceding siblings ...)
2022-06-15 9:16 ` [PATCH mptcp-net 3/5] Squash-to: "mptcp: invoke MP_FAIL response when needed" Paolo Abeni
@ 2022-06-15 9:16 ` Paolo Abeni
2022-06-15 9:16 ` [PATCH mptcp-net 5/5] mptcp: consistent map handling on failure Paolo Abeni
4 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 9:16 UTC (permalink / raw)
To: mptcp
If the MPTCP socket shutdown happens before a fallback
to TCP, and all the pending data have been already spooled,
we never close the TCP connection.
Address the issue explicitly checking for critical condition
at fallback time.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/options.c | 2 +-
net/mptcp/protocol.c | 2 +-
net/mptcp/protocol.h | 19 ++++++++++++++++---
net/mptcp/subflow.c | 2 +-
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 0bfa6662447c..57eab237c837 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -966,7 +966,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
goto reset;
subflow->mp_capable = 0;
pr_fallback(msk);
- __mptcp_do_fallback(msk);
+ mptcp_do_fallback(ssk);
return false;
}
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2910105a99b0..3a781f6f5709 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1245,7 +1245,7 @@ static void mptcp_update_infinite_map(struct mptcp_sock *msk,
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX);
mptcp_subflow_ctx(ssk)->send_infinite_map = 0;
pr_fallback(msk);
- __mptcp_do_fallback(msk);
+ mptcp_do_fallback(ssk);
}
static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 1d2d71711872..9860179bfd5e 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -927,12 +927,25 @@ static inline void __mptcp_do_fallback(struct mptcp_sock *msk)
set_bit(MPTCP_FALLBACK_DONE, &msk->flags);
}
-static inline void mptcp_do_fallback(struct sock *sk)
+static inline void mptcp_do_fallback(struct sock *ssk)
{
- struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
- struct mptcp_sock *msk = mptcp_sk(subflow->conn);
+ struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
+ struct sock *sk = subflow->conn;
+ struct mptcp_sock *msk;
+ msk = mptcp_sk(sk);
__mptcp_do_fallback(msk);
+ if (READ_ONCE(msk->snd_data_fin_enable) && !(ssk->sk_shutdown & SEND_SHUTDOWN)) {
+ gfp_t saved_allocation = ssk->sk_allocation;
+
+ /* we are in a atomic (BH) scope, override ssk default for data
+ * fin allocation
+ */
+ ssk->sk_allocation = GFP_ATOMIC;
+ ssk->sk_shutdown |= SEND_SHUTDOWN;
+ tcp_shutdown(ssk, SEND_SHUTDOWN);
+ ssk->sk_allocation = saved_allocation;
+ }
}
#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)", __func__, a)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 040901c1f40c..75fdc6474d0e 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1273,7 +1273,7 @@ static bool subflow_check_data_avail(struct sock *ssk)
return false;
}
- __mptcp_do_fallback(msk);
+ mptcp_do_fallback(ssk);
}
skb = skb_peek(&ssk->sk_receive_queue);
--
2.35.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH mptcp-net 5/5] mptcp: consistent map handling on failure
2022-06-15 9:16 [PATCH mptcp-net 0/5] mptcp: mp_fail related fixes Paolo Abeni
` (3 preceding siblings ...)
2022-06-15 9:16 ` [PATCH mptcp-net 4/5] mptcp: fix shutdown vs fallback race Paolo Abeni
@ 2022-06-15 9:16 ` Paolo Abeni
2022-06-15 11:00 ` mptcp: consistent map handling on failure: Tests Results MPTCP CI
4 siblings, 1 reply; 8+ messages in thread
From: Paolo Abeni @ 2022-06-15 9:16 UTC (permalink / raw)
To: mptcp
When the MPTCP receive path reach a non fatal fall-back condition, e.g.
when the MPC sockets must fall-back to TCP, the existing code is a little
self-inconsistent: it reports that new data is available - return true -
but sets the MPC flag to the opposite value.
As the consequence read operations in some exceptional scenario may block
unexpectedly.
Address the issue setting the correct MPC read status. Additionally avoid
some code duplication in the fatal fall-back scenario.
Fixes: 9c81be0dbc89 ("mptcp: add MP_FAIL response support")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/subflow.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 75fdc6474d0e..bec36e2bcc32 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1246,17 +1246,12 @@ static bool subflow_check_data_avail(struct sock *ssk)
subflow->send_mp_fail = 1;
if (!READ_ONCE(msk->allow_infinite_fallback)) {
- ssk->sk_err = EBADMSG;
- tcp_set_state(ssk, TCP_CLOSE);
subflow->reset_transient = 0;
subflow->reset_reason = MPTCP_RST_EMIDDLEBOX;
- tcp_send_active_reset(ssk, GFP_ATOMIC);
- while ((skb = skb_peek(&ssk->sk_receive_queue)))
- sk_eat_skb(ssk, skb);
- } else {
- mptcp_subflow_fail(msk, ssk);
+ goto reset;
}
- WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
+ mptcp_subflow_fail(msk, ssk);
+ WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);
return true;
}
@@ -1264,10 +1259,14 @@ static bool subflow_check_data_avail(struct sock *ssk)
/* fatal protocol error, close the socket.
* subflow_error_report() will introduce the appropriate barriers
*/
- ssk->sk_err = EBADMSG;
- tcp_set_state(ssk, TCP_CLOSE);
subflow->reset_transient = 0;
subflow->reset_reason = MPTCP_RST_EMPTCP;
+
+reset:
+ ssk->sk_err = EBADMSG;
+ tcp_set_state(ssk, TCP_CLOSE);
+ while ((skb = skb_peek(&ssk->sk_receive_queue)))
+ sk_eat_skb(ssk, skb);
tcp_send_active_reset(ssk, GFP_ATOMIC);
WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
return false;
--
2.35.3
^ permalink raw reply related [flat|nested] 8+ messages in thread