Skip to content

xfrm: support ipip and ipv6 tunnels in vti and xfrmi

Xin Long linux-next netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest10 patches 4 repliesIn review
  2. v210 patches 3 repliesSuperseded
  3. v110 patches 6 repliesSuperseded

Changes in v3 from the cover letter

- See Patch 2-3, 4, 6, 9-10.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10xfrm: add is_ipip to struct xfrm_input_afinfoinclude/net/xfrm.h net/xfrm/xfrm_input.c+15 -120 replies
2/10tunnel4: add cb_handler to struct xfrm_tunnelinclude/net/xfrm.h net/ipv4/tunnel4.c+44 -00 replies
3/10tunnel6: add tunnel6_input_afinfo for ipip and ipv6 tunnelsinclude/net/xfrm.h net/ipv6/tunnel6.c+42 -00 replies
4/10ip_vti: support IPIP tunnel processing with .cb_handlernet/ipv4/ip_vti.c+21 -300 replies
5/10ip_vti: support IPIP6 tunnel processingnet/ipv4/ip_vti.c+14 -20 replies
6/10ip6_vti: support IP6IP6 tunnel processing with .cb_handlernet/ipv6/ip6_vti.c+33 -03 replies
7/10ip6_vti: support IP6IP tunnel processingnet/ipv6/ip6_vti.c+8 -20 replies
8/10ipcomp: assign if_id to child tunnel from parent tunnelnet/ipv4/ipcomp.c net/ipv6/ipcomp6.c+2 -00 replies
9/10xfrm: interface: support IP6IP6 and IP6IP tunnels processing with .cb_handlernet/xfrm/xfrm_interface.c+38 -00 replies
10/10xfrm: interface: support IPIP and IPIP6 tunnels processing with .cb_handlernet/xfrm/xfrm_interface.c+32 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCHv3 ipsec-next 00/10] xfrm: support ipip and ipv6 tunnels in vti and xfrmi

Now ipip and ipv6 tunnels processing is supported by xfrm4/6_tunnel, but not in vti and xfrmi. This feature is needed by processing those uncompressed small fragments and packets when using comp protocol. It means vti and xfrmi won't be able to accept small fragments or packets when using comp protocol, which is not expected.

xfrm4/6_tunnel eventually calls xfrm_input() to process ipip and ipv6 tunnels with an ipip/ipv6-proto state (a child state of comp-proto state), and vti and xfrmi should do the same.

The extra things for vti to do is:

- vti_input() should be called before xfrm_input() to set

    XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4/6 = tunnel. [A]

- vti_rcv_cb() should be called after xfrm_input() to update

    the skb->dev. [B]

And the extra things for xfrmi to do is:

- The ipip/ipv6-proto state should be assigned if_id from its parent's state. [C]

- xfrmi_rcv_cb() should be called after xfrm_input() to update

     the skb->dev. [D]

Patch 4-7 does the things in [A].

To implement [B] and [D], patch 1-3 is to build a callback function for xfrm4/6_tunnel, which can be called after xfrm_input(), similar to xfrm4/6_protocol's .cb_handler. vti and xfrmi only needs to give their own callback function in patch 4-7 and 9-10, which already
exists: vti_rcv_cb() and xfrmi_rcv_cb().

Patch 8 is to do the thing in [C] by assigning child tunnel's if_id from its parent tunnel.

With the whole patch series, the segments or packets with any size can work with ipsec comp proto on vti and xfrmi.

v1->v2:
- See Patch 2-3.
v2->v3:
- See Patch 2-3, 4, 6, 9-10.

Xin Long (10):
xfrm: add is_ipip to struct xfrm_input_afinfo
tunnel4: add cb_handler to struct xfrm_tunnel
tunnel6: add tunnel6_input_afinfo for ipip and ipv6 tunnels
ip_vti: support IPIP tunnel processing with .cb_handler
ip_vti: support IPIP6 tunnel processing
ip6_vti: support IP6IP6 tunnel processing with .cb_handler
ip6_vti: support IP6IP tunnel processing
ipcomp: assign if_id to child tunnel from parent tunnel
xfrm: interface: support IP6IP6 and IP6IP tunnels processing with
.cb_handler
xfrm: interface: support IPIP and IPIP6 tunnels processing with
.cb_handler

 include/net/xfrm.h        |  5 +++-
 net/ipv4/ip_vti.c         | 67 +++++++++++++++++++++++----------------------
 net/ipv4/ipcomp.c         |  1 +
 net/ipv4/tunnel4.c        | 43 +++++++++++++++++++++++++++++
 net/ipv6/ip6_vti.c        | 39 ++++++++++++++++++++++++++
 net/ipv6/ipcomp6.c        |  1 +
 net/ipv6/tunnel6.c        | 41 +++++++++++++++++++++++++++
 net/xfrm/xfrm_input.c     | 24 ++++++++--------
 net/xfrm/xfrm_interface.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 247 insertions(+), 44 deletions(-)
Signature · 1 line
2.1.0