From: Eric Dumazet <edumazet@google.com>
To: menglong8.dong@gmail.com
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
dsahern@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Menglong Dong <imagedong@tencent.com>
Subject: Re: [PATCH net-next 1/3] net: tcp: send zero-window ACK when no memory
Date: Thu, 27 Jul 2023 21:17:41 +0200 [thread overview]
Message-ID: <CANn89iLwLxzSLKtobE9y+ZBU_eizfNo6FUfBa61KeUXsodA2FQ@mail.gmail.com> (raw)
In-Reply-To: <20230727125125.1194376-2-imagedong@tencent.com>
On Thu, Jul 27, 2023 at 2:51 PM <menglong8.dong@gmail.com> wrote:
>
> From: Menglong Dong <imagedong@tencent.com>
>
> For now, skb will be dropped when no memory, which makes client keep
> retrans util timeout and it's not friendly to the users.
>
> In this patch, we reply an ACK with zero-window in this case to update
> the snd_wnd of the sender to 0. Therefore, the sender won't timeout the
> connection and will probe the zero-window with the retransmits.
>
> Signed-off-by: Menglong Dong <imagedong@tencent.com>
> ---
> include/net/inet_connection_sock.h | 3 ++-
> net/ipv4/tcp_input.c | 4 ++--
> net/ipv4/tcp_output.c | 14 +++++++++++---
> 3 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
> index c2b15f7e5516..be3c858a2ebb 100644
> --- a/include/net/inet_connection_sock.h
> +++ b/include/net/inet_connection_sock.h
> @@ -164,7 +164,8 @@ enum inet_csk_ack_state_t {
> ICSK_ACK_TIMER = 2,
> ICSK_ACK_PUSHED = 4,
> ICSK_ACK_PUSHED2 = 8,
> - ICSK_ACK_NOW = 16 /* Send the next ACK immediately (once) */
> + ICSK_ACK_NOW = 16, /* Send the next ACK immediately (once) */
> + ICSK_ACK_NOMEM = 32,
> };
>
> void inet_csk_init_xmit_timers(struct sock *sk,
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 3cd92035e090..03111af6115d 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -5061,7 +5061,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
> reason = SKB_DROP_REASON_PROTO_MEM;
> NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);
> sk->sk_data_ready(sk);
> - goto drop;
> + inet_csk(sk)->icsk_ack.pending |= ICSK_ACK_NOMEM;
Also set ICSK_ACK_NOW ?
We also need to make sure to send an immediate ACK WIN 0 in the case we queued
the skb in an empty receive queue and we were under pressure.
We do not want to have a delayed ACK sending a normal RWIN,
then wait for another packet that we will probably drop.
Look at the code :
if (skb_queue_len(&sk->sk_receive_queue) == 0)
sk_forced_mem_schedule(sk, skb->truesize);
else if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) {
and refactor it to make sure to set ICSK_ACK_NOMEM even on the first packet
that bypassed the rmem_schedule().
> + goto out_of_window;
Why forcing quickack mode ? Please leave the "goto drop;"
> }
>
> eaten = tcp_queue_rcv(sk, skb, &fragstolen);
> @@ -5102,7 +5103,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
> out_of_window:
> tcp_enter_quickack_mode(sk, TCP_MAX_QUICKACKS);
> inet_csk_schedule_ack(sk);
> -drop:
> tcp_drop_reason(sk, skb, reason);
> return;
> }
>
next prev parent reply other threads:[~2023-07-27 19:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 12:51 [PATCH net-next 0/3] net: tcp: support probing OOM menglong8.dong
2023-07-27 12:51 ` [PATCH net-next 1/3] net: tcp: send zero-window ACK when no memory menglong8.dong
2023-07-27 19:17 ` Eric Dumazet [this message]
2023-07-28 2:37 ` Menglong Dong
2023-07-27 12:51 ` [PATCH net-next 2/3] net: tcp: allow zero-window ACK update the window menglong8.dong
2023-07-27 12:51 ` [PATCH net-next 3/3] net: tcp: check timeout by icsk->icsk_timeout in tcp_retransmit_timer() menglong8.dong
2023-07-27 19:31 ` Eric Dumazet
2023-07-28 2:57 ` Menglong Dong
2023-07-28 4:44 ` Neal Cardwell
2023-07-28 6:25 ` Menglong Dong
2023-07-28 8:50 ` Eric Dumazet
2023-07-28 14:25 ` Neal Cardwell
2023-07-28 17:15 ` Neal Cardwell
2023-07-31 3:41 ` Menglong Dong
2023-07-31 9:49 ` Menglong Dong
2023-07-31 3:28 ` Menglong Dong
2023-07-31 8:24 ` Menglong Dong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANn89iLwLxzSLKtobE9y+ZBU_eizfNo6FUfBa61KeUXsodA2FQ@mail.gmail.com \
--to=edumazet@google.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=menglong8.dong@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).