Commit 96376cad authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv6-add-rpl-source-routing' 

Alexander Aring says:

====================
net: ipv6: add rpl source routing

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
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c189b548 a7a29f9c

include/linux/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -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/addrconf.h

+3 −0
Original line number Diff line number Diff line
@@ -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);

include/net/ip_fib.h

+3 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

include/net/rpl.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 *  RPL implementation

 *

 *  Author:

 *  (C) 2020 Alexander Aring <alex.aring@gmail.com>

 */



#ifndef _NET_RPL_H

#define _NET_RPL_H



#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)



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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE