JIRA: https://issues.redhat.com/browse/RHEL-21223


Upstream Status: linux.git
Conflicts: Missing upstream commit 28044fc1d495 ("net: Add a bhash2
           table hashed by port and address"):
           Centos Stream 9 doesn't have the ->bhash2 hash table.
           Use ->bhash instead. Because ->bhash can also contain
           time-wait sockets, we have to use sock_gen_put() instead of
           plain sock_put().

commit 91051f003948432f83b5d2766eeb83b2b4993649
Author: Guillaume Nault <gnault@redhat.com>
Date:   Fri Dec 1 15:49:52 2023 +0100

    tcp: Dump bound-only sockets in inet_diag.

    Walk the hashinfo->bhash2 table so that inet_diag can dump TCP sockets
    that are bound but haven't yet called connect() or listen().

    The code is inspired by the ->lhash2 loop. However there's no manual
    test of the source port, since this kind of filtering is already
    handled by inet_diag_bc_sk(). Also, a maximum of 16 sockets are dumped
    at a time, to avoid running with bh disabled for too long.

    There's no TCP state for bound but otherwise inactive sockets. Such
    sockets normally map to TCP_CLOSE. However, "ss -l", which is supposed
    to only dump listening sockets, actually requests the kernel to dump
    sockets in either the TCP_LISTEN or TCP_CLOSE states. To avoid dumping
    bound-only sockets with "ss -l", we therefore need to define a new
    pseudo-state (TCP_BOUND_INACTIVE) that user space will be able to set
    explicitly.

    With an IPv4, an IPv6 and an IPv6-only socket, bound respectively to
    40000, 64000, 60000, an updated version of iproute2 could work as
    follow:

      $ ss -t state bound-inactive
      Recv-Q   Send-Q     Local Address:Port       Peer Address:Port   Process
      0        0                0.0.0.0:40000           0.0.0.0:*
      0        0                   [::]:60000              [::]:*
      0        0                      *:64000                 *:*

Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
    Link: https://lore.kernel.org/r/b3a84ae61e19c06806eea9c602b3b66e8f0cfc81.1701362867.git.gnault@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Guillaume Nault <gnault@redhat.com>