diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-03-25 09:14:27 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-03-25 09:15:07 -0700 |
| commit | 1f6154227b49c3d3f306f624858e695bfee50aae (patch) | |
| tree | 7f78880584352756283e2156cb015fa5f032cef1 /net/ipv4/udp.c | |
| parent | aa3651ccffbba700613183d2e904289da38479c1 (diff) | |
Revert "udp_tunnel: GRO optimizations"
Revert "udp_tunnel: use static call for GRO hooks when possible"
This reverts commit 311b36574ceaccfa3f91b74054a09cd4bb877702.
Revert "udp_tunnel: create a fastpath GRO lookup."
This reverts commit 8d4880db378350f8ed8969feea13bdc164564fc1.
There are multiple small issues with the series. In the interest
of unblocking the merge window let's opt for a revert.
Link: https://lore.kernel.org/cover.1742557254.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index db606f7e4163..d0bffcfa56d8 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2891,10 +2891,8 @@ void udp_destroy_sock(struct sock *sk) if (encap_destroy) encap_destroy(sk); } - if (udp_test_bit(ENCAP_ENABLED, sk)) { + if (udp_test_bit(ENCAP_ENABLED, sk)) static_branch_dec(&udp_encap_needed_key); - udp_tunnel_cleanup_gro(sk); - } } } @@ -3806,15 +3804,6 @@ fallback: static int __net_init udp_pernet_init(struct net *net) { -#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) - int i; - - /* No tunnel is configured */ - for (i = 0; i < ARRAY_SIZE(net->ipv4.udp_tunnel_gro); ++i) { - INIT_HLIST_HEAD(&net->ipv4.udp_tunnel_gro[i].list); - RCU_INIT_POINTER(net->ipv4.udp_tunnel_gro[i].sk, NULL); - } -#endif udp_sysctl_init(net); udp_set_table(net); |