Commit ccdafd22 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-enable-udp-v6-sockets-receiving-v4-packets-with-udp' 

Xin Long says:

====================
net: enable udp v6 sockets receiving v4 packets with UDP

Currently, udp v6 socket can not process v4 packets with UDP GRO, as
udp_encap_needed_key is not increased when udp_tunnel_encap_enable()
is called for v6 socket.

This patchset is to increase it and remove the unnecessary code in
bareudp in Patch 1/2, and improve rxrpc encap_enable by calling
udp_tunnel_encap_enable().
====================

Link: https://lore.kernel.org/r/cover.1612342376.git.lucien.xin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c9dca822 5d30c626

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);