From 94b44c8f431c8d159fee6c067aded7b9c4e71104 Mon Sep 17 00:00:00 2001

From: Phil Sutter <psutter@redhat.com>

Date: Thu, 25 Oct 2018 17:00:00 +0200

Subject: [PATCH] Update kernel headers

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1637440

Upstream Status: RHEL-only

This updates include/uapi/linux to the state of upstream commit

d9c0be4e9795473a73793058674c34d56cdb5eea.

---

 include/uapi/linux/bpf.h       | 121 ++++++++++++++++++++++++++++++++++++++++-

 include/uapi/linux/btf.h       |   2 +-

 include/uapi/linux/can.h       |   2 +-

 include/uapi/linux/gen_stats.h |   1 +

 include/uapi/linux/if_addr.h   |   1 +

 include/uapi/linux/if_arp.h    |  18 +++---

 include/uapi/linux/if_link.h   |  15 +++++

 include/uapi/linux/if_packet.h |   1 +

 include/uapi/linux/in6.h       |   1 +

 include/uapi/linux/ip.h        |   1 +

 include/uapi/linux/l2tp.h      |  15 ++---

 include/uapi/linux/neighbour.h |   1 +

 include/uapi/linux/netconf.h   |   1 +

 include/uapi/linux/pkt_cls.h   |  34 +++++++++++-

 include/uapi/linux/pkt_sched.h |  21 ++++++-

 include/uapi/linux/rtnetlink.h |   7 +++

 include/uapi/linux/tcp.h       |  14 ++++-

 include/uapi/linux/xfrm.h      |   5 +-

 18 files changed, 235 insertions(+), 26 deletions(-)

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h

index b9a6367..abb7f77 100644

--- a/include/uapi/linux/bpf.h

+++ b/include/uapi/linux/bpf.h

@@ -75,6 +75,11 @@ struct bpf_lpm_trie_key {

 	__u8	data[0];	/* Arbitrary size */

 };

+struct bpf_cgroup_storage_key {

+	__u64	cgroup_inode_id;	/* cgroup inode id */

+	__u32	attach_type;		/* program attach type */

+};

+

 /* BPF syscall commands, see bpf(2) man-page for details. */

 enum bpf_cmd {

 	BPF_MAP_CREATE,

@@ -120,6 +125,8 @@ enum bpf_map_type {

 	BPF_MAP_TYPE_CPUMAP,

 	BPF_MAP_TYPE_XSKMAP,

 	BPF_MAP_TYPE_SOCKHASH,

+	BPF_MAP_TYPE_CGROUP_STORAGE,

+	BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,

 };

 enum bpf_prog_type {

@@ -144,6 +151,8 @@ enum bpf_prog_type {

 	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,

 	BPF_PROG_TYPE_LWT_SEG6LOCAL,

 	BPF_PROG_TYPE_LIRC_MODE2,

+	BPF_PROG_TYPE_SK_REUSEPORT,

+	BPF_PROG_TYPE_FLOW_DISSECTOR,

 };

 enum bpf_attach_type {

@@ -164,6 +173,7 @@ enum bpf_attach_type {

 	BPF_CGROUP_UDP4_SENDMSG,

 	BPF_CGROUP_UDP6_SENDMSG,

 	BPF_LIRC_MODE2,

+	BPF_FLOW_DISSECTOR,

 	__MAX_BPF_ATTACH_TYPE

 };

@@ -1371,6 +1381,20 @@ union bpf_attr {

  * 		A 8-byte long non-decreasing number on success, or 0 if the

  * 		socket field is missing inside *skb*.

  *

+ * u64 bpf_get_socket_cookie(struct bpf_sock_addr *ctx)

+ * 	Description

+ * 		Equivalent to bpf_get_socket_cookie() helper that accepts

+ * 		*skb*, but gets socket from **struct bpf_sock_addr** contex.

+ * 	Return

+ * 		A 8-byte long non-decreasing number.

+ *

+ * u64 bpf_get_socket_cookie(struct bpf_sock_ops *ctx)

+ * 	Description

+ * 		Equivalent to bpf_get_socket_cookie() helper that accepts

+ * 		*skb*, but gets socket from **struct bpf_sock_ops** contex.

+ * 	Return

+ * 		A 8-byte long non-decreasing number.

+ *

  * u32 bpf_get_socket_uid(struct sk_buff *skb)

  * 	Return

  * 		The owner UID of the socket associated to *skb*. If the socket

@@ -2071,10 +2095,54 @@ union bpf_attr {

  * 	Return

  * 		The id is returned or 0 in case the id could not be retrieved.

  *

+ * u64 bpf_skb_ancestor_cgroup_id(struct sk_buff *skb, int ancestor_level)

+ *	Description

+ *		Return id of cgroup v2 that is ancestor of cgroup associated

+ *		with the *skb* at the *ancestor_level*.  The root cgroup is at

+ *		*ancestor_level* zero and each step down the hierarchy

+ *		increments the level. If *ancestor_level* == level of cgroup

+ *		associated with *skb*, then return value will be same as that

+ *		of **bpf_skb_cgroup_id**\ ().

+ *

+ *		The helper is useful to implement policies based on cgroups

+ *		that are upper in hierarchy than immediate cgroup associated

+ *		with *skb*.

+ *

+ *		The format of returned id and helper limitations are same as in

+ *		**bpf_skb_cgroup_id**\ ().

+ *	Return

+ *		The id is returned or 0 in case the id could not be retrieved.

+ *

  * u64 bpf_get_current_cgroup_id(void)

  * 	Return

  * 		A 64-bit integer containing the current cgroup id based

  * 		on the cgroup within which the current task is running.

+ *

+ * void* get_local_storage(void *map, u64 flags)

+ *	Description

+ *		Get the pointer to the local storage area.

+ *		The type and the size of the local storage is defined

+ *		by the *map* argument.

+ *		The *flags* meaning is specific for each map type,

+ *		and has to be 0 for cgroup local storage.

+ *

+ *		Depending on the bpf program type, a local storage area

+ *		can be shared between multiple instances of the bpf program,

+ *		running simultaneously.

+ *

+ *		A user should care about the synchronization by himself.

+ *		For example, by using the BPF_STX_XADD instruction to alter

+ *		the shared data.

+ *	Return

+ *		Pointer to the local storage area.

+ *

+ * int bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map *map, void *key, u64 flags)

+ *	Description

+ *		Select a SO_REUSEPORT sk from a	BPF_MAP_TYPE_REUSEPORT_ARRAY map

+ *		It checks the selected sk is matching the incoming

+ *		request in the skb.

+ *	Return

+ *		0 on success, or a negative error in case of failure.

  */

 #define __BPF_FUNC_MAPPER(FN)		\

 	FN(unspec),			\

@@ -2157,7 +2225,10 @@ union bpf_attr {

 	FN(rc_repeat),			\

 	FN(rc_keydown),			\

 	FN(skb_cgroup_id),		\

-	FN(get_current_cgroup_id),

+	FN(get_current_cgroup_id),	\

+	FN(get_local_storage),		\

+	FN(sk_select_reuseport),	\

+	FN(skb_ancestor_cgroup_id),

 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

  * function eBPF program intends to call

@@ -2264,6 +2335,7 @@ struct __sk_buff {

 	/* ... here. */

 	__u32 data_meta;

+	struct bpf_flow_keys *flow_keys;

 };

 struct bpf_tunnel_key {

@@ -2374,6 +2446,30 @@ struct sk_msg_md {

 	__u32 local_port;	/* stored in host byte order */

 };

+struct sk_reuseport_md {

+	/*

+	 * Start of directly accessible data. It begins from

+	 * the tcp/udp header.

+	 */

+	void *data;

+	void *data_end;		/* End of directly accessible data */

+	/*

+	 * Total length of packet (starting from the tcp/udp header).

+	 * Note that the directly accessible bytes (data_end - data)

+	 * could be less than this "len".  Those bytes could be

+	 * indirectly read by a helper "bpf_skb_load_bytes()".

+	 */

+	__u32 len;

+	/*

+	 * Eth protocol in the mac header (network byte order). e.g.

+	 * ETH_P_IP(0x0800) and ETH_P_IPV6(0x86DD)

+	 */

+	__u32 eth_protocol;

+	__u32 ip_protocol;	/* IP protocol. e.g. IPPROTO_TCP, IPPROTO_UDP */

+	__u32 bind_inany;	/* Is sock bound to an INANY address? */

+	__u32 hash;		/* A hash of the packet 4 tuples */

+};

+

 #define BPF_TAG_SIZE	8

 struct bpf_prog_info {

@@ -2685,4 +2781,27 @@ enum bpf_task_fd_type {

 	BPF_FD_TYPE_URETPROBE,		/* filename + offset */

 };

+struct bpf_flow_keys {

+	__u16	nhoff;

+	__u16	thoff;

+	__u16	addr_proto;			/* ETH_P_* of valid addrs */

+	__u8	is_frag;

+	__u8	is_first_frag;

+	__u8	is_encap;

+	__u8	ip_proto;

+	__be16	n_proto;

+	__be16	sport;

+	__be16	dport;

+	union {

+		struct {

+			__be32	ipv4_src;

+			__be32	ipv4_dst;

+		};

+		struct {

+			__u32	ipv6_src[4];	/* in6_addr; network order */

+			__u32	ipv6_dst[4];	/* in6_addr; network order */

+		};

+	};

+};

+

 #endif /* __LINUX_BPF_H__ */

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h

index 5dd580a..8d2a8ff 100644

--- a/include/uapi/linux/btf.h

+++ b/include/uapi/linux/btf.h

@@ -76,7 +76,7 @@ struct btf_type {

  */

 #define BTF_INT_ENCODING(VAL)	(((VAL) & 0x0f000000) >> 24)

 #define BTF_INT_OFFSET(VAL)	(((VAL  & 0x00ff0000)) >> 16)

-#define BTF_INT_BITS(VAL)	((VAL)  & 0x0000ffff)

+#define BTF_INT_BITS(VAL)	((VAL)  & 0x000000ff)

 /* Attributes stored in the BTF_INT_ENCODING */

 #define BTF_INT_SIGNED	(1 << 0)

diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h

index 4d1ab8e..9009f0b 100644

--- a/include/uapi/linux/can.h

+++ b/include/uapi/linux/can.h

@@ -77,7 +77,7 @@ typedef __u32 canid_t;

 /*

  * Controller Area Network Error Message Frame Mask structure

  *

- * bit 0-28	: error class mask (see include/linux/can/error.h)

+ * bit 0-28	: error class mask (see include/uapi/linux/can/error.h)

  * bit 29-31	: set to zero

  */

 typedef __u32 can_err_mask_t;

diff --git a/include/uapi/linux/gen_stats.h b/include/uapi/linux/gen_stats.h

index 24a861c..065408e 100644

--- a/include/uapi/linux/gen_stats.h

+++ b/include/uapi/linux/gen_stats.h

@@ -12,6 +12,7 @@ enum {

 	TCA_STATS_APP,

 	TCA_STATS_RATE_EST64,

 	TCA_STATS_PAD,

+	TCA_STATS_BASIC_HW,

 	__TCA_STATS_MAX,

 };

 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)

diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h

index a924606..c4dd87f 100644

--- a/include/uapi/linux/if_addr.h

+++ b/include/uapi/linux/if_addr.h

@@ -34,6 +34,7 @@ enum {

 	IFA_MULTICAST,

 	IFA_FLAGS,

 	IFA_RT_PRIORITY,  /* u32, priority/metric for prefix route */

+	IFA_TARGET_NETNSID,

 	__IFA_MAX,

 };

diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h

index cd136a6..dbfbc22 100644

--- a/include/uapi/linux/if_arp.h

+++ b/include/uapi/linux/if_arp.h

@@ -114,18 +114,18 @@

 /* ARP ioctl request. */

 struct arpreq {

-  struct sockaddr	arp_pa;		/* protocol address		*/

-  struct sockaddr	arp_ha;		/* hardware address		*/

-  int			arp_flags;	/* flags			*/

-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */

-  char			arp_dev[16];

+	struct sockaddr	arp_pa;		/* protocol address		 */

+	struct sockaddr	arp_ha;		/* hardware address		 */

+	int		arp_flags;	/* flags			 */

+	struct sockaddr arp_netmask;    /* netmask (only for proxy arps) */

+	char		arp_dev[IFNAMSIZ];

 };

 struct arpreq_old {

-  struct sockaddr	arp_pa;		/* protocol address		*/

-  struct sockaddr	arp_ha;		/* hardware address		*/

-  int			arp_flags;	/* flags			*/

-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */

+	struct sockaddr	arp_pa;		/* protocol address		 */

+	struct sockaddr	arp_ha;		/* hardware address		 */

+	int		arp_flags;	/* flags			 */

+	struct sockaddr	arp_netmask;    /* netmask (only for proxy arps) */

 };

 /* ARP Flag values. */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h

index 1c64ed4..9c25460 100644

--- a/include/uapi/linux/if_link.h

+++ b/include/uapi/linux/if_link.h

@@ -161,9 +161,12 @@ enum {

 	IFLA_EVENT,

 	IFLA_NEW_NETNSID,

 	IFLA_IF_NETNSID,

+	IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */

 	IFLA_CARRIER_UP_COUNT,

 	IFLA_CARRIER_DOWN_COUNT,

 	IFLA_NEW_IFINDEX,

+	IFLA_MIN_MTU,

+	IFLA_MAX_MTU,

 	__IFLA_MAX

 };

@@ -332,6 +335,7 @@ enum {

 	IFLA_BRPORT_GROUP_FWD_MASK,

 	IFLA_BRPORT_NEIGH_SUPPRESS,

 	IFLA_BRPORT_ISOLATED,

+	IFLA_BRPORT_BACKUP_PORT,

 	__IFLA_BRPORT_MAX

 };

 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

@@ -457,6 +461,16 @@ enum {

 #define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1)

+/* XFRM section */

+enum {

+	IFLA_XFRM_UNSPEC,

+	IFLA_XFRM_LINK,

+	IFLA_XFRM_IF_ID,

+	__IFLA_XFRM_MAX

+};

+

+#define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1)

+

 enum macsec_validation_type {

 	MACSEC_VALIDATE_DISABLED = 0,

 	MACSEC_VALIDATE_CHECK = 1,

@@ -539,6 +553,7 @@ enum {

 	IFLA_GENEVE_UDP_ZERO_CSUM6_TX,

 	IFLA_GENEVE_UDP_ZERO_CSUM6_RX,

 	IFLA_GENEVE_LABEL,

+	IFLA_GENEVE_TTL_INHERIT,

 	__IFLA_GENEVE_MAX

 };

 #define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)

diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h

index 67b61d9..467b654 100644

--- a/include/uapi/linux/if_packet.h

+++ b/include/uapi/linux/if_packet.h

@@ -57,6 +57,7 @@ struct sockaddr_ll {

 #define PACKET_QDISC_BYPASS		20

 #define PACKET_ROLLOVER_STATS		21

 #define PACKET_FANOUT_DATA		22

+#define PACKET_IGNORE_OUTGOING		23

 #define PACKET_FANOUT_HASH		0

 #define PACKET_FANOUT_LB		1

diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h

index 409bb3f..2bb132a 100644

--- a/include/uapi/linux/in6.h

+++ b/include/uapi/linux/in6.h

@@ -177,6 +177,7 @@ struct in6_flowlabel_req {

 #define IPV6_V6ONLY		26

 #define IPV6_JOIN_ANYCAST	27

 #define IPV6_LEAVE_ANYCAST	28

+#define IPV6_MULTICAST_ALL	29

 /* IPV6_MTU_DISCOVER values */

 #define IPV6_PMTUDISC_DONT		0

diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h

index 883fd33..f4ecd2f 100644

--- a/include/uapi/linux/ip.h

+++ b/include/uapi/linux/ip.h

@@ -168,6 +168,7 @@ enum

 	IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,

 	IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,

 	IPV4_DEVCONF_DROP_GRATUITOUS_ARP,

+	IPV4_DEVCONF_BC_FORWARDING,

 	__IPV4_DEVCONF_MAX

 };

diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h

index 1fe52a7..131c3a2 100644

--- a/include/uapi/linux/l2tp.h

+++ b/include/uapi/linux/l2tp.h

@@ -60,14 +60,14 @@ struct sockaddr_l2tpip6 {

 /*

  * Commands.

  * Valid TLVs of each command are:-

- * TUNNEL_CREATE	- CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid

+ * TUNNEL_CREATE	- CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum

  * TUNNEL_DELETE	- CONN_ID

  * TUNNEL_MODIFY	- CONN_ID, udpcsum

  * TUNNEL_GETSTATS	- CONN_ID, (stats)

  * TUNNEL_GET		- CONN_ID, (...)

- * SESSION_CREATE	- SESSION_ID, PW_TYPE, data_seq, cookie, peer_cookie, l2spec

+ * SESSION_CREATE	- SESSION_ID, PW_TYPE, cookie, peer_cookie, l2spec

  * SESSION_DELETE	- SESSION_ID

- * SESSION_MODIFY	- SESSION_ID, data_seq

+ * SESSION_MODIFY	- SESSION_ID

  * SESSION_GET		- SESSION_ID, (...)

  * SESSION_GETSTATS	- SESSION_ID, (stats)

  *

@@ -95,7 +95,7 @@ enum {

 	L2TP_ATTR_PW_TYPE,		/* u16, enum l2tp_pwtype */

 	L2TP_ATTR_ENCAP_TYPE,		/* u16, enum l2tp_encap_type */

 	L2TP_ATTR_OFFSET,		/* u16 (not used) */

-	L2TP_ATTR_DATA_SEQ,		/* u16 */

+	L2TP_ATTR_DATA_SEQ,		/* u16 (not used) */

 	L2TP_ATTR_L2SPEC_TYPE,		/* u8, enum l2tp_l2spec_type */

 	L2TP_ATTR_L2SPEC_LEN,		/* u8 (not used) */

 	L2TP_ATTR_PROTO_VERSION,	/* u8 */

@@ -105,7 +105,7 @@ enum {

 	L2TP_ATTR_SESSION_ID,		/* u32 */

 	L2TP_ATTR_PEER_SESSION_ID,	/* u32 */

 	L2TP_ATTR_UDP_CSUM,		/* u8 */

-	L2TP_ATTR_VLAN_ID,		/* u16 */

+	L2TP_ATTR_VLAN_ID,		/* u16 (not used) */

 	L2TP_ATTR_COOKIE,		/* 0, 4 or 8 bytes */

 	L2TP_ATTR_PEER_COOKIE,		/* 0, 4 or 8 bytes */

 	L2TP_ATTR_DEBUG,		/* u32, enum l2tp_debug_flags */

@@ -119,8 +119,8 @@ enum {

 	L2TP_ATTR_IP_DADDR,		/* u32 */

 	L2TP_ATTR_UDP_SPORT,		/* u16 */

 	L2TP_ATTR_UDP_DPORT,		/* u16 */

-	L2TP_ATTR_MTU,			/* u16 */

-	L2TP_ATTR_MRU,			/* u16 */

+	L2TP_ATTR_MTU,			/* u16 (not used) */

+	L2TP_ATTR_MRU,			/* u16 (not used) */

 	L2TP_ATTR_STATS,		/* nested */

 	L2TP_ATTR_IP6_SADDR,		/* struct in6_addr */

 	L2TP_ATTR_IP6_DADDR,		/* struct in6_addr */

@@ -169,6 +169,7 @@ enum l2tp_encap_type {

 	L2TP_ENCAPTYPE_IP,

 };

+/* For L2TP_ATTR_DATA_SEQ. Unused. */

 enum l2tp_seqmode {

 	L2TP_SEQ_NONE = 0,

 	L2TP_SEQ_IP = 1,

diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h

index 904db61..9981554 100644

--- a/include/uapi/linux/neighbour.h

+++ b/include/uapi/linux/neighbour.h

@@ -43,6 +43,7 @@ enum {

 #define NTF_PROXY	0x08	/* == ATF_PUBL */

 #define NTF_EXT_LEARNED	0x10

 #define NTF_OFFLOADED   0x20

+#define NTF_STICKY	0x40

 #define NTF_ROUTER	0x80

 /*

diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h

index 86ac1eb..229e885 100644

--- a/include/uapi/linux/netconf.h

+++ b/include/uapi/linux/netconf.h

@@ -18,6 +18,7 @@ enum {

 	NETCONFA_PROXY_NEIGH,

 	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,

 	NETCONFA_INPUT,

+	NETCONFA_BC_FORWARDING,

 	__NETCONFA_MAX

 };

 #define NETCONFA_MAX	(__NETCONFA_MAX - 1)

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h

index b451225..401d0c1 100644

--- a/include/uapi/linux/pkt_cls.h

+++ b/include/uapi/linux/pkt_cls.h

@@ -45,6 +45,7 @@ enum {

 				   * the skb and act like everything

 				   * is alright.

 				   */

+#define TC_ACT_VALUE_MAX	TC_ACT_TRAP

 /* There is a special kind of actions called "extended actions",

  * which need a value parameter. These have a local opcode located in

@@ -55,11 +56,12 @@ enum {

 #define __TC_ACT_EXT_SHIFT 28

 #define __TC_ACT_EXT(local) ((local) << __TC_ACT_EXT_SHIFT)

 #define TC_ACT_EXT_VAL_MASK ((1 << __TC_ACT_EXT_SHIFT) - 1)

-#define TC_ACT_EXT_CMP(combined, opcode) \

-	(((combined) & (~TC_ACT_EXT_VAL_MASK)) == opcode)

+#define TC_ACT_EXT_OPCODE(combined) ((combined) & (~TC_ACT_EXT_VAL_MASK))

+#define TC_ACT_EXT_CMP(combined, opcode) (TC_ACT_EXT_OPCODE(combined) == opcode)

 #define TC_ACT_JUMP __TC_ACT_EXT(1)

 #define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)

+#define TC_ACT_EXT_OPCODE_MAX	TC_ACT_GOTO_CHAIN

 /* Action type identifiers*/

 enum {

@@ -478,12 +480,40 @@ enum {

 	TCA_FLOWER_KEY_ENC_IP_TTL,	/* u8 */

 	TCA_FLOWER_KEY_ENC_IP_TTL_MASK,	/* u8 */

+	TCA_FLOWER_KEY_ENC_OPTS,

+	TCA_FLOWER_KEY_ENC_OPTS_MASK,

+

+	TCA_FLOWER_IN_HW_COUNT,

+

 	__TCA_FLOWER_MAX,

 };

 #define TCA_FLOWER_MAX (__TCA_FLOWER_MAX - 1)

 enum {

+	TCA_FLOWER_KEY_ENC_OPTS_UNSPEC,

+	TCA_FLOWER_KEY_ENC_OPTS_GENEVE, /* Nested

+					 * TCA_FLOWER_KEY_ENC_OPT_GENEVE_

+					 * attributes

+					 */

+	__TCA_FLOWER_KEY_ENC_OPTS_MAX,

+};

+

+#define TCA_FLOWER_KEY_ENC_OPTS_MAX (__TCA_FLOWER_KEY_ENC_OPTS_MAX - 1)

+

+enum {

+	TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC,

+	TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS,            /* u16 */

+	TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE,             /* u8 */

+	TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA,             /* 4 to 128 bytes */

+

+	__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX,

+};

+

+#define TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX \

+		(__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX - 1)

+

+enum {

 	TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),

 	TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),

 };

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h

index d9cc9dc..e9b7244 100644

--- a/include/uapi/linux/pkt_sched.h

+++ b/include/uapi/linux/pkt_sched.h

@@ -124,6 +124,21 @@ struct tc_fifo_qopt {

 	__u32	limit;	/* Queue length: bytes for bfifo, packets for pfifo */

 };

+/* SKBPRIO section */

+

+/*

+ * Priorities go from zero to (SKBPRIO_MAX_PRIORITY - 1).

+ * SKBPRIO_MAX_PRIORITY should be at least 64 in order for skbprio to be able

+ * to map one to one the DS field of IPV4 and IPV6 headers.

+ * Memory allocation grows linearly with SKBPRIO_MAX_PRIORITY.

+ */

+

+#define SKBPRIO_MAX_PRIORITY 64

+

+struct tc_skbprio_qopt {

+	__u32	limit;		/* Queue length in packets. */

+};

+

 /* PRIO section */

 #define TCQ_PRIO_BANDS	16

@@ -380,9 +395,9 @@ enum {

 struct tc_htb_xstats {

 	__u32 lends;

 	__u32 borrows;

-	__u32 giants;	/* too big packets (rate will not be accurate) */

-	__u32 tokens;

-	__u32 ctokens;

+	__u32 giants;	/* unused since 'Make HTB scheduler work with TSO.' */

+	__s32 tokens;

+	__s32 ctokens;

 };

 /* HFSC section */

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h

index c3a7d8e..8c1d600 100644

--- a/include/uapi/linux/rtnetlink.h

+++ b/include/uapi/linux/rtnetlink.h

@@ -150,6 +150,13 @@ enum {

 	RTM_NEWCACHEREPORT = 96,

 #define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT

+	RTM_NEWCHAIN = 100,

+#define RTM_NEWCHAIN RTM_NEWCHAIN

+	RTM_DELCHAIN,

+#define RTM_DELCHAIN RTM_DELCHAIN

+	RTM_GETCHAIN,

+#define RTM_GETCHAIN RTM_GETCHAIN

+

 	__RTM_MAX,

 #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)

 };

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h

index 2e766cf..6ec7766 100644

--- a/include/uapi/linux/tcp.h

+++ b/include/uapi/linux/tcp.h

@@ -127,6 +127,10 @@ enum {

 #define TCP_CM_INQ		TCP_INQ

+#define TCP_REPAIR_ON		1

+#define TCP_REPAIR_OFF		0

+#define TCP_REPAIR_OFF_NO_WP	-1	/* Turn off without window probes */

+

 struct tcp_repair_opt {

 	__u32	opt_code;

 	__u32	opt_val;

@@ -231,6 +235,11 @@ struct tcp_info {

 	__u32	tcpi_delivered;

 	__u32	tcpi_delivered_ce;

+

+	__u64	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */

+	__u64	tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */

+	__u32	tcpi_dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups */

+	__u32	tcpi_reord_seen;     /* reordering events seen */

 };

 /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */

@@ -253,7 +262,10 @@ enum {

 	TCP_NLA_SND_SSTHRESH,	/* Slow start size threshold */

 	TCP_NLA_DELIVERED,	/* Data pkts delivered incl. out-of-order */

 	TCP_NLA_DELIVERED_CE,	/* Like above but only ones w/ CE marks */

-

+	TCP_NLA_BYTES_SENT,	/* Data bytes sent including retransmission */

+	TCP_NLA_BYTES_RETRANS,	/* Data bytes retransmitted */

+	TCP_NLA_DSACK_DUPS,	/* DSACK blocks received */

+	TCP_NLA_REORD_SEEN,	/* reordering events seen */

 };

 /* for TCP_MD5SIG socket option */

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h

index 93fb192..5cdda9d 100644

--- a/include/uapi/linux/xfrm.h

+++ b/include/uapi/linux/xfrm.h

@@ -305,9 +305,12 @@ enum xfrm_attr_type_t {

 	XFRMA_ADDRESS_FILTER,	/* struct xfrm_address_filter */

 	XFRMA_PAD,

 	XFRMA_OFFLOAD_DEV,	/* struct xfrm_state_offload */

-	XFRMA_OUTPUT_MARK,	/* __u32 */

+	XFRMA_SET_MARK,		/* __u32 */

+	XFRMA_SET_MARK_MASK,	/* __u32 */

+	XFRMA_IF_ID,		/* __u32 */

 	__XFRMA_MAX

+#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK	/* Compatibility */

 #define XFRMA_MAX (__XFRMA_MAX - 1)

 };

-- 

1.8.3.1