net: ipv6: add rpl source routing
Subsystems (4)
v3 cover net: ipv6: add rpl source routing
Hi netdev,
This patch series will add handling for RPL source routing handling and insertion (implement as lwtunnel)! I did an example prototype implementation in rpld for using this implementation in non-storing mode:
https://github.com/linux-wpan/rpld/tree/nonstoring_mode
I will also present a talk at netdev about it:
https://netdevconf.info/0x14/session.html?talk-extend-segment-routing-for-RPL
In receive handling I add handling for IPIP encapsulation as RFC6554 describes it as possible. For reasons I didn't implemented it yet for generating such packets because I am not really sure how/when this should happen. So far I understand there exists a draft yet which describes the cases (inclusive a Hop-by-Hop option which we also not support yet).
https://tools.ietf.org/html/draft-ietf-roll-useofrplinfo-35
This is just the beginning to start implementation everything for yet, step by step. It works for my use cases yet to have it running on a 6LOWPAN _only_ network.
I have some patches for iproute2 as well.
A sidenote: I check on local addresses if they are part of segment routes, this is just to avoid stupid settings. A use can add addresses afterwards what I cannot control anymore but then it's users fault to make such thing. The receive handling checks for this as well which is required by RFC6554, so the next hops or when it comes back should drop it anyway.
To make this possible I added functionality to pass the net structure to the build_state of lwtunnel (I hope I caught all lwtunnels).
Another sidenote: I set the headroom value to 0 as I figured out it will break on interfaces with IPv6 min mtu if set to non zero for tunnels on L3.
- Alex
changes since v3:
- use parse_nested which isn't deprecated - Thanks David Ahern
- change to return -1 instead errno in exthdr handling to unify error code
- change function name from ipv6_rpl_srh_decompress_size to ipv6_rpl_srh_size
changes since v2:
- add additional segdata length in lwtunnel build_state
- fix build_state patch by not catching one inline noop function if LWTUNNEL is disabled
Alexander Aring (5):
include: uapi: linux: add rpl sr header definition
addrconf: add functionality to check on rpl requirements
net: ipv6: add support for rpl sr exthdr
net: add net available in build_state
net: ipv6: add rpl sr tunnel
include/linux/ipv6.h | 1 + include/net/addrconf.h | 3 + include/net/ip_fib.h | 5 +- include/net/lwtunnel.h | 6 +- include/net/rpl.h | 46 ++++ include/uapi/linux/ipv6.h | 2 + include/uapi/linux/lwtunnel.h | 1 + include/uapi/linux/rpl.h | 48 ++++ include/uapi/linux/rpl_iptunnel.h | 21 ++ net/core/lwt_bpf.c | 2 +- net/core/lwtunnel.c | 6 +- net/ipv4/fib_lookup.h | 2 +- net/ipv4/fib_semantics.c | 22 +- net/ipv4/fib_trie.c | 2 +- net/ipv4/ip_tunnel_core.c | 4 +- net/ipv6/Kconfig | 10 + net/ipv6/Makefile | 3 +- net/ipv6/addrconf.c | 63 +++++ net/ipv6/af_inet6.c | 7 + net/ipv6/exthdrs.c | 201 +++++++++++++++- net/ipv6/ila/ila_lwt.c | 2 +- net/ipv6/route.c | 2 +- net/ipv6/rpl.c | 123 ++++++++++ net/ipv6/rpl_iptunnel.c | 380 ++++++++++++++++++++++++++++++ net/ipv6/seg6_iptunnel.c | 2 +- net/ipv6/seg6_local.c | 5 +- net/mpls/mpls_iptunnel.c | 2 +- 27 files changed, 940 insertions(+), 31 deletions(-) create mode 100644 include/net/rpl.h create mode 100644 include/uapi/linux/rpl.h create mode 100644 include/uapi/linux/rpl_iptunnel.h create mode 100644 net/ipv6/rpl.c create mode 100644 net/ipv6/rpl_iptunnel.c
Signature · 1 line
2.20.1
PATCH v3 1/5 include: uapi: linux: add rpl sr header definition
This patch adds a uapi header for rpl struct definition. The segments data can be accessed over rpl_segaddr or rpl_segdata macros. In case of compri and compre is zero the segment data is not compressed and can be accessed by rpl_segaddr. In the other case the compressed data can be accessed by rpl_segdata and interpreted as byte array.
--- include/uapi/linux/rpl.h | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 include/uapi/linux/rpl.h
include/uapi/linux/rpl.h new file +48 -0
@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* IPv6 RPL-SR implementation +* +* Author: +* (C) 2020 Alexander Aring <[email protected]> +*/ + +#ifndef _UAPI_LINUX_RPL_H +#define _UAPI_LINUX_RPL_H + +#include <asm/byteorder.h> +#include <linux/types.h> +#include <linux/in6.h> + +/* +* RPL SR Header +*/ +struct ipv6_rpl_sr_hdr { +__u8 nexthdr; +__u8 hdrlen; +__u8 type; +__u8 segments_left; +#if defined(__LITTLE_ENDIAN_BITFIELD) +__u32 cmpre:4 , + cmpri:4 , + reserved:4 , + pad:4 , + reserved1:16 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +__u32 reserved:20 , + pad:4 , + cmpri:4 , + cmpre:4 ; +#else +#error "Please fix <asm/byteorder.h>" +#endif + +union { +struct in6_addr addr[0 ]; +__u8 data[0 ]; + } segments; +} __attribute__((packed)); + +#define rpl_segaddr segments.addr +#define rpl_segdata segments.data + +#endif
Signature · 1 line
2.20.1
PATCH v3 2/5 addrconf: add functionality to check on rpl requirements
In reply to Alexander AringThis patch adds a functionality to addrconf to check on a specific RPL address configuration. According to RFC 6554:
To detect loops in the SRH, a router MUST determine if the SRH includes multiple addresses assigned to any interface on that router. If such addresses appear more than once and are separated by at least one address not assigned to that router.
--- include/net/addrconf.h | 3 +++ net/ipv6/addrconf.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)
include/net/addrconf.h +3 -0
@@ -90,6 +90,9 @@ int ipv6_chk_addr_and_flags(struct net *net, const struct in6_addr *addr,int ipv6_chk_home_addr (struct net *net,const struct in6_addr *addr);#endif +int ipv6_chk_rpl_srh_loop (struct net *net,const struct in6_addr *segs, +unsigned char nsegs); +bool ipv6_chk_custom_prefix (const struct in6_addr *addr,const unsigned int prefix_len,struct net_device *dev);
net/ipv6/addrconf.c +53 -0
59 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 3/5 net: ipv6: add support for rpl sr exthdr
In reply to Alexander AringThis patch adds rpl source routing receive handling. Everything works only if sysconf "rpl_seg_enabled" and source routing is enabled. Mostly the same behaviour as IPv6 segmentation routing. To handle compression and uncompression a rpl.c file is created which contains the necessary functionality. The receive handling will also care about IPv6 encapsulated so far it's specified as possible nexthdr in RFC 6554.
--- include/linux/ipv6.h | 1 + include/net/rpl.h | 34 +++++++ include/uapi/linux/ipv6.h | 2 + net/ipv6/Makefile | 2 +- net/ipv6/addrconf.c | 10 ++ net/ipv6/exthdrs.c | 201 +++++++++++++++++++++++++++++++++++++- net/ipv6/rpl.c | 123 +++++++++++++++++++++++ 7 files changed, 370 insertions(+), 3 deletions(-) create mode 100644 include/net/rpl.h create mode 100644 net/ipv6/rpl.c
include/linux/ipv6.h +1 -0
@@ -74,6 +74,7 @@ struct ipv6_devconf {__u32 addr_gen_mode;__s32 disable_policy;__s32 ndisc_tclass; +__s32 rpl_seg_enabled;struct ctl_table_header *sysctl_header; };
include/net/rpl.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* RPL implementation +* +* Author: +* (C) 2020 Alexander Aring <[email protected]> +*/ + +#ifndef _NET_RPL_H +#define _NET_RPL_H + +#include <linux/rpl.h> + +/* Worst decompression memory usage ipv6 address (16) + pad 7 */ +#define IPV6_RPL_SRH_WORST_SWAP_SIZE (sizeof(struct in6_addr) + 7) + +static inline size_t ipv6_rpl_srh_alloc_size (unsigned char n) +{ +return sizeof (struct ipv6_rpl_sr_hdr ) + + ((n +1 ) *sizeof (struct in6_addr )); +} + +size_t ipv6_rpl_srh_size (unsigned char n,unsigned char cmpri, +unsigned char cmpre); + +void ipv6_rpl_srh_decompress (struct ipv6_rpl_sr_hdr *outhdr, +const struct ipv6_rpl_sr_hdr *inhdr, +const struct in6_addr *daddr,unsigned char n); + +void ipv6_rpl_srh_compress (struct ipv6_rpl_sr_hdr *outhdr, +const struct ipv6_rpl_sr_hdr *inhdr, +const struct in6_addr *daddr,unsigned char n); + +#endif /* _NET_RPL_H */
include/uapi/linux/ipv6.h +2 -0
@@ -40,6 +40,7 @@ struct in6_ifreq {#define IPV6_SRCRT_STRICT 0x01/* Deprecated; will be removed */ #define IPV6_SRCRT_TYPE_0 0/* Deprecated; will be removed */ #define IPV6_SRCRT_TYPE_2 2/* IPv6 type 2 Routing Header */ +#define IPV6_SRCRT_TYPE_3 3/* RPL Segment Routing with IPv6 */ #define IPV6_SRCRT_TYPE_4 4/* Segment Routing with IPv6 */ /*
@@ -187,6 +188,7 @@ enum {DEVCONF_DISABLE_POLICY ,DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN ,DEVCONF_NDISC_TCLASS , +DEVCONF_RPL_SEG_ENABLED , DEVCONF_MAX };
net/ipv6/Makefile +1 -1
@@ -10,7 +10,7 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \ raw.o icmp.o mcast.o reassembly.o tcp_ipv6.o ping.o \ exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \ - udp_offload.o seg6.o fib6_notifier.o + udp_offload.o seg6.o fib6_notifier.o rpl.o ipv6-offload := ip6_offload.o tcpv6_offload.o exthdrs_offload.o
net/ipv6/addrconf.c +10 -0
@@ -236,6 +236,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = { .enhanced_dad = 1, .addr_gen_mode = IN6_ADDR_GEN_MODE_EUI64, .disable_policy = 0, + .rpl_seg_enabled = 0, };static struct ipv6_devconf ipv6_devconf_dflt__read_mostly = {
@@ -290,6 +291,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = { .enhanced_dad = 1, .addr_gen_mode = IN6_ADDR_GEN_MODE_EUI64, .disable_policy = 0, + .rpl_seg_enabled = 0, };/* Check if link is ready: is it up and is a valid qdisc available */
@@ -5520,6 +5522,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, array[DEVCONF_ADDR_GEN_MODE ] = cnf->addr_gen_mode; array[DEVCONF_DISABLE_POLICY ] = cnf->disable_policy; array[DEVCONF_NDISC_TCLASS ] = cnf->ndisc_tclass; + array[DEVCONF_RPL_SEG_ENABLED ] = cnf->rpl_seg_enabled; }static inline size_t inet6_ifla6_size (void )
@@ -6900,6 +6903,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)&two_five_five, }, + { + .procname = "rpl_seg_enabled", + .data = &ipv6_devconf.rpl_seg_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, {/* sentinel */ }
net/ipv6/exthdrs.c +199 -2
220 lines not on this page · raw message
net/ipv6/rpl.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 4/5 net: add net available in build_state
In reply to Alexander AringThe build_state callback of lwtunnel doesn't contain the net namespace structure yet. This patch will add it so we can check on specific address configuration at creation time of rpl source routes.
--- include/net/ip_fib.h | 5 +++-- include/net/lwtunnel.h | 6 +++--- net/core/lwt_bpf.c | 2 +- net/core/lwtunnel.c | 4 ++-- net/ipv4/fib_lookup.h | 2 +- net/ipv4/fib_semantics.c | 22 ++++++++++++---------- net/ipv4/fib_trie.c | 2 +- net/ipv4/ip_tunnel_core.c | 4 ++-- net/ipv6/ila/ila_lwt.c | 2 +- net/ipv6/route.c | 2 +- net/ipv6/seg6_iptunnel.c | 2 +- net/ipv6/seg6_local.c | 5 +++-- net/mpls/mpls_iptunnel.c | 2 +- 13 files changed, 32 insertions(+), 28 deletions(-)
include/net/ip_fib.h +3 -2
@@ -470,8 +470,9 @@ int fib_nh_init(struct net *net, struct fib_nh *fib_nh, struct fib_config *cfg, int nh_weight, struct netlink_ext_ack *extack);void fib_nh_release (struct net *net,struct fib_nh *fib_nh); -int fib_nh_common_init (struct fib_nh_common *nhc,struct nlattr *fc_encap, -u16 fc_encap_type,void *cfg,gfp_t gfp_flags, +int fib_nh_common_init (struct net *net,struct fib_nh_common *nhc, +struct nlattr *fc_encap,u16 fc_encap_type, +void *cfg,gfp_t gfp_flags,struct netlink_ext_ack *extack);void fib_nh_common_release (struct fib_nh_common *nhc);
include/net/lwtunnel.h +3 -3
@@ -34,7 +34,7 @@ struct lwtunnel_state { };struct lwtunnel_encap_ops { -int (*build_state)(struct nlattr *encap, +int (*build_state)(struct net *net,struct nlattr *encap,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack);
@@ -113,7 +113,7 @@ int lwtunnel_valid_encap_type(u16 encap_type, struct netlink_ext_ack *extack);int lwtunnel_valid_encap_type_attr (struct nlattr *attr,int len,struct netlink_ext_ack *extack); -int lwtunnel_build_state(u16 encap_type, +int lwtunnel_build_state(struct net *net, u16 encap_type, struct nlattr *encap, unsigned int family, const void *cfg, struct lwtunnel_state **lws,
@@ -209,7 +209,7 @@ static inline int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len,return 0 ; } -static inline int lwtunnel_build_state(u16 encap_type, +static inline int lwtunnel_build_state(struct net *net, u16 encap_type, struct nlattr *encap, unsigned int family, const void *cfg, struct lwtunnel_state **lws,
net/core/lwt_bpf.c +1 -1
@@ -367,7 +367,7 @@ static const struct nla_policy bpf_nl_policy[LWT_BPF_MAX + 1] = { [LWT_BPF_XMIT_HEADROOM] = { .type = NLA_U32 }, }; -static int bpf_build_state (struct nlattr *nla, +static int bpf_build_state (struct net *net,struct nlattr *nla,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
net/core/lwtunnel.c +2 -2
@@ -98,7 +98,7 @@ int lwtunnel_encap_del_ops(const struct lwtunnel_encap_ops *ops, }EXPORT_SYMBOL_GPL (lwtunnel_encap_del_ops); -int lwtunnel_build_state (u16 encap_type, +int lwtunnel_build_state (struct net *net,u16 encap_type,struct nlattr *encap,unsigned int family,const void *cfg,struct lwtunnel_state **lws,struct netlink_ext_ack *extack)
@@ -122,7 +122,7 @@ int lwtunnel_build_state(u16 encap_type,rcu_read_unlock ();if (found) { - ret = ops->build_state (encap, family, cfg, lws, extack); + ret = ops->build_state (net, encap, family, cfg, lws, extack);if (ret)module_put (ops->owner); }else {
net/ipv4/fib_lookup.h +1 -1
@@ -35,7 +35,7 @@ static inline void fib_alias_accessed(struct fib_alias *fa)void fib_release_info (struct fib_info *);struct fib_info *fib_create_info (struct fib_config *cfg,struct netlink_ext_ack *extack); -int fib_nh_match (struct fib_config *cfg,struct fib_info *fi, +int fib_nh_match (struct net *net,struct fib_config *cfg,struct fib_info *fi,struct netlink_ext_ack *extack);bool fib_metrics_match (struct fib_config *cfg,struct fib_info *fi); int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
net/ipv4/fib_semantics.c +12 -10
@@ -570,8 +570,9 @@ static int fib_detect_death(struct fib_info *fi, int order,return 1 ; } -int fib_nh_common_init (struct fib_nh_common *nhc,struct nlattr *encap, -u16 encap_type,void *cfg,gfp_t gfp_flags, +int fib_nh_common_init (struct net *net,struct fib_nh_common *nhc, +struct nlattr *encap,u16 encap_type, +void *cfg,gfp_t gfp_flags,struct netlink_ext_ack *extack) {int err;
@@ -589,8 +590,9 @@ int fib_nh_common_init(struct fib_nh_common *nhc, struct nlattr *encap, err = -EINVAL ; goto lwt_failure; } - err =lwtunnel_build_state (encap_type, encap, nhc->nhc_family, - cfg, &lwtstate, extack); + err =lwtunnel_build_state (net, encap_type, encap, + nhc->nhc_family, cfg, &lwtstate, + extack);if (err) goto lwt_failure;
@@ -614,7 +616,7 @@ int fib_nh_init(struct net *net, struct fib_nh *nh, nh->fib_nh_family =AF_INET ; - err =fib_nh_common_init (&nh->nh_common, cfg->fc_encap, + err =fib_nh_common_init (net, &nh->nh_common, cfg->fc_encap, cfg->fc_encap_type, cfg,GFP_KERNEL , extack);if (err)return err;
@@ -814,7 +816,7 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,#endif /* CONFIG_IP_ROUTE_MULTIPATH */ -static int fib_encap_match(u16 encap_type, +static int fib_encap_match(struct net *net, u16 encap_type, struct nlattr *encap, const struct fib_nh *nh, const struct fib_config *cfg,
@@ -826,7 +828,7 @@ static int fib_encap_match(u16 encap_type,if (encap_type ==LWTUNNEL_ENCAP_NONE )return 0 ; - ret =lwtunnel_build_state (encap_type, encap,AF_INET , + ret =lwtunnel_build_state (net, encap_type, encap,AF_INET , cfg, &lwtstate, extack);if (!ret) { result =lwtunnel_cmp_encap (lwtstate, nh->fib_nh_lws);
@@ -836,7 +838,7 @@ static int fib_encap_match(u16 encap_type,return result; } -int fib_nh_match (struct fib_config *cfg,struct fib_info *fi, +int fib_nh_match (struct net *net,struct fib_config *cfg,struct fib_info *fi,struct netlink_ext_ack *extack) {#ifdef CONFIG_IP_ROUTE_MULTIPATH
@@ -857,8 +859,8 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,struct fib_nh *nh =fib_info_nh (fi,0 );if (cfg->fc_encap) { -if (fib_encap_match (cfg->fc_encap_type, cfg->fc_encap, - nh, cfg, extack)) +if (fib_encap_match (net, cfg->fc_encap_type, + cfg->fc_encap, nh, cfg, extack))return 1 ; }#ifdef CONFIG_IP_ROUTE_CLASSID
net/ipv4/fib_trie.c +1 -1
@@ -1679,7 +1679,7 @@ int fib_table_delete(struct net *net, struct fib_table *tb, fi->fib_prefsrc == cfg->fc_prefsrc) && (!cfg->fc_protocol || fi->fib_protocol == cfg->fc_protocol) && - fib_nh_match(cfg, fi, extack) == 0 && + fib_nh_match(net, cfg, fi, extack) == 0 && fib_metrics_match(cfg, fi)) { fa_to_delete = fa;break ;
net/ipv4/ip_tunnel_core.c +2 -2
@@ -432,7 +432,7 @@ static int ip_tun_set_opts(struct nlattr *attr, struct ip_tunnel_info *info,return ip_tun_parse_opts (attr, info, extack); } -static int ip_tun_build_state (struct nlattr *attr, +static int ip_tun_build_state (struct net *net,struct nlattr *attr,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
@@ -719,7 +719,7 @@ static const struct nla_policy ip6_tun_policy[LWTUNNEL_IP6_MAX + 1] = { [LWTUNNEL_IP6_OPTS] = { .type = NLA_NESTED }, }; -static int ip6_tun_build_state (struct nlattr *attr, +static int ip6_tun_build_state (struct net *net,struct nlattr *attr,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
net/ipv6/ila/ila_lwt.c +1 -1
@@ -125,7 +125,7 @@ static const struct nla_policy ila_nl_policy[ILA_ATTR_MAX + 1] = { [ILA_ATTR_HOOK_TYPE] = { .type = NLA_U8, }, }; -static int ila_build_state (struct nlattr *nla, +static int ila_build_state (struct net *net,struct nlattr *nla,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
net/ipv6/route.c +1 -1
@@ -3471,7 +3471,7 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, !netif_carrier_ok(dev)) fib6_nh->fib_nh_flags |=RTNH_F_LINKDOWN ; - err =fib_nh_common_init (&fib6_nh->nh_common, cfg->fc_encap, + err =fib_nh_common_init (net, &fib6_nh->nh_common, cfg->fc_encap, cfg->fc_encap_type, cfg, gfp_flags, extack);if (err) goto out;
net/ipv6/seg6_iptunnel.c +1 -1
@@ -376,7 +376,7 @@ static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)return err; } -static int seg6_build_state (struct nlattr *nla, +static int seg6_build_state (struct net *net,struct nlattr *nla,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
net/ipv6/seg6_local.c +3 -2
@@ -970,8 +970,9 @@ static int parse_nla_action(struct nlattr **attrs, struct seg6_local_lwt *slwt)return 0 ; } -static int seg6_local_build_state (struct nlattr *nla,unsigned int family, -const void *cfg,struct lwtunnel_state **ts, +static int seg6_local_build_state (struct net *net,struct nlattr *nla, +unsigned int family,const void *cfg, +struct lwtunnel_state **ts,struct netlink_ext_ack *extack) {struct nlattr *tb[SEG6_LOCAL_MAX +1 ];
net/mpls/mpls_iptunnel.c +1 -1
@@ -162,7 +162,7 @@ static int mpls_xmit(struct sk_buff *skb)return -EINVAL ; } -static int mpls_build_state (struct nlattr *nla, +static int mpls_build_state (struct net *net,struct nlattr *nla,unsigned int family,const void *cfg,struct lwtunnel_state **ts,struct netlink_ext_ack *extack)
Signature · 1 line
2.20.1
PATCH v3 5/5 net: ipv6: add rpl sr tunnel
In reply to Alexander AringThis patch adds functionality to configure routes for RPL source routing functionality. There is no IPIP functionality yet implemented which can be added later when the cases when to use IPv6 encapuslation comes more clear.
--- include/net/rpl.h | 12 + include/uapi/linux/lwtunnel.h | 1 + include/uapi/linux/rpl_iptunnel.h | 21 ++ net/core/lwtunnel.c | 2 + net/ipv6/Kconfig | 10 + net/ipv6/Makefile | 1 + net/ipv6/af_inet6.c | 7 + net/ipv6/rpl_iptunnel.c | 380 ++++++++++++++++++++++++++++++ 8 files changed, 434 insertions(+) create mode 100644 include/uapi/linux/rpl_iptunnel.h create mode 100644 net/ipv6/rpl_iptunnel.c
include/net/rpl.h +12 -0
@@ -11,6 +11,18 @@#include <linux/rpl.h> +#if IS_ENABLED (CONFIG_IPV6_RPL_LWTUNNEL ) +extern int rpl_init (void ); +extern void rpl_exit (void ); +#else +static inline int rpl_init (void ) +{ +return 0 ; +} + +static inline void rpl_exit (void ) {} +#endif +/* Worst decompression memory usage ipv6 address (16) + pad 7 */ #define IPV6_RPL_SRH_WORST_SWAP_SIZE (sizeof(struct in6_addr) + 7)
include/uapi/linux/lwtunnel.h +1 -0
@@ -13,6 +13,7 @@ enum lwtunnel_encap_types {LWTUNNEL_ENCAP_SEG6 ,LWTUNNEL_ENCAP_BPF ,LWTUNNEL_ENCAP_SEG6_LOCAL , +LWTUNNEL_ENCAP_RPL , __LWTUNNEL_ENCAP_MAX, };
include/uapi/linux/rpl_iptunnel.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* IPv6 RPL-SR implementation +* +* Author: +* (C) 2020 Alexander Aring <[email protected]> +*/ + +#ifndef _UAPI_LINUX_RPL_IPTUNNEL_H +#define _UAPI_LINUX_RPL_IPTUNNEL_H + +enum { +RPL_IPTUNNEL_UNSPEC , +RPL_IPTUNNEL_SRH , + __RPL_IPTUNNEL_MAX, +}; +#define RPL_IPTUNNEL_MAX (__RPL_IPTUNNEL_MAX - 1) + +#define RPL_IPTUNNEL_SRH_SIZE (srh) (((srh)->hdrlen + 1) << 3) + +#endif
net/core/lwtunnel.c +2 -0
@@ -41,6 +41,8 @@ static const char *lwtunnel_encap_str(enum lwtunnel_encap_types encap_type)return "BPF" ;case LWTUNNEL_ENCAP_SEG6_LOCAL :return "SEG6LOCAL" ; +case LWTUNNEL_ENCAP_RPL : +return "RPL" ;case LWTUNNEL_ENCAP_IP6 :case LWTUNNEL_ENCAP_IP :case LWTUNNEL_ENCAP_NONE :
net/ipv6/Kconfig +10 -0
@@ -303,4 +303,14 @@ config IPV6_SEG6_BPF depends on IPV6_SEG6_LWTUNNEL depends on IPV6 = y +config IPV6_RPL_LWTUNNEL + bool "IPv6: RPL Source Routing Header support" + depends on IPV6 + select LWTUNNEL + ---help--- + Support for RFC6554 RPL Source Routing Header using the lightweight + tunnels mechanism. + + If unsure, say N. + endif # IPV6
net/ipv6/Makefile +1 -0
@@ -26,6 +26,7 @@ ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o ipv6-$(CONFIG_NETLABEL) += calipso.o ipv6-$(CONFIG_IPV6_SEG6_LWTUNNEL) += seg6_iptunnel.o seg6_local.o ipv6-$(CONFIG_IPV6_SEG6_HMAC) += seg6_hmac.o +ipv6-$(CONFIG_IPV6_RPL_LWTUNNEL) += rpl_iptunnel.o ipv6-objs += $(ipv6-y)
net/ipv6/af_inet6.c +7 -0
@@ -59,6 +59,7 @@#endif #include <net/calipso.h> #include <net/seg6.h> +#include <net/rpl.h> #include <linux/uaccess.h> #include <linux/mroute6.h>
@@ -1114,6 +1115,10 @@ static int __init inet6_init(void)if (err) goto seg6_fail; + err =rpl_init (); +if (err) + goto rpl_fail; + err =igmp6_late_init ();if (err) goto igmp6_late_err;
@@ -1136,6 +1141,8 @@ static int __init inet6_init(void)igmp6_late_cleanup ();#endif igmp6_late_err: +rpl_exit (); +rpl_fail:seg6_exit (); seg6_fail:calipso_exit ();
net/ipv6/rpl_iptunnel.c new file +380 -0
380 lines not on this page · raw message
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Alexander Aring <[email protected]>
Date: Fri, 27 Mar 2020 18:00:17 -0400
Quoted 5 lines
This patch series will add handling for RPL source routing handling and insertion (implement as lwtunnel)! I did an example prototype implementation in rpld for using this implementation in non-storing mode:
...
Series applied, thanks.