Commit a4a600dd authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

udp: call udp_encap_enable for v6 sockets when enabling encap 



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: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c9dca822

drivers/net/bareudp.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}

include/net/udp.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

include/net/udp_tunnel.h

+1 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ 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();

}

net/ipv4/udp.c

+6 −0
Original line number Diff line number Diff line
@@ -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.

 */

net/ipv6/udp.c

+3 −1
Original line number Diff line number Diff line
@@ -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);