Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v4] tcp: fix tcp_init_transfer() to not reset
 icsk_ca_initialized
To:     Neal Cardwell <ncardwell@google.com>,
        David Miller <davem@davemloft.net>
Cc:     yhs@fb.com, edumazet@google.com, yoshfuji@linux-ipv6.org,
        dsahern@kernel.org, kuba@kernel.org, ast@kernel.org,
        daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com,
        songliubraving@fb.com, john.fastabend@gmail.com,
        kpsingh@kernel.org, ycheng@google.com, yyd@google.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        bpf@vger.kernel.org,
        linux-kernel-mentees@lists.linuxfoundation.org,
        syzbot+f1e24a0594d4e3a895d3@syzkaller.appspotmail.com
References: <20210703093417.1569943-1-phind.uet@gmail.com>
 <20210703.144945.1327654903412498334.davem@davemloft.net>
 <CADVnQynxFKthexWRFRGN_9enRt7cmgrNo7mpNOMpNVm_jJpt4w@mail.gmail.com>
From:   Phi Nguyen <phind.uet@gmail.com>
Message-ID: <ea882927-a6f6-6d26-66bd-442d03ac3ea0@gmail.com>
Date:   Tue, 6 Jul 2021 00:34:47 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <CADVnQynxFKthexWRFRGN_9enRt7cmgrNo7mpNOMpNVm_jJpt4w@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 7/4/2021 9:52 PM, Neal Cardwell wrote:
> 
> 
> On Sat, Jul 3, 2021 at 5:49 PM David Miller <davem@davemloft.net 
> <mailto:davem@davemloft.net>> wrote:
>  >
>  > From: Nguyen Dinh Phi <phind.uet@gmail.com <mailto:phind.uet@gmail.com>>
>  > Date: Sat,  3 Jul 2021 17:34:17 +0800
>  >
>  > > diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
>  > > index 7d5e59f688de..855ada2be25e 100644
>  > > --- a/net/ipv4/tcp_input.c
>  > > +++ b/net/ipv4/tcp_input.c
>  > > @@ -5922,7 +5922,6 @@ void tcp_init_transfer(struct sock *sk, int 
> bpf_op, struct sk_buff *skb)
>  > >               tp->snd_cwnd = tcp_init_cwnd(tp, __sk_dst_get(sk));
>  > >       tp->snd_cwnd_stamp = tcp_jiffies32;
>  > >
>  > > -     icsk->icsk_ca_initialized = 0;
>  > >       bpf_skops_established(sk, bpf_op, skb);
>  > >       if (!icsk->icsk_ca_initialized)
>  > >               tcp_init_congestion_control(sk);
>  >
>  > Don't you have to make the tcp_init_congestion_control() call 
> unconditional now?
> 
> I think we want to keep it conditional, to avoid double-initialization 
> if the BPF code sets the congestion control algorithm and initializes 
> it. But that's relatively new and subtle, so it might be nice for this 
> patch to add a comment about that, since it's touching this part of the 
> code anyway:
> 
> -       icsk->icsk_ca_initialized = 0;
>          bpf_skops_established(sk, bpf_op, skb);
> +       /* Initialize congestion control unless a BPF op initialized it 
> already: */
>          if (!icsk->icsk_ca_initialized)
>                  tcp_init_congestion_control(sk);
> 
> neal
> 
I will make a new version with your comment.
Thank you very much for helping.