Skip to content

tcp: Introduce optional per-netns ehash.

Kuniyuki Iwashima netdev 6 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 posting 2/25 patches 0 repliesApplied 5/5
  2. v6 Latest6 patches 3 repliesApplied 6/6
  3. v56 patches 6 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v4 posting 1/26 patches3 repliesSuperseded
v35 patches14 repliesSuperseded
v25 patches7 repliesSuperseded

Changes in v6 from the cover letter

* Patch 6
* Use vmalloc_huge() in inet_pernet_hashinfo_alloc() and update the changelog and doc about NUMA (Eric Dumazet)
* Use kmemdup() in inet_pernet_hashinfo_alloc() (Eric Dumazet)
* Use vfree() in inet_pernet_hashinfo_(alloc|free)()

Patches in v6 All 6 applied

#Subject and filesSizeRepliesApplied
1/6tcp: Clean up some functions.net/ipv4/inet_connection_sock.c net/ipv4/inet_hashtables.c net/ipv4/tcp_ipv4.c +2 more+45 -460 repliesApplied
2/6tcp: Don't allocate tcp_death_row outside of struct netns_ipv4.include/net/netns/ipv4.h net/ipv4/inet_timewait_sock.c net/ipv4/proc.c +4 more+15 -250 repliesApplied
3/6tcp: Set NULL to sk->sk_prot->h.hashinfo.include/net/inet_hashtables.h net/ipv4/af_inet.c net/ipv4/inet_connection_sock.c +3 more+24 -150 repliesApplied
4/6tcp: Access &tcp_hashinfo via net.drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c drivers/net/ethernet/netronome/nfp/crypto/tls.c +14 more+108 -780 repliesApplied
5/6tcp: Save unnecessary inet_twsk_purge() calls.include/net/tcp.h net/ipv4/tcp_ipv4.c net/ipv4/tcp_minisocks.c +1 more+18 -20 repliesApplied
6/6tcp: Introduce optional per-netns ehash.Documentation/networking/ip-sysctl.rst include/net/inet_hashtables.h include/net/netns/ipv4.h +6 more+164 -80 repliesApplied

Reviews trailers per patch

None of the 6 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEric Dumazet
SeriesR-b
1/6
2/6
3/6
4/6
5/6
6/6

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v6 thread

Cover letter [PATCH v6 net-next 0/6] tcp: Introduce optional per-netns ehash.

The more sockets we have in the hash table, the longer we spend looking up the socket. While running a number of small workloads on the same host, they penalise each other and cause performance degradation.

The root cause might be a single workload that consumes much more resources than the others. It often happens on a cloud service where different workloads share the same computing resource.

On EC2 c5.24xlarge instance (196 GiB memory and 524288 (1Mi / 2) ehash entries), after running iperf3 in different netns, creating 24Mi sockets without data transfer in the root netns causes about 10% performance regression for the iperf3's connection.

thash_entries sockets length Gbps

	524288		      1		     1		50.7
			   24Mi		    48		45.1

It is basically related to the length of the list of each hash bucket. For testing purposes to see how performance drops along the length, I set 131072 (1Mi / 8) to thash_entries, and here's the result.

thash_entries sockets length Gbps

        131072		      1		     1		50.7
			    1Mi		     8		49.9
			    2Mi		    16		48.9
			    4Mi		    32		47.3
			    8Mi		    64		44.6
			   16Mi		   128		40.6
			   24Mi		   192		36.3
			   32Mi		   256		32.5
			   40Mi		   320		27.0
			   48Mi		   384		25.0

To resolve the socket lookup degradation, we introduce an optional per-netns hash table for TCP, but it's just ehash, and we still share the global bhash, bhash2 and lhash2.

With a smaller ehash, we can look up non-listener sockets faster and isolate such noisy neighbours. Also, we can reduce lock contention.

For details, please see the last patch.

patch 1 - 4: prep for per-netns ehash
patch 5: small optimisation for netns dismantle without TIME_WAIT sockets
patch 6: add per-netns ehash

Many thanks to Eric Dumazet for reviewing and advising.

Changes:
v6:
* Patch 6
* Use vmalloc_huge() in inet_pernet_hashinfo_alloc() and update the changelog and doc about NUMA (Eric Dumazet)
* Use kmemdup() in inet_pernet_hashinfo_alloc() (Eric Dumazet)
* Use vfree() in inet_pernet_hashinfo_(alloc|free)()

v5: https://lore.kernel.org/netdev/[email protected]/
* Patch 2
* Keep the tw_refcount base value at 1 (Eric Dumazet)
* Add WARN_ON_ONCE() for tw_refcount (Eric Dumazet)
* Patch 5
* Test tw_refcount against 1 in tcp_twsk_purge()

v4: https://lore.kernel.org/netdev/[email protected]/
* Add Patch 2
* Patch 1
* Add cleanups in tcp_time_wait() and tcp_v[46]_connect()
* Patch 3
* /tcp_death_row/s/->/./
* Patch 4
* Add mellanox and netronome driver changes back (Paolo Abeni, Jakub Kicinski)
* /tcp_death_row/s/->/./
* Patch 5
* Simplify tcp_twsk_purge()
* Patch 6
* Move inet_pernet_hashinfo_free() into tcp_sk_exit_batch()

v3: https://lore.kernel.org/netdev/[email protected]/
* Patch 3
* Drop mellanox and netronome driver changes (Eric Dumazet)
* Patch 4
* Add test results in the changelog
* Patch 5
* Use roundup_pow_of_two() in tcp_set_hashinfo() (Eric Dumazet)
* Remove proc_tcp_child_ehash_entries() and use proc_douintvec_minmax()

v2: https://lore.kernel.org/netdev/[email protected]/
* Drop flock() and UDP stuff
* Patch 2
* Rename inet_get_hashinfo() to tcp_or_dccp_get_hashinfo() (Eric Dumazet)
* Patch 4
* Remove unnecessary inet_twsk_purge() calls for unshare()
* Factorise inet_twsk_purge() calls (Eric Dumazet)
* Patch 5
* Change max buckets size as 16Mi
* Use unsigned int for ehash size (Eric Dumazet)
* Use GFP_KERNEL_ACCOUNT for the per-netns ehash allocation (Eric Dumazet)
* Use current->nsproxy->net_ns for parent netns (Eric Dumazet)

v1: https://lore.kernel.org/netdev/[email protected]/

Kuniyuki Iwashima (6):
tcp: Clean up some functions.
tcp: Don't allocate tcp_death_row outside of struct netns_ipv4.
tcp: Set NULL to sk->sk_prot->h.hashinfo.
tcp: Access &tcp_hashinfo via net.
tcp: Save unnecessary inet_twsk_purge() calls.
tcp: Introduce optional per-netns ehash.

 Documentation/networking/ip-sysctl.rst        |  29 ++++
 .../chelsio/inline_crypto/chtls/chtls_cm.c    |   5 +-
 .../mellanox/mlx5/core/en_accel/ktls_rx.c     |   5 +-
 .../net/ethernet/netronome/nfp/crypto/tls.c   |   5 +-
 include/net/inet_hashtables.h                 |  16 ++
 include/net/netns/ipv4.h                      |   4 +-
 include/net/tcp.h                             |   1 +
 net/core/filter.c                             |   5 +-
 net/dccp/proto.c                              |   2 +
 net/ipv4/af_inet.c                            |   2 +-
 net/ipv4/esp4.c                               |   3 +-
 net/ipv4/inet_connection_sock.c               |  22 ++-
 net/ipv4/inet_hashtables.c                    |  92 ++++++++---
 net/ipv4/inet_timewait_sock.c                 |   4 +-
 net/ipv4/netfilter/nf_socket_ipv4.c           |   4 +-
 net/ipv4/netfilter/nf_tproxy_ipv4.c           |  16 +-
 net/ipv4/proc.c                               |   2 +-
 net/ipv4/sysctl_net_ipv4.c                    |  47 +++++-
 net/ipv4/tcp.c                                |   1 +
 net/ipv4/tcp_diag.c                           |  18 ++-
 net/ipv4/tcp_ipv4.c                           | 143 +++++++++++-------
 net/ipv4/tcp_minisocks.c                      |  28 +++-
 net/ipv6/esp6.c                               |   3 +-
 net/ipv6/inet6_hashtables.c                   |   4 +-
 net/ipv6/netfilter/nf_socket_ipv6.c           |   4 +-
 net/ipv6/netfilter/nf_tproxy_ipv6.c           |   8 +-
 net/ipv6/tcp_ipv6.c                           |  42 ++---
 net/mptcp/mptcp_diag.c                        |   7 +-
 28 files changed, 361 insertions(+), 161 deletions(-)
Signature · 1 line
2.30.2