sys/linux: add ipv6_rpl_sr_hdr description

https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/rpl.h#L19
update google#533

17 files changed, 41 insertions, 12 deletions

diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt
index b90c16a58..4cb0e1ec7 100644
--- a/sys/linux/socket_netlink_route.txt
+++ b/sys/linux/socket_netlink_route.txt
@@ -23,6 +23,7 @@ include <uapi/linux/net_namespace.h>
 include <uapi/linux/veth.h>
 include <uapi/linux/can/gw.h>
 include <uapi/linux/can/vxcan.h>
+include <uapi/linux/rpl_iptunnel.h>
 include <net/caif/caif_hsi.h>
 
 resource sock_nl_route[sock_netlink]
@@ -648,8 +649,7 @@ rtm_ipv4_policy [
 	RTA_MULTIPATH	nlattr[RTA_MULTIPATH, rtnexthop]
 	RTA_FLOW	nlattr[RTA_FLOW, int32]
 	RTA_ENCAP_TYPE	nlattr[RTA_ENCAP_TYPE, flags[lwtunnel_encap_types, int16]]
-# TODO: describe RTA_ENCAP
-	RTA_ENCAP	nlnest[RTA_ENCAP, nl_generic_attr]
+	RTA_ENCAP	nlnest[RTA_ENCAP, lwtunnel_policy]
 	RTA_UID		nlattr[RTA_UID, uid]
 	RTA_MARK	nlattr[RTA_MARK, int32]
 ] [varlen]
@@ -664,8 +664,7 @@ rtm_ipv6_policy [
 	RTA_MULTIPATH	nlattr[RTA_MULTIPATH, rtnexthop]
 	RTA_PREF	nlattr[RTA_PREF, int8]
 	RTA_ENCAP_TYPE	nlattr[RTA_ENCAP_TYPE, flags[lwtunnel_encap_types, int16]]
-# TODO: describe RTA_ENCAP
-	RTA_ENCAP	nlnest[RTA_ENCAP, nl_generic_attr]
+	RTA_ENCAP	nlnest[RTA_ENCAP, lwtunnel_policy]
 	RTA_EXPIRES	nlattr[RTA_EXPIRES, int32]
 	RTA_UID		nlattr[RTA_UID, uid]
 	RTA_MARK	nlattr[RTA_MARK, int32]
@@ -967,6 +966,20 @@ rtcanmsg {
 
 rtcanmsg_flags = CGW_FLAGS_CAN_ECHO, CGW_FLAGS_CAN_SRC_TSTAMP, CGW_FLAGS_CAN_IIF_TX_OK
 
+#TODO: define remaining lwtunnel_encap types
+lwtunnel_policy [
+	RPL_IPTUNNEL_SRH	nlattr[RPL_IPTUNNEL_SRH, ipv6_rpl_sr_hdr]
+] [varlen]
+
+ipv6_rpl_sr_hdr {
+	nexthdr		int8
+	hdrlen		len[parent, int8]
+	type		const[RPL_IPTUNNEL_SRH, int8]
+	segments_left	int8
+	control		int32
+	address		array[ipv6_addr]
+} [packed]
+
 cgw_policy [
 	CGW_MOD_AND	nlattr[CGW_MOD_AND, cgw_frame_mod]
 	CGW_MOD_OR	nlattr[CGW_MOD_OR, cgw_frame_mod]
diff --git a/sys/linux/socket_netlink_route_386.const b/sys/linux/socket_netlink_route_386.const
index 8b8c822fd..a3643b433 100644
--- a/sys/linux/socket_netlink_route_386.const
+++ b/sys/linux/socket_netlink_route_386.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_amd64.const b/sys/linux/socket_netlink_route_amd64.const
index fda75951c..90e4c1ef6 100644
--- a/sys/linux/socket_netlink_route_amd64.const
+++ b/sys/linux/socket_netlink_route_amd64.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_arm.const b/sys/linux/socket_netlink_route_arm.const
index 257d1926d..49a4554d1 100644
--- a/sys/linux/socket_netlink_route_arm.const
+++ b/sys/linux/socket_netlink_route_arm.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_arm64.const b/sys/linux/socket_netlink_route_arm64.const
index 722ae775d..572063d5a 100644
--- a/sys/linux/socket_netlink_route_arm64.const
+++ b/sys/linux/socket_netlink_route_arm64.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_mips64le.const b/sys/linux/socket_netlink_route_mips64le.const
index b6c79f50b..3e9a4c1f0 100644
--- a/sys/linux/socket_netlink_route_mips64le.const
+++ b/sys/linux/socket_netlink_route_mips64le.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_ppc64le.const b/sys/linux/socket_netlink_route_ppc64le.const
index 2b90409cc..3cd875875 100644
--- a/sys/linux/socket_netlink_route_ppc64le.const
+++ b/sys/linux/socket_netlink_route_ppc64le.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_riscv64.const b/sys/linux/socket_netlink_route_riscv64.const
index 722ae775d..572063d5a 100644
--- a/sys/linux/socket_netlink_route_riscv64.const
+++ b/sys/linux/socket_netlink_route_riscv64.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_netlink_route_s390x.const b/sys/linux/socket_netlink_route_s390x.const
index 8b8c822fd..a3643b433 100644
--- a/sys/linux/socket_netlink_route_s390x.const
+++ b/sys/linux/socket_netlink_route_s390x.const
@@ -389,6 +389,7 @@ LWTUNNEL_ENCAP_IP = 2
 LWTUNNEL_ENCAP_IP6 = 4
 LWTUNNEL_ENCAP_MPLS = 1
 LWTUNNEL_ENCAP_NONE = 0
+LWTUNNEL_ENCAP_RPL = 8
 LWTUNNEL_ENCAP_SEG6 = 5
 LWTUNNEL_ENCAP_SEG6_LOCAL = 7
 MACVLAN_MACADDR_ADD = 0
@@ -462,6 +463,7 @@ NUD_PERMANENT = 128
 NUD_PROBE = 16
 NUD_REACHABLE = 2
 NUD_STALE = 4
+RPL_IPTUNNEL_SRH = 1
 RTA_DST = 1
 RTA_ENCAP = 22
 RTA_ENCAP_TYPE = 21
diff --git a/sys/linux/socket_xdp_386.const b/sys/linux/socket_xdp_386.const
index 760c0ebf2..46c5d9fc2 100644
--- a/sys/linux/socket_xdp_386.const
+++ b/sys/linux/socket_xdp_386.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_amd64.const b/sys/linux/socket_xdp_amd64.const
index 97be9a120..5424c2c77 100644
--- a/sys/linux/socket_xdp_amd64.const
+++ b/sys/linux/socket_xdp_amd64.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_arm.const b/sys/linux/socket_xdp_arm.const
index ee6bc8890..3bc0d5aec 100644
--- a/sys/linux/socket_xdp_arm.const
+++ b/sys/linux/socket_xdp_arm.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_arm64.const b/sys/linux/socket_xdp_arm64.const
index 19caf64e8..f6a20277e 100644
--- a/sys/linux/socket_xdp_arm64.const
+++ b/sys/linux/socket_xdp_arm64.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_mips64le.const b/sys/linux/socket_xdp_mips64le.const
index 211d7e98e..00f64f852 100644
--- a/sys/linux/socket_xdp_mips64le.const
+++ b/sys/linux/socket_xdp_mips64le.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_ppc64le.const b/sys/linux/socket_xdp_ppc64le.const
index baac9fa14..9aa126e89 100644
--- a/sys/linux/socket_xdp_ppc64le.const
+++ b/sys/linux/socket_xdp_ppc64le.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_riscv64.const b/sys/linux/socket_xdp_riscv64.const
index 19caf64e8..f6a20277e 100644
--- a/sys/linux/socket_xdp_riscv64.const
+++ b/sys/linux/socket_xdp_riscv64.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5
diff --git a/sys/linux/socket_xdp_s390x.const b/sys/linux/socket_xdp_s390x.const
index 2a8504b7c..c950de654 100644
--- a/sys/linux/socket_xdp_s390x.const
+++ b/sys/linux/socket_xdp_s390x.const
@@ -10,7 +10,7 @@ XDP_PGOFF_TX_RING = 2147483648
 XDP_RX_RING = 2
 XDP_SHARED_UMEM = 1
 XDP_STATISTICS = 7
-XDP_STATISTICS_SIZE = 24
+XDP_STATISTICS_SIZE = 48
 XDP_TX_RING = 3
 XDP_UMEM_COMPLETION_RING = 6
 XDP_UMEM_FILL_RING = 5