From patchwork Wed Feb 3 08:54:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 12063789 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 629EDC433DB for ; Wed, 3 Feb 2021 08:55:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07CF464F6C for ; Wed, 3 Feb 2021 08:55:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232994AbhBCIz0 (ORCPT ); Wed, 3 Feb 2021 03:55:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232591AbhBCIzV (ORCPT ); Wed, 3 Feb 2021 03:55:21 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67458C06174A for ; Wed, 3 Feb 2021 00:54:41 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id o63so16830552pgo.6 for ; Wed, 03 Feb 2021 00:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=OqJkaBixyXF2rZOXQOUWllxQn/yRaTa3pePDUVl2py4=; b=q0xguaMJEcxCi8in2/E+orQX2cvvjtVkZFIeTBuvsgT5Sx9Yi3uQB5W85sof8+RlVF jO5J48079iM+YnMB+GhTZGeioTDJUbNKFflb4I47Mqgp7go427pNTpA4+rSFJ1htSdxA DRsGwtki6IHIPzul/+e0XtmH3Ja8+q1Eyx18HaiCxBEViDZKKXNtQi0iDr16qks1Qkck ZJ8HavpNiekLc0p5Et56jPtkSJG5N9eqK1jTXycRO+JIjfNMA8iANgnsDz86P9O8hPRo 1Xsg9S899hNSLwNMMYFet2Y7UlhrBSidQ8VWQ77Y7k9pz+/YwUnNR3DtoZS7rJZ0i8LL yoEw== 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:in-reply-to :references:in-reply-to:references; bh=OqJkaBixyXF2rZOXQOUWllxQn/yRaTa3pePDUVl2py4=; b=W3Kz5tv383tAG9hZ7kK0Lc9K3wjwY7IMHWJ+W0MOEPMeq+QGVH9aovIO1mDy8uBRdL TNoZJ8G4NsJLm1o3eEHAysyVq6U+ErH1BkVltjesRGzlWp4HIYfEkQCGe58J8tHSe/OU 7PzbNMgTc/CCn47PD4yD+3rPvU24QSJK3xXyo5+ZuMKEA7YggWP/eJsSbvk/HFsd3fxK coERRv0KuA4Sr08/jwdwykKxhHrN7wLtvBoe5eXzg3/xGIG9rPz1+Gbysq4ako/rhp4L HyOPSaaP1WgSz8OQ0tv8fsgWAmA3oYu5SyMaavf9f9Jm0TFxmmUBq21hUnukBbF6MwYr X11Q== X-Gm-Message-State: AOAM533tduxFNH9PtjYoo0cbYWfSxOB7IFlJosV4r4kPwAHuddgR3m62 sokXg0TCkI4+34qEkVmwL/s7FTkR2AUCzw== X-Google-Smtp-Source: ABdhPJxvRK+feu/BHzi1c1v/Tcph6vYIAwcHckAuzyxnJath+5dbfmXXFZAAf9Uw1BEuU85VbXn6GQ== X-Received: by 2002:a62:7957:0:b029:1bc:22d3:a22f with SMTP id u84-20020a6279570000b02901bc22d3a22fmr2212557pfc.52.1612342480626; Wed, 03 Feb 2021 00:54:40 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id y75sm1461651pfg.119.2021.02.03.00.54.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2021 00:54:39 -0800 (PST) From: Xin Long To: network dev Cc: davem@davemloft.net, Jakub Kicinski , pabeni@redhat.com, Willem de Bruijn , Martin Varghese , Alexander Duyck , David Howells Subject: [PATCHv5 net-next 1/2] udp: call udp_encap_enable for v6 sockets when enabling encap Date: Wed, 3 Feb 2021 16:54:22 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org When enabling encap for a ipv6 socket without udp_encap_needed_key increased, UDP GRO won't work for v4 mapped v6 address packets as sk will be NULL in udp4_gro_receive(). This patch is to enable it by increasing udp_encap_needed_key for v6 sockets in udp_tunnel_encap_enable(), and correspondingly decrease udp_encap_needed_key in udpv6_destroy_sock(). v1->v2: - add udp_encap_disable() and export it. v2->v3: - add the change for rxrpc and bareudp into one patch, as Alex suggested. v3->v4: - move rxrpc part to another patch. Acked-by: Willem de Bruijn Signed-off-by: Xin Long Tested-by: Antonio Quartulli --- drivers/net/bareudp.c | 6 ------ include/net/udp.h | 1 + include/net/udp_tunnel.h | 3 +-- net/ipv4/udp.c | 6 ++++++ net/ipv6/udp.c | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 1b8f597..7511bca 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -240,12 +240,6 @@ static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port) tunnel_cfg.encap_destroy = NULL; setup_udp_tunnel_sock(bareudp->net, sock, &tunnel_cfg); - /* As the setup_udp_tunnel_sock does not call udp_encap_enable if the - * socket type is v6 an explicit call to udp_encap_enable is needed. - */ - if (sock->sk->sk_family == AF_INET6) - udp_encap_enable(); - rcu_assign_pointer(bareudp->sock, sock); return 0; } diff --git a/include/net/udp.h b/include/net/udp.h index 01351ba..5ddbb42 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -467,6 +467,7 @@ void udp_init(void); DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key); void udp_encap_enable(void); +void udp_encap_disable(void); #if IS_ENABLED(CONFIG_IPV6) DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key); void udpv6_encap_enable(void); diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 282d10e..afc7ce7 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -181,9 +181,8 @@ static inline void udp_tunnel_encap_enable(struct socket *sock) #if IS_ENABLED(CONFIG_IPV6) if (sock->sk->sk_family == PF_INET6) ipv6_stub->udpv6_encap_enable(); - else #endif - udp_encap_enable(); + udp_encap_enable(); } #define UDP_TUNNEL_NIC_MAX_TABLES 4 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 69ea765..48208fb 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -596,6 +596,12 @@ void udp_encap_enable(void) } EXPORT_SYMBOL(udp_encap_enable); +void udp_encap_disable(void) +{ + static_branch_dec(&udp_encap_needed_key); +} +EXPORT_SYMBOL(udp_encap_disable); + /* Handler for tunnels with arbitrary destination ports: no socket lookup, go * through error handlers in encapsulations looking for a match. */ diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index b9f3dfd..d754292 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1608,8 +1608,10 @@ void udpv6_destroy_sock(struct sock *sk) if (encap_destroy) encap_destroy(sk); } - if (up->encap_enabled) + if (up->encap_enabled) { static_branch_dec(&udpv6_encap_needed_key); + udp_encap_disable(); + } } inet6_destroy_sock(sk); From patchwork Wed Feb 3 08:54:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 12063791 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EF6DC433E0 for ; Wed, 3 Feb 2021 08:55:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 012D764F6C for ; Wed, 3 Feb 2021 08:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233040AbhBCIze (ORCPT ); Wed, 3 Feb 2021 03:55:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233001AbhBCIza (ORCPT ); Wed, 3 Feb 2021 03:55:30 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10F19C0613ED for ; Wed, 3 Feb 2021 00:54:50 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id w18so16204331pfu.9 for ; Wed, 03 Feb 2021 00:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=8N1rB5fqpCzAQ6vqQKc8x/26gbAnacYrV2W8lJzHL0Q=; b=mNY5Pd/+OoyvmxaICuZjn2ng3yNlPMW+/N63MuYh4dDA/Zja2zMStBlkWUWqvJL/YW lyVXr6zQVWgDblwQ0//jfaYnOMuWnGILLEuE2K4uO3XYf2mMrcQiBZHj4GXIbUv9p+dW MJhfehofSf8CcRhAqGwiBGuR5/QBpY3z2i76mOk9XoRihz+W53eBkSJSahjPzJztLP8Y JXh3RkXvPHjoKapDVl72tUz6Sjhi3pfjSX3ymzA4tpxYnKCRkZiXVgggq06R4RT1FYrt yiUSWjyd63LBdyHyrob5NlbvcnfpMGBiENjhdv+oL675R4w21uHWVMRFMzEzgB366fAp 4NaA== 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:in-reply-to :references:in-reply-to:references; bh=8N1rB5fqpCzAQ6vqQKc8x/26gbAnacYrV2W8lJzHL0Q=; b=a2raFADUaLFZbkhxd82KxKdxdm0+rn/5ZZ5ipka4EjgJbEMj++2uC4kwerqBKbuPaW 78YEXXbOPG1DaXauQRXugAgvAZxCbLqegyQyikWBuFdoiBUxiAJCryTeMLf1kRmKo27f DC5KvTPEo82LJhUohhKGBFWQr3pIXo0ACtfMd6PFiBaGthyDik8BgXvUzDL6/EOnt29F ScHu9upb95oQipvVAZqyNPAZ1PkxxE425zf7vnoND8wlVsAhdZ/+RNffC9raDa+brZur InTB3c2dEU2+yHNkMUNIt1phNO/LIyl2T5dNKsKNZNg4sfk/PUai3sQmSVTuFzhkzbZK L3Ew== X-Gm-Message-State: AOAM531MMojtNHs7Bu7a+wMwsznm/k6wV3wytdLT2La90MVNrrCqpSpk +cmlu0D2V838AkiDN5rlVYc5ziLJ1LAK3w== X-Google-Smtp-Source: ABdhPJx39jbkNdrx+PZIDG/IRe4gftHYkDtIY6L796RgYX34BB6vH//5W6oitKxXLr9kbucWnMQheQ== X-Received: by 2002:a63:3e49:: with SMTP id l70mr2505122pga.96.1612342489251; Wed, 03 Feb 2021 00:54:49 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id i3sm1500889pfq.194.2021.02.03.00.54.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2021 00:54:48 -0800 (PST) From: Xin Long To: network dev Cc: davem@davemloft.net, Jakub Kicinski , pabeni@redhat.com, Willem de Bruijn , Martin Varghese , Alexander Duyck , David Howells Subject: [PATCHv5 net-next 2/2] rxrpc: call udp_tunnel_encap_enable in rxrpc_open_socket Date: Wed, 3 Feb 2021 16:54:23 +0800 Message-Id: <2da45aee43c74c05a586a7d3c7b1f9fc48bb72f2.1612342376.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org When doing encap_enable/increasing encap_needed_key, up->encap_enabled is not set in rxrpc_open_socket(), and it will cause encap_needed_key not being decreased in udpv6_destroy_sock(). This patch is to improve it by just calling udp_tunnel_encap_enable() where it increases both UDP and UDPv6 encap_needed_key and sets up->encap_enabled. v4->v5: - add the missing '#include ', as David Howells noticed. Acked-and-tested-by: David Howells Signed-off-by: Xin Long --- net/rxrpc/local_object.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index 8c28810..33b4936 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "ar-internal.h" @@ -135,11 +136,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net) udp_sk(usk)->gro_receive = NULL; udp_sk(usk)->gro_complete = NULL; - udp_encap_enable(); -#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6) - if (local->srx.transport.family == AF_INET6) - udpv6_encap_enable(); -#endif + udp_tunnel_encap_enable(local->socket); usk->sk_error_report = rxrpc_error_report; /* if a local address was supplied then bind it */