From patchwork Fri Oct 5 15:31:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 979525 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KsgYaV97"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42RYdZ6CJbz9rxp for ; Sat, 6 Oct 2018 01:31:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728693AbeJEWa4 (ORCPT ); Fri, 5 Oct 2018 18:30:56 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:44098 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726082AbeJEWa4 (ORCPT ); Fri, 5 Oct 2018 18:30:56 -0400 Received: by mail-qk1-f196.google.com with SMTP id y8-v6so8156684qka.11 for ; Fri, 05 Oct 2018 08:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZRx2NnkPv/hpuFB5zw+TrzVB9Xtw523dR81/Gom4Mm4=; b=KsgYaV97EmYepndGotLtYqA3Oqxlh8WcZCR/hCtWoEwsog9IPi2D2CnY1VICPQW1Zm Dwle7dDZ07vsnzLD2kxCSr6ExnrhlF4eRhXSp+PCHv4+izSmxpurY5s1D0ER8keNs1oJ 7Ktno4iroriGCD0BLXyNPQIBRky9ShnlgmcTn2OSaL5AC2iFZoH1QbMDdW2Oc/HiAgYl mqQVYoEUyZdigacaa6B8DZBF9+bM40qOZmS3dkWti4SMoo40j6pzVW0z6M6Kh0kypKYF +bMuoFHTE8p9/qvQSjyfg8nGNFQj+K8aA0T+FPyYpnyBMHSNVePoIprQmc+uQy79O7lh 94JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZRx2NnkPv/hpuFB5zw+TrzVB9Xtw523dR81/Gom4Mm4=; b=YXyT6QOXS7v8V1zeqDGu+GIioFxmrda3F/JieWMfaQ/YvsIK6YVAdCCaqAjWCyvhfB U48Z7VQrW1j2wxIjRfvMVZct/ibIs+hWKnpPWgc/YXvWt0ku23dJhwsyPVl3/Z3+CfH+ mNu3cIwVv1o8xFUZc+moh7KjjcTTYJqrAExbvb5edrD8dJ7z//K3v+qhwyoCqD1xYjDB MREag/NdN4hMut1NOblq1OxhsnH4yTEgWuxLY8isslqKdMItsujjzJ/MdEcMV5+eGlZW n98pW6DLiSTai4MQOo/nxrm4oAca8v8jG03bkW26n729KEm281HWDSQALWK9wyMuOMxW jZPw== X-Gm-Message-State: ABuFfogHV1d7C6lFSWhmiC666CXp+9otr59LFnOUnHKvEtR0aHHkA2gD mANuU47Uhzl1Qhl0HHgZ9Y85gyaq X-Google-Smtp-Source: ACcGV60pE4jue/qP3mYLwTuValUa/ZYyC9A7hdJnSrJF18n5uiA+go5KkEt8PaPzSZcIVnd+KmhaXQ== X-Received: by 2002:a37:a90b:: with SMTP id s11-v6mr9247859qke.171.1538753502943; Fri, 05 Oct 2018 08:31:42 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id s131-v6sm3802693qke.57.2018.10.05.08.31.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 08:31:42 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: pabeni@redhat.com, tom@herbertland.com, davem@davemloft.net, steffen.klassert@secunet.com, Willem de Bruijn Subject: [PATCH net-next] udp: gro behind static key Date: Fri, 5 Oct 2018 11:31:40 -0400 Message-Id: <20181005153140.205743-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn 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 Acked-by: Paolo Abeni --- include/net/udp.h | 2 ++ net/ipv4/udp.c | 2 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/udp.c | 2 +- net/ipv6/udp_offload.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/net/udp.h b/include/net/udp.h index 8482a990b0bb..9e82cb391dea 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -443,8 +443,10 @@ int udpv4_offload_init(void); void udp_init(void); +DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key); void udp_encap_enable(void); #if IS_ENABLED(CONFIG_IPV6) +DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key); void udpv6_encap_enable(void); #endif diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 5fc4beb1c336..1bec2203d558 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1889,7 +1889,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return 0; } -static DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key); +DEFINE_STATIC_KEY_FALSE(udp_encap_needed_key); void udp_encap_enable(void) { static_branch_enable(&udp_encap_needed_key); diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 0c0522b79b43..802f2bc00d69 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -405,7 +405,7 @@ static struct sk_buff *udp4_gro_receive(struct list_head *head, { struct udphdr *uh = udp_gro_udphdr(skb); - if (unlikely(!uh)) + if (unlikely(!uh) || !static_branch_unlikely(&udp_encap_needed_key)) goto flush; /* Don't bother verifying checksum if we're going to flush anyway. */ diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 28c4aa5078fc..374e7d302f26 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -548,7 +548,7 @@ static __inline__ void udpv6_err(struct sk_buff *skb, __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) { static_branch_enable(&udpv6_encap_needed_key); diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index 95dee9ca8d22..1b8e161ac527 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -119,7 +119,7 @@ static struct sk_buff *udp6_gro_receive(struct list_head *head, { struct udphdr *uh = udp_gro_udphdr(skb); - if (unlikely(!uh)) + if (unlikely(!uh) || !static_branch_unlikely(&udpv6_encap_needed_key)) goto flush; /* Don't bother verifying checksum if we're going to flush anyway. */