Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

udp: gro behind static key

Browse Source 
Avoid the socket lookup cost in udp_gro_receive if no socket has a
udp tunnel callback configured.

udp_sk(sk)->gro_receive requires a registration with
setup_udp_tunnel_sock, which enables the static key.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2018-10-05 11:31:40 -04:00 committed by David S. Miller
parent 2b9156129f
commit f2e9de210d
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/udp.h
View File

@ -443,8 +443,10 @@ int udpv4_offload_init(void);
void udp_init(void); void udp_init(void);
DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key);
void udp_encap_enable(void); void udp_encap_enable(void);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
void udpv6_encap_enable(void); void udpv6_encap_enable(void);
#endif #endif

2
net/ipv4/udp.c
View File

@ -1889,7 +1889,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
} }
static DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key); DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key);
void udp_encap_enable(void) void udp_encap_enable(void)
{ {
static_branch_enable(&udp_encap_needed_key); static_branch_enable(&udp_encap_needed_key);

2
net/ipv4/udp_offload.c
View File

@ -405,7 +405,7 @@ static struct sk_buff *udp4_gro_receive(struct list_head *head,
{ {
struct udphdr *uh = udp_gro_udphdr(skb); struct udphdr *uh = udp_gro_udphdr(skb);
if (unlikely(!uh)) if (unlikely(!uh) || !static_branch_unlikely(&udp_encap_needed_key))
goto flush; goto flush;
/* Don't bother verifying checksum if we're going to flush anyway. */ /* Don't bother verifying checksum if we're going to flush anyway. */

2
net/ipv6/udp.c
View File

@ -548,7 +548,7 @@ static __inline__ void udpv6_err(struct sk_buff *skb,
__udp6_lib_err(skb, opt, type, code, offset, info, &udp_table); __udp6_lib_err(skb, opt, type, code, offset, info, &udp_table);
} }
static DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key); DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
void udpv6_encap_enable(void) void udpv6_encap_enable(void)
{ {
static_branch_enable(&udpv6_encap_needed_key); static_branch_enable(&udpv6_encap_needed_key);

2
net/ipv6/udp_offload.c
View File

@ -119,7 +119,7 @@ static struct sk_buff *udp6_gro_receive(struct list_head *head,
{ {
struct udphdr *uh = udp_gro_udphdr(skb); struct udphdr *uh = udp_gro_udphdr(skb);
if (unlikely(!uh)) if (unlikely(!uh) || !static_branch_unlikely(&udpv6_encap_needed_key))
goto flush; goto flush;
/* Don't bother verifying checksum if we're going to flush anyway. */ /* Don't bother verifying checksum if we're going to flush anyway. */