udp: call udp_encap_enable for v6 sockets when enabling encap

commit a4a600dd301ccde6ea239804ec1f19364a39d643 upstream.

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 <willemb@google.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Antonio Quartulli <antonio@openvpn.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 39b128205f2551b97fb4213fe6127ea4fd3d4b85..4404b899d3f6df6cfd77cd170351946d6f5b0006 100644 (file)
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -246,12 +246,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 435cc009e6eaaa79d376d3d71156ed5d3186534b..4017f257628f34301d4a3571804b6e662453949e 100644 (file)
--- 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 2ea453dac87624ba1612fe008f08b1c7de9c0b1e..24ece06bad9eff61612d89f618d389ae0e2f03b8 100644 (file)
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -177,9 +177,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 ef2068a60d4ad49db4dd781178b060dd78541b58..e97a2dd206e145d1754961d26e2e98b1230d981a 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -598,6 +598,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 069551a04369e16425d8f0ae51e83add92fda2ae..10760164a80f409c091692fad42832d7579f3b72 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1610,8 +1610,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);