sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
Subsystems (2)
PATCH v2 1/1 sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
From: Cong Wang <[email protected]>
When a tunnel device is bound with the underlying device, its dev->needed_headroom needs to be updated properly. IPv4 tunnels already do the same in ip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commit b17f709a2401 ("gue: TX support for using remote checksum offload option").
---
v2: follow reverse Christmas tree style
Note, this is targeting for -net and -table, so I'd keep the fix small. We can refactor and reuse ip_tunnel_bind_dev() for -net-next.
net/ipv6/sit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv6/sit.c +5 -3
@@ -1095,12 +1095,13 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,static void ipip6_tunnel_bind_dev (struct net_device *dev) { +struct ip_tunnel *tunnel =netdev_priv (dev); +int t_hlen = tunnel->hlen +sizeof (struct iphdr );struct net_device *tdev =NULL ; -struct ip_tunnel *tunnel; +int hlen =LL_MAX_HEADER ;const struct iphdr *iph;struct flowi4 fl4; - tunnel =netdev_priv (dev); iph = &tunnel->parms.iph;if (iph->daddr) {
@@ -1123,14 +1124,15 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) tdev =__dev_get_by_index (tunnel->net, tunnel->parms.link);if (tdev && !netif_is_l3_master (tdev)) { -int t_hlen = tunnel->hlen +sizeof (struct iphdr );int mtu; mtu = tdev->mtu - t_hlen;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ;WRITE_ONCE (dev->mtu, mtu); + hlen = tdev->hard_header_len + tdev->needed_headroom; } + dev->needed_headroom = t_hlen + hlen; } static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,
Signature · 1 line
2.34.1
Quoted 15 lines · Cong Wang
From: Cong Wang <[email protected]>
When a tunnel device is bound with the underlying device, its
dev->needed_headroomneeds to be updated properly. IPv4 tunnels already do the same inip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commitb17f709a2401("gue: TX support for using remote checksum offload option").Fixes 32b8a8e59c9c ("sit: add IPv4 over IPv4 support")Reported-by Palash Oswal <[email protected]>Link https://lore.kernel.org/netdev/CAGyP=7fDcSPKu6nttbGwt7RXzE3uyYxLjCSE97J64pRxJP8jPA@mail.gmail.com/ open hereCc Kuniyuki Iwashima <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Cong Wang <[email protected]>
Quoted 9 lines
---
v2: follow reverse Christmas tree styleNote, this is targeting for -net and -table, so I'd keep the fix small. We can refactor and reuse
ip_tunnel_bind_dev()for -net-next.net/ipv6/sit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
Thanks.
From: Cong Wang <[email protected]> Date: Wed, 26 Apr 2023 23:00:06 -0700
Quoted 8 lines
From: Cong Wang <[email protected]>
When a tunnel device is bound with the underlying device, its
dev->needed_headroomneeds to be updated properly. IPv4 tunnels already do the same inip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commitb17f709a2401("gue: TX support for using remote checksum offload option").
Quoted 6 lines
Fixes 32b8a8e59c9c ("sit: add IPv4 over IPv4 support")Reported-by Palash Oswal <[email protected]>Link https://lore.kernel.org/netdev/CAGyP=7fDcSPKu6nttbGwt7RXzE3uyYxLjCSE97J64pRxJP8jPA@mail.gmail.com/ open hereCc Kuniyuki Iwashima <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Cong Wang <[email protected]>
Quoted 2 lines
---
v2: follow reverse Christmas tree style
nit: less changes needed if we put t_hlen init down.
---8<---
net/ipv6/sit.c +5 -1
@@ -1095,6 +1095,7 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,static void ipip6_tunnel_bind_dev (struct net_device *dev) { +int t_hlen, hlen =LL_MAX_HEADER ;struct net_device *tdev =NULL ;struct ip_tunnel *tunnel;const struct iphdr *iph;
@@ -1122,15 +1123,18 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)if (!tdev && tunnel->parms.link) tdev =__dev_get_by_index (tunnel->net, tunnel->parms.link); + t_hlen = tunnel->hlen +sizeof (struct iphdr ); +if (tdev && !netif_is_l3_master (tdev)) { -int t_hlen = tunnel->hlen +sizeof (struct iphdr );int mtu; mtu = tdev->mtu - t_hlen;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ;WRITE_ONCE (dev->mtu, mtu); + hlen = tdev->hard_header_len + tdev->needed_headroom; } + dev->needed_headroom = hlen + t_hlen; } static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,
---8<---
Thanks,
Kuniyuki
Quoted 46 lines
Note, this is targeting for -net and -table, so I'd keep the fix small. We can refactor and reuse
ip_tunnel_bind_dev()for -net-next.net/ipv6/sit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)net/ipv6/sit.c +5
-3@@ -1095,12 +1095,13 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,static void ipip6_tunnel_bind_dev (struct net_device *dev) { +struct ip_tunnel *tunnel =netdev_priv (dev); +int t_hlen = tunnel->hlen +sizeof (struct iphdr );struct net_device *tdev =NULL ; -struct ip_tunnel *tunnel; +int hlen =LL_MAX_HEADER ;const struct iphdr *iph;struct flowi4 fl4; - tunnel =netdev_priv (dev); iph = &tunnel->parms.iph;if (iph->daddr) {@@ -1123,14 +1124,15 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) tdev =__dev_get_by_index (tunnel->net, tunnel->parms.link);if (tdev && !netif_is_l3_master (tdev)) { -int t_hlen = tunnel->hlen +sizeof (struct iphdr );int mtu; mtu = tdev->mtu - t_hlen;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ;WRITE_ONCE (dev->mtu, mtu); + hlen = tdev->hard_header_len + tdev->needed_headroom; } + dev->needed_headroom = t_hlen + hlen; } static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,Signature · 1 line
2.34.1
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Wed, 26 Apr 2023 23:00:06 -0700 you wrote:
From: Cong Wang <[email protected]>
When a tunnel device is bound with the underlying device, its
dev->needed_headroomneeds to be updated properly. IPv4 tunnels already do the same inip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commitb17f709a2401("gue: TX support for using remote checksum offload option").[...]
Here is the summary with links:
- [net,v2] sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
https://git.kernel.org/netdev/net/c/c88f8d5cd95f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html