pull request (net): ipsec 2020-01-21
Subsystems (4)
Steffen Klassert
maintainer1) Fix packet tx through bpf_redirect() for xfrm and vti interfaces. From Nicolas Dichtel.
2) Do not confirm neighbor when do pmtu update on a virtual xfrm interface. From Xu Wang.
3) Support output_mark for offload ESP packets, this was forgotten when the output_mark was added initially. From Ulrich Weber.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit a112adafcb47760feff959ee1ecd10b74d2c5467:
NFC: pn533: fix bulk-message timeout (2020-01-13 18:50:18 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
for you to fetch changes up to 4e4362d2bf2a49ff44dbbc9585207977ca3d71d0:
xfrm: support output_mark for offload ESP packets (2020-01-15 12:18:35 +0100)
----------------------------------------------------------------
Nicolas Dichtel (2):
vti[6]: fix packet tx through bpf_redirect() xfrm interface: fix packet tx through bpf_redirect()
Ulrich Weber (1):
xfrm: support output_mark for offload ESP packets
Xu Wang (1):
xfrm: interface: do not confirm neighbor when do pmtu update
net/ipv4/esp4_offload.c | 2 ++ net/ipv4/ip_vti.c | 13 +++++++++++-- net/ipv6/esp6_offload.c | 2 ++ net/ipv6/ip6_vti.c | 13 +++++++++++-- net/xfrm/xfrm_interface.c | 34 ++++++++++++++++++++++++++-------- 5 files changed, 52 insertions(+), 12 deletions(-)
Steffen Klassert
maintainerPATCH 1/4 vti[6]: fix packet tx through bpf_redirect()
From: Nicolas Dichtel <[email protected]>
With an ebpf program that redirects packets through a vti[6] interface, the packets are dropped because no dst is attached.
This could also be reproduced with an AF_PACKET socket, with the following python script (vti1 is an ip_vti interface):
import socket
send_s = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, 0)
# scapy
# p = IP(src='10.100.0.2', dst='10.200.0.1')/ICMP(type='echo-request')
# raw(p)
req = b'E\x00\x00\x1c\x00\x01\x00\x00@\x01e\xb2\nd\x00\x02\n\xc8\x00\x01\x08\x00\xf7\xff\x00\x00\x00\x00'
send_s.sendto(req, ('vti1', 0x800, 0, 0))--- net/ipv4/ip_vti.c | 13 +++++++++++-- net/ipv6/ip6_vti.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-)
net/ipv4/ip_vti.c +11 -2
@@ -187,8 +187,17 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,int mtu;if (!dst) { - dev->stats.tx_carrier_errors++; - goto tx_error_icmp; +struct rtable *rt; + + fl->u.ip4.flowi4_oif = dev->ifindex; + fl->u.ip4.flowi4_flags |=FLOWI_FLAG_ANYSRC ; + rt =__ip_route_output_key (dev_net (dev), &fl->u.ip4); +if (IS_ERR (rt)) { + dev->stats.tx_carrier_errors++; + goto tx_error_icmp; + } + dst = &rt->dst; +skb_dst_set (skb, dst); }dst_hold (dst);
net/ipv6/ip6_vti.c +11 -2
@@ -449,8 +449,17 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)int err =-1 ;int mtu; -if (!dst) - goto tx_err_link_failure; +if (!dst) { + fl->u.ip6.flowi6_oif = dev->ifindex; + fl->u.ip6.flowi6_flags |=FLOWI_FLAG_ANYSRC ; + dst =ip6_route_output (dev_net (dev),NULL , &fl->u.ip6); +if (dst->error) { +dst_release (dst); + dst =NULL ; + goto tx_err_link_failure; + } +skb_dst_set (skb, dst); + }dst_hold (dst); dst =xfrm_lookup (t->net, dst, fl,NULL ,0 );
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 2/4 xfrm interface: fix packet tx through bpf_redirect()
In reply to Steffen KlassertFrom: Nicolas Dichtel <[email protected]>
With an ebpf program that redirects packets through a xfrm interface, packets are dropped because no dst is attached to skb.
This could also be reproduced with an AF_PACKET socket, with the following python script (xfrm1 is a xfrm interface):
import socket
send_s = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, 0)
# scapy
# p = IP(src='10.100.0.2', dst='10.200.0.1')/ICMP(type='echo-request')
# raw(p)
req = b'E\x00\x00\x1c\x00\x01\x00\x00@\x01e\xb2\nd\x00\x02\n\xc8\x00\x01\x08\x00\xf7\xff\x00\x00\x00\x00'
send_s.sendto(req, ('xfrm1', 0x800, 0, 0))It was also not possible to send an ip packet through an AF_PACKET socket because a LL header was expected. Let's remove those LL header constraints.
--- net/xfrm/xfrm_interface.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
net/xfrm/xfrm_interface.c +25 -7
@@ -268,9 +268,6 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)int err =-1 ;int mtu; -if (!dst) - goto tx_err_link_failure; -dst_hold (dst); dst =xfrm_lookup_with_ifid (xi->net, dst, fl,NULL ,0 , xi->p.if_id);if (IS_ERR (dst)) {
@@ -343,6 +340,7 @@ static netdev_tx_t xfrmi_xmit(struct sk_buff *skb, struct net_device *dev) {struct xfrm_if *xi =netdev_priv (dev);struct net_device_stats *stats = &xi->dev->stats; +struct dst_entry *dst =skb_dst (skb);struct flowi fl;int ret;
@@ -352,10 +350,33 @@ static netdev_tx_t xfrmi_xmit(struct sk_buff *skb, struct net_device *dev)case htons (ETH_P_IPV6 ):xfrm_decode_session (skb, &fl,AF_INET6 );memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb))); +if (!dst) { + fl.u.ip6.flowi6_oif = dev->ifindex; + fl.u.ip6.flowi6_flags |=FLOWI_FLAG_ANYSRC ; + dst =ip6_route_output (dev_net (dev),NULL , &fl.u.ip6); +if (dst->error) { +dst_release (dst); + stats->tx_carrier_errors++; + goto tx_err; + } +skb_dst_set (skb, dst); + }break ;case htons (ETH_P_IP ):xfrm_decode_session (skb, &fl,AF_INET );memset (IPCB (skb),0 ,sizeof (*IPCB (skb))); +if (!dst) { +struct rtable *rt; + + fl.u.ip4.flowi4_oif = dev->ifindex; + fl.u.ip4.flowi4_flags |=FLOWI_FLAG_ANYSRC ; + rt =__ip_route_output_key (dev_net (dev), &fl.u.ip4); +if (IS_ERR (rt)) { + stats->tx_carrier_errors++; + goto tx_err; + } +skb_dst_set (skb, &rt->dst); + }break ;default : goto tx_err;
@@ -563,12 +584,9 @@ static void xfrmi_dev_setup(struct net_device *dev) { dev->netdev_ops = &xfrmi_netdev_ops; dev->type =ARPHRD_NONE ; - dev->hard_header_len =ETH_HLEN ; - dev->min_header_len =ETH_HLEN ; dev->mtu =ETH_DATA_LEN ; dev->min_mtu =ETH_MIN_MTU ; - dev->max_mtu =ETH_DATA_LEN ; - dev->addr_len =ETH_ALEN ; + dev->max_mtu =IP_MAX_MTU ; dev->flags =IFF_NOARP ; dev->needs_free_netdev = true; dev->priv_destructor = xfrmi_dev_free;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 3/4 xfrm: interface: do not confirm neighbor when do pmtu update
In reply to Steffen KlassertFrom: Xu Wang <[email protected]>
When do IPv6 tunnel PMTU update and calls __ip6_rt_update_pmtu() in the end, we should not call dst_confirm_neigh() as there is no two-way communication.
--- net/xfrm/xfrm_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_interface.c +1 -1
@@ -294,7 +294,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) mtu =dst_mtu (dst);if (!skb->ignore_df && skb->len > mtu) { -skb_dst_update_pmtu (skb, mtu); +skb_dst_update_pmtu_no_confirm (skb, mtu);if (skb->protocol ==htons (ETH_P_IPV6 )) {if (mtu <IPV6_MIN_MTU )
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 4/4 xfrm: support output_mark for offload ESP packets
In reply to Steffen KlassertFrom: Ulrich Weber <[email protected]>
Commit 9b42c1f179a6 ("xfrm: Extend the output_mark") added output_mark support but missed ESP offload support.
xfrm_smark_get() is not called within xfrm_input() for packets coming from esp4_gro_receive() or esp6_gro_receive(). Therefore call xfrm_smark_get() directly within these functions.
--- net/ipv4/esp4_offload.c | 2 ++ net/ipv6/esp6_offload.c | 2 ++ 2 files changed, 4 insertions(+)
net/ipv4/esp4_offload.c +2 -0
@@ -57,6 +57,8 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head,if (!x) goto out_reset; + skb->mark =xfrm_smark_get (skb->mark, x); + sp->xvec[sp->len++] = x; sp->olen++;
net/ipv6/esp6_offload.c +2 -0
@@ -79,6 +79,8 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head,if (!x) goto out_reset; + skb->mark =xfrm_smark_get (skb->mark, x); + sp->xvec[sp->len++] = x; sp->olen++;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Tue, 21 Jan 2020 08:16:27 +0100
Quoted 11 lines
1) Fix packet tx through
bpf_redirect()for xfrm and vti interfaces. From Nicolas Dichtel.2) Do not confirm neighbor when do pmtu update on a virtual xfrm interface. From Xu Wang.
3) Support
output_markfor offload ESP packets, this was forgotten when theoutput_markwas added initially. From Ulrich Weber.Please pull or let me know if there are problems.
Pulled, thanks.