Re: [PATCH net-next v2 1/6] net/tcp: Use static_branch_tcp_{md5,ao} to drop ifdefs

[Dmitry Safonov]

On Wed, 5 Jun 2024 at 05:50, Ratheesh Kannoth <rkannoth@xxxxxxxxxxx> wrote:
>
> On 2024-06-05 at 07:50:02, Dmitry Safonov via B4 Relay (devnull+0x7f454c46.gmail.com@xxxxxxxxxx) wrote:
> > From: Dmitry Safonov <0x7f454c46@xxxxxxxxx>
> >
> > It's possible to clean-up some ifdefs by hiding that
> > tcp_{md5,ao}_needed static branch is defined and compiled only
> > under related configs, since commit 4c8530dc7d7d ("net/tcp: Only produce
> > AO/MD5 logs if there are any keys").
> >
> > Signed-off-by: Dmitry Safonov <0x7f454c46@xxxxxxxxx>
> > ---
> >  include/net/tcp.h   | 14 ++++----------
> >  net/ipv4/tcp_ipv4.c |  8 ++------
> >  2 files changed, 6 insertions(+), 16 deletions(-)
> >
> > diff --git a/include/net/tcp.h b/include/net/tcp.h
> > index 08c3b99501cf..f6dd035e0fa9 100644
> > --- a/include/net/tcp.h
> > +++ b/include/net/tcp.h
> > @@ -2386,21 +2386,15 @@ static inline void tcp_get_current_key(const struct sock *sk,
> >
> >  static inline bool tcp_key_is_md5(const struct tcp_key *key)
> >  {
> > -#ifdef CONFIG_TCP_MD5SIG
> > -     if (static_branch_unlikely(&tcp_md5_needed.key) &&
> > -         key->type == TCP_KEY_MD5)
> > -             return true;
> > -#endif
> > +     if (static_branch_tcp_md5())
> Seems that we lost unlikely hint. Dont we add that as well-> unlikely()

Please, check the definition of static_branch_tcp_md5().
This doesn't have any functional changes but hides ifdefs in
the definition.

Thanks,
             Dmitry