* [PATCHv2 net-next 0/2] net: enable udp v6 sockets receiving v4 packets with UDP GRO
@ 2021-01-15 7:30 Xin Long
2021-01-15 7:30 ` [PATCHv2 net-next 1/2] udp: call udp_encap_enable for v6 sockets when enabling encap Xin Long
0 siblings, 1 reply; 4+ messages in thread
From: Xin Long @ 2021-01-15 7:30 UTC (permalink / raw)
To: network dev
Cc: davem, Jakub Kicinski, pabeni, Willem de Bruijn, Martin Varghese
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.
v1->v2:
- see Patch 1/2.
Xin Long (2):
udp: call udp_encap_enable for v6 sockets when enabling encap
Revert "bareudp: Fixed bareudp receive handling"
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(-)
--
2.1.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv2 net-next 1/2] udp: call udp_encap_enable for v6 sockets when enabling encap
2021-01-15 7:30 [PATCHv2 net-next 0/2] net: enable udp v6 sockets receiving v4 packets with UDP GRO Xin Long
@ 2021-01-15 7:30 ` Xin Long
2021-01-15 7:30 ` [PATCHv2 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling" Xin Long
0 siblings, 1 reply; 4+ messages in thread
From: Xin Long @ 2021-01-15 7:30 UTC (permalink / raw)
To: network dev
Cc: davem, Jakub Kicinski, pabeni, Willem de Bruijn, Martin Varghese
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/net/udp.h | 1 +
include/net/udp_tunnel.h | 3 +--
net/ipv4/udp.c | 6 ++++++
net/ipv6/udp.c | 4 +++-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/net/udp.h b/include/net/udp.h
index 877832b..1e7b6cd 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 7103b0a..28bfe60 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);
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCHv2 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling"
2021-01-15 7:30 ` [PATCHv2 net-next 1/2] udp: call udp_encap_enable for v6 sockets when enabling encap Xin Long
@ 2021-01-15 7:30 ` Xin Long
2021-01-15 22:46 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Xin Long @ 2021-01-15 7:30 UTC (permalink / raw)
To: network dev
Cc: davem, Jakub Kicinski, pabeni, Willem de Bruijn, Martin Varghese
As udp_encap_enable() is already called in udp_tunnel_encap_enable()
since the last patch, and we don't need it any more. So remove it by
reverting commit 81f954a44567567c7d74a97b1db78fb43afc253d.
---
drivers/net/bareudp.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 0965d13..57dfaf4 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;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHv2 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling"
2021-01-15 7:30 ` [PATCHv2 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling" Xin Long
@ 2021-01-15 22:46 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2021-01-15 22:46 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, davem, pabeni, Willem de Bruijn, Martin Varghese
On Fri, 15 Jan 2021 15:30:09 +0800 Xin Long wrote:
> As udp_encap_enable() is already called in udp_tunnel_encap_enable()
> since the last patch, and we don't need it any more. So remove it by
> reverting commit 81f954a44567567c7d74a97b1db78fb43afc253d.
missing signoff on this one
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-15 22:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-15 7:30 [PATCHv2 net-next 0/2] net: enable udp v6 sockets receiving v4 packets with UDP GRO Xin Long
2021-01-15 7:30 ` [PATCHv2 net-next 1/2] udp: call udp_encap_enable for v6 sockets when enabling encap Xin Long
2021-01-15 7:30 ` [PATCHv2 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling" Xin Long
2021-01-15 22:46 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).