Problematic commits in the ipsec tree
Subsystems (4)
Steffen Klassert
maintainerHannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit 0ea9d5e3e (xfrm: introduce helper for safe determination of mtu)
This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in xfrm4_tunnel_check_size() if a IPv4 socket is at the skb.
The second is:
commit 844d48746 (xfrm: choose protocol family by skb protocol)
This breaks pmtu discovery for IPv6 too because skb->protocol can be null in __xfrm6_output().
We need a solution soon, or I have to revert or remove these commits from the ipsec tree.
Quoted 10 lines · Steffen Klassert
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.The second is:
Quoted 7 lines
commit
844d48746(xfrm: choose protocol family by skb protocol)This breaks pmtu discovery for IPv6 too because
skb->protocolcan be null in__xfrm6_output().We need a solution soon, or I have to revert or remove these commits from the ipsec tree.
Thanks for letting me know. I'll work on it right away.
Quoted 9 lines · Steffen Klassert
Hannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.
I am currently testing this following patch. It should restore old behavior for ipv4 sockets.
include/net/xfrm.h +0 -2
@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }
Actually I would like to extend this check so that we only take the dst_mtu(dst->path) in case of IP_PMTUDISC_PROBE. But that would be a patch for ipsec-next. I was not sure if we always dispatch to xfrm_mtu in this code-path.
Quoted 7 lines
The second is:
commit
844d48746(xfrm: choose protocol family by skb protocol)This breaks pmtu discovery for IPv6 too because
skb->protocolcan be null in__xfrm6_output().
I am currently checking if there are side-effects if we set skb->protocol in raw sockets. This should solve this problem. Btw. this is also the case for IPv4.
Hope to have tested patches later today.
Thanks,
Hannes
PATCH 1/2 xfrm: revert ipv4 mtu determination to dst_mtu
In reply to Steffen KlassertIn commit 0ea9d5e3e0e03a63b11392f5613378977dae7eca ("xfrm: introduce helper for safe determination of mtu") I switched the determination of ipv4 mtus from dst_mtu to ip_skb_dst_mtu. This was an error because in case of IP_PMTUDISC_PROBE we fall back to the interface mtu, which is never correct for ipv4 ipsec.
--- include/net/xfrm.h | 2 -- 1 file changed, 2 deletions(-)
include/net/xfrm.h +0 -2
@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }
Signature · 1 line
1.8.3.1
PATCH 2/2 ipv6: set skb->protocol on tcp, raw and ip6_append_data genereated skbs
In reply to Steffen KlassertCurrently we don't initialize skb->protocol when transmitting data via tcp, raw(with and without inclhdr) or udp+ufo or appending data directly to the socket transmit queue (via ip6_append_data). This needs to be done so that we can get the correct mtu in the xfrm layer.
Setting of skb->protocol happens only in functions where we also have a transmitting socket and a new skb, so we don't overwrite old values.
---
I would love to have more reviews for this. I hope to have checked all the code-paths down from these routines to not cause any side-effects.
Testing showed no problems here. Sorry for only testing with udp only before.
net/ipv6/ip6_output.c | 3 +++ net/ipv6/raw.c | 1 + 2 files changed, 4 insertions(+)
net/ipv6/ip6_output.c +3 -0
@@ -238,6 +238,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, hdr->saddr = fl6->saddr; hdr->daddr = *first_hop; + skb->protocol =htons (ETH_P_IPV6 ); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark;
@@ -1057,6 +1058,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,/* initialize protocol header pointer */ skb->transport_header = skb->network_header + fragheaderlen; + skb->protocol =htons (ETH_P_IPV6 ); skb->ip_summed =CHECKSUM_PARTIAL ; skb->csum =0 ; }
@@ -1359,6 +1361,7 @@ alloc_new_skb:/* * Fill in the control structures */ + skb->protocol =htons (ETH_P_IPV6 ); skb->ip_summed =CHECKSUM_NONE ; skb->csum =0 ;/* reserve for fragmentation and ipsec header */
net/ipv6/raw.c +1 -0
@@ -628,6 +628,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, goto error;skb_reserve (skb, hlen); + skb->protocol =htons (ETH_P_IPV6 ); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark;skb_dst_set (skb, &rt->dst);
Signature · 1 line
1.8.3.1
Re: [PATCH ipsec 2/2] ipv6: set skb->protocol on tcp, raw and ip6_append_data genereated skbs
Quoted 5 lines · Hannes Frederic Sowa
Currently we don't initialize
skb->protocolwhen transmitting data via tcp, raw(with and without inclhdr) or udp+ufo or appending data directly to the socket transmit queue (viaip6_append_data). This needs to be done so that we can get the correct mtu in the xfrm layer.
Quoted 7 lines
Setting of
skb->protocolhappens only in functions where we also have a transmitting socket and a new skb, so we don't overwrite old values.Cc Steffen Klassert <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>---
Seems good to me.
Steffen Klassert
maintainerQuoted 19 lines · Hannes Frederic Sowa
Quoted 9 lines · Steffen Klassert
Hannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.I am currently testing this following patch. It should restore old behavior for ipv4 sockets.
include/net/xfrm.h +0
-0
include/net/xfrm.h static inline int xfrm_skb_dst_mtu(struct sk_buff *skb) · line 1734
Quoted 7 lines
include/net/xfrm.h +0
-2@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }
This looks still fragile. xfrm_skb_dst_mtu() is called from __xfrm6_output() and from xfrm4_tunnel_check_size().
We will have the same bug again as soon as somebody thinks that it is save to call it from xfrm6_tunnel_check_size() too. So I think it is better not to call it from xfrm4_tunnel_check_size().
Also, why do we need xfrm_skb_dst_mtu() at all? When it is called from __xfrm6_output(), we know that this is IPv6. So we can call ip6_skb_dst_mtu() directly as it was before your change.
Hello!
Quoted 21 lines · Steffen Klassert
Quoted 20 lines · Hannes Frederic Sowa
Quoted 9 lines · Steffen Klassert
Hannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.I am currently testing this following patch. It should restore old behavior for ipv4 sockets.
include/net/xfrm.h +0
-0@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)
Quoted 12 lines
include/net/xfrm.h static inline int xfrm_skb_dst_mtu(struct sk_buff *skb) · line 1734
Quoted 6 lines
include/net/xfrm.h +0
-2if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }This looks still fragile.
xfrm_skb_dst_mtu()is called from__xfrm6_output()and fromxfrm4_tunnel_check_size().
We will have the same bug again as soon as somebody thinks that it is save to call it fromxfrm6_tunnel_check_size()too. So I think it is better not to call it fromxfrm4_tunnel_check_size().
Hm, I don't think I can follow you completly here. I searched for allocations of ipv6 skbs (where they originated from a socket) and checked these allocations also initialize the skb->protocol field (the second patch).
I wonder if ip6_skb_dst_mtu was correct all along and if we should just switch to dst_mtu(skb_dst(skb)) in all cases?
Quoted 3 lines
Also, why do we need
xfrm_skb_dst_mtu()at all? When it is called from__xfrm6_output(), we know that this is IPv6. So we can callip6_skb_dst_mtu()directly as it was before your change.
The problem was that ip6_skb_dst_mtu dereferences the ipv6_pinfo socket to check for IPV6_PMTUDISC_PROBE. If IPv4 is encapsulated in IPv6 and the packet originated from the same host (sk != NULL) we call down to ip6_skb_dst_mtu. This function checks that ipv6_pinfo is not NULL, so it worked by accident currently.
My plan would be to check that all IPv4 skb allocations use the correct skb->protocol, too, or if we can use the skb->inner_protocol field to mark packets in the tunnel drivers from which protocol they originated.
Greetings,
Hannes
Quoted 37 lines · Hannes Frederic Sowa
Hello!
Quoted 21 lines · Steffen Klassert
Quoted 20 lines · Hannes Frederic Sowa
Quoted 9 lines · Steffen Klassert
Hannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.I am currently testing this following patch. It should restore old behavior for ipv4 sockets.
include/net/xfrm.h +0
-0@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)Quoted 12 lines
include/net/xfrm.h static inline int xfrm_skb_dst_mtu(struct sk_buff *skb) · line 1734
Quoted 6 lines
include/net/xfrm.h +0
-2if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }This looks still fragile.
xfrm_skb_dst_mtu()is called from__xfrm6_output()and fromxfrm4_tunnel_check_size().
We will have the same bug again as soon as somebody thinks that it is save to call it fromxfrm6_tunnel_check_size()too. So I think it is better not to call it fromxfrm4_tunnel_check_size().
Quoted 6 lines
Hm, I don't think I can follow you completly here. I searched for allocations of ipv6 skbs (where they originated from a socket) and checked these allocations also initialize the
skb->protocolfield (the second patch).I wonder if
ip6_skb_dst_mtuwas correct all along and if we should just switch to dst_mtu(skb_dst(skb)) in all cases?
Ok, I got it.
How about just checking in __xfrm6_output if we actually have a packet originated from an IPv6 socket so that we only replace the original call to ip6_skb_dst_mtu(skb)?
Quoted 11 lines
Quoted 4 lines
Also, why do we need
xfrm_skb_dst_mtu()at all? When it is called from__xfrm6_output(), we know that this is IPv6. So we can callip6_skb_dst_mtu()directly as it was before your change.The problem was that
ip6_skb_dst_mtudereferences theipv6_pinfosocket to check forIPV6_PMTUDISC_PROBE. If IPv4 is encapsulated in IPv6 and the packet originated from the same host (sk != NULL) we call down toip6_skb_dst_mtu. This function checks thatipv6_pinfois not NULL, so it worked by accident currently.
Quoted 3 lines
My plan would be to check that all IPv4 skb allocations use the correct
skb->protocol, too, or if we can use theskb->inner_protocolfield to mark packets in the tunnel drivers from which protocol they originated.
Btw. this also let's us refer to the wrong mtu in case of an v4-mapped v6 socket transmitting over a address family changing tunnel over ipsec.
Greetings,
Hannes
Quoted 42 lines · Hannes Frederic Sowa
Quoted 41 lines · Hannes Frederic Sowa
Hello!
Quoted 21 lines · Steffen Klassert
Quoted 20 lines · Hannes Frederic Sowa
Quoted 9 lines · Steffen Klassert
Hannes,
I have two problematic commits from you in the ipsec tree. The first one is:
commit
0ea9d5e3e(xfrm: introduce helper for safe determination of mtu)This breakes pmtu discovery for IPv4 because now we use the device mtu instead of the reduced IPsec mtu in
xfrm4_tunnel_check_size()if a IPv4 socket is at the skb.I am currently testing this following patch. It should restore old behavior for ipv4 sockets.
include/net/xfrm.h +0
-0@@ -1730,8 +1730,6 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)Quoted 12 lines
include/net/xfrm.h static inline int xfrm_skb_dst_mtu(struct sk_buff *skb) · line 1734
Quoted 6 lines
include/net/xfrm.h +0
-2if (sk && skb->protocol ==htons (ETH_P_IPV6 ))return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb);return dst_mtu (skb_dst (skb)); }This looks still fragile.
xfrm_skb_dst_mtu()is called from__xfrm6_output()and fromxfrm4_tunnel_check_size().
We will have the same bug again as soon as somebody thinks that it is save to call it fromxfrm6_tunnel_check_size()too. So I think it is better not to call it fromxfrm4_tunnel_check_size().Hm, I don't think I can follow you completly here. I searched for allocations of ipv6 skbs (where they originated from a socket) and checked these allocations also initialize the
skb->protocolfield (the second patch).
Quoted 8 lines
Quoted 2 lines
I wonder if
ip6_skb_dst_mtuwas correct all along and if we should just switch to dst_mtu(skb_dst(skb)) in all cases?Ok, I got it.
How about just checking in
__xfrm6_outputif we actually have a packet originated from an IPv6 socket so that we only replace the original call toip6_skb_dst_mtu(skb)?
This could be the replacement for patch 1/2 to reassemble old behaviour without touching ip6_skb_dst_mtu if the socket type is not an IPv6 one.
I would still like to look if we could correctly handle *_PMTUDISC_PROBE one day and fallback to dst_mtu(dst->path) if possible. So I don't know if removing xfrm_skb_dst_mtu is good style and would just make churn in the git history. What do you think?
[PATCH ipsec 1/2] xfrm: revert ipv4 mtu determination to dst_mtu
In commit 0ea9d5e3e0e03a63b11392f5613378977dae7eca ("xfrm: introduce helper for safe determination of mtu") I switched the determination of ipv4 mtus from dst_mtu to ip_skb_dst_mtu. This was an error because in case of IP_PMTUDISC_PROBE we fall back to the interface mtu, which is never correct for ipv4 ipsec.
This patch partly reverts 0ea9d5e3e0e03a63b11392f5613378977dae7eca ("xfrm: introduce helper for safe determination of mtu").
--- include/net/xfrm.h | 12 ------------ net/ipv4/xfrm4_output.c | 2 +- net/ipv6/xfrm6_output.c | 8 +++++--- 3 files changed, 6 insertions(+), 16 deletions(-)
include/net/xfrm.h +0 -12
@@ -20,7 +20,6 @@#include <net/route.h> #include <net/ipv6.h> #include <net/ip6_fib.h> -#include <net/ip6_route.h> #include <net/flow.h> #include <linux/interrupt.h>
@@ -1724,15 +1723,4 @@ static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m) return ret; } -static inline int xfrm_skb_dst_mtu (struct sk_buff *skb) -{ -struct sock *sk = skb->sk; - -if (sk && skb->protocol ==htons (ETH_P_IPV6 )) -return ip6_skb_dst_mtu (skb); -else if (sk && skb->protocol ==htons (ETH_P_IP )) -return ip_skb_dst_mtu (skb); -return dst_mtu (skb_dst (skb)); -} -#endif /* _NET_XFRM_H */
net/ipv4/xfrm4_output.c +1 -1
@@ -28,7 +28,7 @@ static int xfrm4_tunnel_check_size(struct sk_buff *skb)if (!(ip_hdr (skb)->frag_off &htons (IP_DF )) || skb->local_df) goto out; - mtu =xfrm_skb_dst_mtu (skb); + mtu =dst_mtu (skb_dst (skb));if (skb->len > mtu) {if (skb->sk)xfrm_local_error (skb, mtu);
net/ipv6/xfrm6_output.c +5 -3
@@ -140,10 +140,12 @@ static int __xfrm6_output(struct sk_buff *skb) {struct dst_entry *dst =skb_dst (skb);struct xfrm_state *x = dst->xfrm; -int mtu =xfrm_skb_dst_mtu (skb); +int mtu; -if (mtu <IPV6_MIN_MTU ) - mtu =IPV6_MIN_MTU ; +if (skb->protocol ==htons (ETH_P_IPV6 )) + mtu =ip6_skb_dst_mtu (skb); +else + mtu =dst_mtu (skb_dst (skb));if (skb->len > mtu &&xfrm6_local_dontfrag (skb)) {xfrm6_local_rxpmtu (skb, mtu);
Signature · 1 line
1.8.3.1
Steffen Klassert
maintainerQuoted 8 lines · Hannes Frederic Sowa
This could be the replacement for patch 1/2 to reassemble old behaviour without touching
ip6_skb_dst_mtuif the socket type is not an IPv6 one.I would still like to look if we could correctly handle
*_PMTUDISC_PROBEone day and fallback todst_mtu(dst->path)if possible. So I don't know if removingxfrm_skb_dst_mtuis good style and would just make churn in the git history. What do you think?
Currently I think we can call dst_mtu() unconditionally from __xfrm6_output(), then we would not need xfrm_skb_dst_mtu(). But this needs further investigation, IPsec pmtu discovery was frequently broken in the past and I don't want to break it again.
Quoted 12 lines
[PATCH ipsec 1/2] xfrm: revert ipv4 mtu determination to
dst_mtuIn commit
0ea9d5e3e0e03a63b11392f5613378977dae7eca("xfrm: introduce helper for safe determination of mtu") I switched the determination of ipv4 mtus fromdst_mtutoip_skb_dst_mtu. This was an error because in case ofIP_PMTUDISC_PROBEwe fall back to the interface mtu, which is never correct for ipv4 ipsec.This patch partly reverts
0ea9d5e3e0e03a63b11392f5613378977dae7eca("xfrm: introduce helper for safe determination of mtu").
I think with this and you other patch, we get the all the interfamily tunnel problems fixed for now. Everything else should be done in ipsec-next.
Please resend the whole patchset, so we can get it fixed soon.
Tanks a lot!
Quoted 10 lines · Steffen Klassert
Quoted 8 lines · Hannes Frederic Sowa
This could be the replacement for patch 1/2 to reassemble old behaviour without touching
ip6_skb_dst_mtuif the socket type is not an IPv6 one.I would still like to look if we could correctly handle
*_PMTUDISC_PROBEone day and fallback todst_mtu(dst->path)if possible. So I don't know if removingxfrm_skb_dst_mtuis good style and would just make churn in the git history. What do you think?
Quoted 5 lines
Currently I think we can call
dst_mtu()unconditionally from__xfrm6_output(), then we would not needxfrm_skb_dst_mtu(). But this needs further investigation, IPsec pmtu discovery was frequently broken in the past and I don't want to break it again.
My idea was something like
| struct ipv6_pinfo *np = ...; | int mtu = (np && np->pmtudisc == IPV6_PMTUDISC_PROBE) ? | dst_mtu(skb_dst(skb)->path) : dst_mtu(skb_dst(skb));
But I don't know if this does actually anything good and where the dispatch of dst_mtu goes to. My idea was to avoid the dst_metric_raw(dst, RTAX_MTU) call in xfrm_mtu in case of IPV6_PMTUDISC_PROBE.
Quoted 8 lines
Quoted 8 lines
[PATCH ipsec 1/2] xfrm: revert ipv4 mtu determination to
dst_mtuIn commit
0ea9d5e3e0e03a63b11392f5613378977dae7eca("xfrm: introduce helper for safe determination of mtu") I switched the determination of ipv4 mtus fromdst_mtutoip_skb_dst_mtu. This was an error because in case ofIP_PMTUDISC_PROBEwe fall back to the interface mtu, which is never correct for ipv4 ipsec.
Quoted 7 lines
Quoted 3 lines
This patch partly reverts
0ea9d5e3e0e03a63b11392f5613378977dae7eca("xfrm: introduce helper for safe determination of mtu").I think with this and you other patch, we get the all the interfamily tunnel problems fixed for now. Everything else should be done in ipsec-next.
Fully ACK.
Quoted 3 lines
Please resend the whole patchset, so we can get it fixed soon.
Tanks a lot!
Sorry for holding back your tree for so long to get merged.
Thanks,
Hannes