Skip to contentSkip to conversation

bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create()

PATCH In review Taehee Yoo 2 participants 3 messages Mar 8, 2020 – Mar 10, 2020

Subsystems (2)
lore
Share & tools
lore

Taehee Yoo

author
#0 lore raw

PATCH 3/3 bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create()

In the current code, udp_encap_enable() is called in bareudp_socket_create().
But, setup_udp_tunnel_sock() internally calls udp_encap_enable(). So, udp_encap_enable() is unnecessary.

---
 drivers/net/bareudp.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/bareudp.c +0 -3
index c9d0d68467f7..71a2f480f70e 100644
@@ -250,9 +250,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);
 
-	if (sock->sk->sk_family == AF_INET6)
-		udp_encap_enable();
-
 	rcu_assign_pointer(bareudp->sock, sock);
 	return 0;
 }
Signature · 1 line
2.17.1
#1 lore raw
Quoted 15 lines · Taehee Yoo

In the current code, udp_encap_enable() is called in bareudp_socket_create().
But, setup_udp_tunnel_sock() internally calls udp_encap_enable(). So, udp_encap_enable() is unnecessary.

---
 drivers/net/bareudp.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/bareudp.c +0 -0
index c9d0d68467f7..71a2f480f70e 100644

drivers/net/bareudp.c static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port) · line 255

Quoted 6 lines
drivers/net/bareudp.c +0 -3
@@ -250,9 +250,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);
 
-	if (sock->sk->sk_family == AF_INET6)
-		udp_encap_enable();
-

udp_encap_enable is not called for V6 sockets so we need to have the above lines of code

Quoted 6 lines
drivers/net/bareudp.c +0 -0
 	rcu_assign_pointer(bareudp->sock, sock);
 	return 0;
 }
Signature · 1 line
2.17.1
author
#2 lore raw
Quoted 1 line · Martin Varghese

Hi Martin,
Thanek you for the review!

Quoted 19 lines · Taehee Yoo
Quoted 18 lines

In the current code, udp_encap_enable() is called in bareudp_socket_create().
But, setup_udp_tunnel_sock() internally calls udp_encap_enable(). So, udp_encap_enable() is unnecessary.

---
 drivers/net/bareudp.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/bareudp.c +0 -0
index c9d0d68467f7..71a2f480f70e 100644
@@ -250,9 +250,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);
 
Quoted 4 lines

drivers/net/bareudp.c static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port) · line 255

Quoted 3 lines
drivers/net/bareudp.c +0 -3
-     if (sock->sk->sk_family == AF_INET6)
-             udp_encap_enable();
-

udp_encap_enable is not called for V6 sockets so we need to have the above lines of code

This patch is already merged into net-next.
So, you could send a revert patch.

In addition, I'm not familiar with the socket API.
So I'm a little bit curious about why you didn't create separated ipv4 and ipv6 sockets?
Vxlan, geneve, etc create separated ipv4, ipv6 UDP socket.
In the bareudp modules, it creates a single socket and it tries to call both udp_encap_enable() and udpv6_encap_enable.
Is there any special reason or both two ways are actually the same things?

Thank you so much!
Taehee Yoo