From 7f123fac8aa0ff7741777935121e1b394c56e75a Mon Sep 17 00:00:00 2001

From: Phil Sutter <psutter@redhat.com>

Date: Fri, 10 Nov 2017 10:19:43 +0100

Subject: [PATCH] Update linux headers

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

This updates include/linux to the state just before commit 596b1c94aa38e

("iproute: build more easily on Android").

---

 include/linux/bpf.h                  | 253 +++++++++++++++++-

 include/linux/can/vxcan.h            |  12 +

 include/linux/devlink.h              |  92 ++++++-

 include/linux/elf-em.h               |   1 -

 include/linux/if_arp.h               |   2 +

 include/linux/if_ether.h             |   6 +

 include/linux/if_link.h              |  37 ++-

 include/linux/if_packet.h            |   1 +

 include/linux/if_tunnel.h            |   4 +

 include/linux/inet_diag.h            |   2 +

 include/linux/ipsec.h                |  47 ++++

 include/linux/lwtunnel.h             |   1 +

 include/linux/magic.h                |   3 +

 include/linux/mpls_iptunnel.h        |   2 +

 include/linux/neighbour.h            |   1 +

 include/linux/netlink.h              |  67 ++++-

 include/linux/netlink_diag.h         |  10 +

 include/linux/pfkeyv2.h              | 383 +++++++++++++++++++++++++++

 include/linux/pkt_cls.h              |  37 ++-

 include/linux/pkt_sched.h            |   8 +

 include/linux/rtnetlink.h            |  36 ++-

 include/linux/sctp.h                 |  38 +++

 include/linux/seg6.h                 |  54 ++++

 include/linux/seg6_genl.h            |  32 +++

 include/linux/seg6_hmac.h            |  22 ++

 include/linux/seg6_iptunnel.h        |  40 +++

 include/linux/seg6_local.h           |  68 +++++

 include/linux/tc_act/tc_bpf.h        |   1 +

 include/linux/tc_act/tc_tunnel_key.h |   1 +

 include/linux/tcp.h                  |  27 +-

 include/linux/xfrm.h                 |   9 +

 31 files changed, 1272 insertions(+), 25 deletions(-)

 create mode 100644 include/linux/can/vxcan.h

 create mode 100644 include/linux/ipsec.h

 create mode 100644 include/linux/pfkeyv2.h

 create mode 100644 include/linux/seg6.h

 create mode 100644 include/linux/seg6_genl.h

 create mode 100644 include/linux/seg6_hmac.h

 create mode 100644 include/linux/seg6_iptunnel.h

 create mode 100644 include/linux/seg6_local.h

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

index 178e20c388852..0895a529cc90b 100644

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

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

@@ -30,9 +30,14 @@

 #define BPF_FROM_LE	BPF_TO_LE

 #define BPF_FROM_BE	BPF_TO_BE

+/* jmp encodings */

 #define BPF_JNE		0x50	/* jump != */

+#define BPF_JLT		0xa0	/* LT is unsigned, '<' */

+#define BPF_JLE		0xb0	/* LE is unsigned, '<=' */

 #define BPF_JSGT	0x60	/* SGT is signed '>', GT in x86 */

 #define BPF_JSGE	0x70	/* SGE is signed '>=', GE in x86 */

+#define BPF_JSLT	0xc0	/* SLT is signed, '<' */

+#define BPF_JSLE	0xd0	/* SLE is signed, '<=' */

 #define BPF_CALL	0x80	/* function call */

 #define BPF_EXIT	0x90	/* function return */

@@ -81,6 +86,12 @@ enum bpf_cmd {

 	BPF_OBJ_GET,

 	BPF_PROG_ATTACH,

 	BPF_PROG_DETACH,

+	BPF_PROG_TEST_RUN,

+	BPF_PROG_GET_NEXT_ID,

+	BPF_MAP_GET_NEXT_ID,

+	BPF_PROG_GET_FD_BY_ID,

+	BPF_MAP_GET_FD_BY_ID,

+	BPF_OBJ_GET_INFO_BY_FD,

 };

 enum bpf_map_type {

@@ -96,6 +107,10 @@ enum bpf_map_type {

 	BPF_MAP_TYPE_LRU_HASH,

 	BPF_MAP_TYPE_LRU_PERCPU_HASH,

 	BPF_MAP_TYPE_LPM_TRIE,

+	BPF_MAP_TYPE_ARRAY_OF_MAPS,

+	BPF_MAP_TYPE_HASH_OF_MAPS,

+	BPF_MAP_TYPE_DEVMAP,

+	BPF_MAP_TYPE_SOCKMAP,

 };

 enum bpf_prog_type {

@@ -112,12 +127,17 @@ enum bpf_prog_type {

 	BPF_PROG_TYPE_LWT_IN,

 	BPF_PROG_TYPE_LWT_OUT,

 	BPF_PROG_TYPE_LWT_XMIT,

+	BPF_PROG_TYPE_SOCK_OPS,

+	BPF_PROG_TYPE_SK_SKB,

 };

 enum bpf_attach_type {

 	BPF_CGROUP_INET_INGRESS,

 	BPF_CGROUP_INET_EGRESS,

 	BPF_CGROUP_INET_SOCK_CREATE,

+	BPF_CGROUP_SOCK_OPS,

+	BPF_SK_SKB_STREAM_PARSER,

+	BPF_SK_SKB_STREAM_VERDICT,

 	__MAX_BPF_ATTACH_TYPE

 };

@@ -129,6 +149,13 @@ enum bpf_attach_type {

  */

 #define BPF_F_ALLOW_OVERRIDE	(1U << 0)

+/* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the

+ * verifier will perform strict alignment checking as if the kernel

+ * has been built with CONFIG_EFFICIENT_UNALIGNED_ACCESS not set,

+ * and NET_IP_ALIGN defined to 2.

+ */

+#define BPF_F_STRICT_ALIGNMENT	(1U << 0)

+

 #define BPF_PSEUDO_MAP_FD	1

 /* flags for BPF_MAP_UPDATE_ELEM command */

@@ -136,6 +163,7 @@ enum bpf_attach_type {

 #define BPF_NOEXIST	1 /* create new element if it didn't exist */

 #define BPF_EXIST	2 /* update existing element */

+/* flags for BPF_MAP_CREATE command */

 #define BPF_F_NO_PREALLOC	(1U << 0)

 /* Instead of having one common LRU list in the

  * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list

@@ -144,6 +172,8 @@ enum bpf_attach_type {

  * across different LRU lists.

  */

 #define BPF_F_NO_COMMON_LRU	(1U << 1)

+/* Specify numa node during map creation */

+#define BPF_F_NUMA_NODE		(1U << 2)

 union bpf_attr {

 	struct { /* anonymous struct used by BPF_MAP_CREATE command */

@@ -151,7 +181,13 @@ union bpf_attr {

 		__u32	key_size;	/* size of key in bytes */

 		__u32	value_size;	/* size of value in bytes */

 		__u32	max_entries;	/* max number of entries in a map */

-		__u32	map_flags;	/* prealloc or not */

+		__u32	map_flags;	/* BPF_MAP_CREATE related

+					 * flags defined above.

+					 */

+		__u32	inner_map_fd;	/* fd pointing to the inner map */

+		__u32	numa_node;	/* numa node (effective only if

+					 * BPF_F_NUMA_NODE is set).

+					 */

 	};

 	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */

@@ -173,6 +209,7 @@ union bpf_attr {

 		__u32		log_size;	/* size of user buffer */

 		__aligned_u64	log_buf;	/* user supplied buffer */

 		__u32		kern_version;	/* checked when prog_type=kprobe */

+		__u32		prog_flags;

 	};

 	struct { /* anonymous struct used by BPF_OBJ_* commands */

@@ -186,6 +223,32 @@ union bpf_attr {

 		__u32		attach_type;

 		__u32		attach_flags;

 	};

+

+	struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */

+		__u32		prog_fd;

+		__u32		retval;

+		__u32		data_size_in;

+		__u32		data_size_out;

+		__aligned_u64	data_in;

+		__aligned_u64	data_out;

+		__u32		repeat;

+		__u32		duration;

+	} test;

+

+	struct { /* anonymous struct used by BPF_*_GET_*_ID */

+		union {

+			__u32		start_id;

+			__u32		prog_id;

+			__u32		map_id;

+		};

+		__u32		next_id;

+	};

+

+	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */

+		__u32		bpf_fd;

+		__u32		info_len;

+		__aligned_u64	info;

+	} info;

 } __attribute__((aligned(8)));

 /* BPF helper function descriptions:

@@ -290,26 +353,40 @@ union bpf_attr {

  *     @flags: room for future extensions

  *     Return: 0 on success or negative error

  *

- * u64 bpf_perf_event_read(&map, index)

- *     Return: Number events read or error code

+ * u64 bpf_perf_event_read(map, flags)

+ *     read perf event counter value

+ *     @map: pointer to perf_event_array map

+ *     @flags: index of event in the map or bitmask flags

+ *     Return: value of perf event counter read or error code

  *

  * int bpf_redirect(ifindex, flags)

  *     redirect to another netdev

  *     @ifindex: ifindex of the net device

- *     @flags: bit 0 - if set, redirect to ingress instead of egress

- *             other bits - reserved

- *     Return: TC_ACT_REDIRECT

+ *     @flags:

+ *	  cls_bpf:

+ *          bit 0 - if set, redirect to ingress instead of egress

+ *          other bits - reserved

+ *	  xdp_bpf:

+ *	    all bits - reserved

+ *     Return: cls_bpf: TC_ACT_REDIRECT on success or TC_ACT_SHOT on error

+ *	       xdp_bfp: XDP_REDIRECT on success or XDP_ABORT on error

+ * int bpf_redirect_map(map, key, flags)

+ *     redirect to endpoint in map

+ *     @map: pointer to dev map

+ *     @key: index in map to lookup

+ *     @flags: --

+ *     Return: XDP_REDIRECT on success or XDP_ABORT on error

  *

  * u32 bpf_get_route_realm(skb)

  *     retrieve a dst's tclassid

  *     @skb: pointer to skb

  *     Return: realm if != 0

  *

- * int bpf_perf_event_output(ctx, map, index, data, size)

+ * int bpf_perf_event_output(ctx, map, flags, data, size)

  *     output perf raw sample

  *     @ctx: struct pt_regs*

  *     @map: pointer to perf_event_array map

- *     @index: index of event in the map

+ *     @flags: index of event in the map or bitmask flags

  *     @data: data on stack to be output as raw data

  *     @size: size of data

  *     Return: 0 on success or negative error

@@ -456,6 +533,55 @@ union bpf_attr {

  *     Return:

  *       > 0 length of the string including the trailing NUL on success

  *       < 0 error

+ *

+ * u64 bpf_get_socket_cookie(skb)

+ *     Get the cookie for the socket stored inside sk_buff.

+ *     @skb: pointer to skb

+ *     Return: 8 Bytes non-decreasing number on success or 0 if the socket

+ *     field is missing inside sk_buff

+ *

+ * u32 bpf_get_socket_uid(skb)

+ *     Get the owner uid of the socket stored inside sk_buff.

+ *     @skb: pointer to skb

+ *     Return: uid of the socket owner on success or overflowuid if failed.

+ *

+ * u32 bpf_set_hash(skb, hash)

+ *     Set full skb->hash.

+ *     @skb: pointer to skb

+ *     @hash: hash to set

+ *

+ * int bpf_setsockopt(bpf_socket, level, optname, optval, optlen)

+ *     Calls setsockopt. Not all opts are available, only those with

+ *     integer optvals plus TCP_CONGESTION.

+ *     Supported levels: SOL_SOCKET and IPROTO_TCP

+ *     @bpf_socket: pointer to bpf_socket

+ *     @level: SOL_SOCKET or IPROTO_TCP

+ *     @optname: option name

+ *     @optval: pointer to option value

+ *     @optlen: length of optval in byes

+ *     Return: 0 or negative error

+ *

+ * int bpf_skb_adjust_room(skb, len_diff, mode, flags)

+ *     Grow or shrink room in sk_buff.

+ *     @skb: pointer to skb

+ *     @len_diff: (signed) amount of room to grow/shrink

+ *     @mode: operation mode (enum bpf_adj_room_mode)

+ *     @flags: reserved for future use

+ *     Return: 0 on success or negative error code

+ *

+ * int bpf_sk_redirect_map(map, key, flags)

+ *     Redirect skb to a sock in map using key as a lookup key for the

+ *     sock in map.

+ *     @map: pointer to sockmap

+ *     @key: key to lookup sock in map

+ *     @flags: reserved for future use

+ *     Return: SK_REDIRECT

+ *

+ * int bpf_sock_map_update(skops, map, key, flags)

+ *	@skops: pointer to bpf_sock_ops

+ *	@map: pointer to sockmap to update

+ *	@key: key to insert/update sock in map

+ *	@flags: same flags as map update elem

  */

 #define __BPF_FUNC_MAPPER(FN)		\

 	FN(unspec),			\

@@ -503,7 +629,15 @@ union bpf_attr {

 	FN(get_numa_node_id),		\

 	FN(skb_change_head),		\

 	FN(xdp_adjust_head),		\

-	FN(probe_read_str),

+	FN(probe_read_str),		\

+	FN(get_socket_cookie),		\

+	FN(get_socket_uid),		\

+	FN(set_hash),			\

+	FN(setsockopt),			\

+	FN(skb_adjust_room),		\

+	FN(redirect_map),		\

+	FN(sk_redirect_map),		\

+	FN(sock_map_update),		\

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

  * function eBPF program intends to call

@@ -553,6 +687,11 @@ enum bpf_func_id {

 /* BPF_FUNC_perf_event_output for sk_buff input context. */

 #define BPF_F_CTXLEN_MASK		(0xfffffULL << 32)

+/* Mode for BPF_FUNC_skb_adjust_room helper. */

+enum bpf_adj_room_mode {

+	BPF_ADJ_ROOM_NET,

+};

+

 /* user accessible mirror of in-kernel sk_buff.

  * new fields can only be added to the end of this structure

  */

@@ -574,6 +713,16 @@ struct __sk_buff {

 	__u32 tc_classid;

 	__u32 data;

 	__u32 data_end;

+	__u32 napi_id;

+

+	/* accessed by BPF_PROG_TYPE_sk_skb types */

+	__u32 family;

+	__u32 remote_ip4;	/* Stored in network byte order */

+	__u32 local_ip4;	/* Stored in network byte order */

+	__u32 remote_ip6[4];	/* Stored in network byte order */

+	__u32 local_ip6[4];	/* Stored in network byte order */

+	__u32 remote_port;	/* Stored in network byte order */

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

 };

 struct bpf_tunnel_key {

@@ -609,20 +758,23 @@ struct bpf_sock {

 	__u32 family;

 	__u32 type;

 	__u32 protocol;

+	__u32 mark;

+	__u32 priority;

 };

 #define XDP_PACKET_HEADROOM 256

 /* User return codes for XDP prog type.

  * A valid XDP program must return one of these defined values. All other

- * return codes are reserved for future use. Unknown return codes will result

- * in packet drop.

+ * return codes are reserved for future use. Unknown return codes will

+ * result in packet drops and a warning via bpf_warn_invalid_xdp_action().

  */

 enum xdp_action {

 	XDP_ABORTED = 0,

 	XDP_DROP,

 	XDP_PASS,

 	XDP_TX,

+	XDP_REDIRECT,

 };

 /* user accessible metadata for XDP packet hook

@@ -633,4 +785,83 @@ struct xdp_md {

 	__u32 data_end;

 };

+enum sk_action {

+	SK_ABORTED = 0,

+	SK_DROP,

+	SK_REDIRECT,

+};

+

+#define BPF_TAG_SIZE	8

+

+struct bpf_prog_info {

+	__u32 type;

+	__u32 id;

+	__u8  tag[BPF_TAG_SIZE];

+	__u32 jited_prog_len;

+	__u32 xlated_prog_len;

+	__aligned_u64 jited_prog_insns;

+	__aligned_u64 xlated_prog_insns;

+} __attribute__((aligned(8)));

+

+struct bpf_map_info {

+	__u32 type;

+	__u32 id;

+	__u32 key_size;

+	__u32 value_size;

+	__u32 max_entries;

+	__u32 map_flags;

+} __attribute__((aligned(8)));

+

+/* User bpf_sock_ops struct to access socket values and specify request ops

+ * and their replies.

+ * Some of this fields are in network (bigendian) byte order and may need

+ * to be converted before use (bpf_ntohl() defined in samples/bpf/bpf_endian.h).

+ * New fields can only be added at the end of this structure

+ */

+struct bpf_sock_ops {

+	__u32 op;

+	union {

+		__u32 reply;

+		__u32 replylong[4];

+	};

+	__u32 family;

+	__u32 remote_ip4;	/* Stored in network byte order */

+	__u32 local_ip4;	/* Stored in network byte order */

+	__u32 remote_ip6[4];	/* Stored in network byte order */

+	__u32 local_ip6[4];	/* Stored in network byte order */

+	__u32 remote_port;	/* Stored in network byte order */

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

+};

+

+/* List of known BPF sock_ops operators.

+ * New entries can only be added at the end

+ */

+enum {

+	BPF_SOCK_OPS_VOID,

+	BPF_SOCK_OPS_TIMEOUT_INIT,	/* Should return SYN-RTO value to use or

+					 * -1 if default value should be used

+					 */

+	BPF_SOCK_OPS_RWND_INIT,		/* Should return initial advertized

+					 * window (in packets) or -1 if default

+					 * value should be used

+					 */

+	BPF_SOCK_OPS_TCP_CONNECT_CB,	/* Calls BPF program right before an

+					 * active connection is initialized

+					 */

+	BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB,	/* Calls BPF program when an

+						 * active connection is

+						 * established

+						 */

+	BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB,	/* Calls BPF program when a

+						 * passive connection is

+						 * established

+						 */

+	BPF_SOCK_OPS_NEEDS_ECN,		/* If connection's congestion control

+					 * needs ECN

+					 */

+};

+

+#define TCP_BPF_IW		1001	/* Set TCP initial congestion window */

+#define TCP_BPF_SNDCWND_CLAMP	1002	/* Set sndcwnd_clamp */

+

 #endif /* __LINUX_BPF_H__ */

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

new file mode 100644

index 0000000000000..5b29e8a7bc274

--- /dev/null

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

@@ -0,0 +1,12 @@

+#ifndef _CAN_VXCAN_H

+#define _CAN_VXCAN_H

+

+enum {

+	VXCAN_INFO_UNSPEC,

+	VXCAN_INFO_PEER,

+

+	__VXCAN_INFO_MAX

+#define VXCAN_INFO_MAX	(__VXCAN_INFO_MAX - 1)

+};

+

+#endif

diff --git a/include/linux/devlink.h b/include/linux/devlink.h

index 2ad3585b417ae..a62695e2d86e8 100644

--- a/include/linux/devlink.h

+++ b/include/linux/devlink.h

@@ -65,8 +65,12 @@ enum devlink_command {

 #define DEVLINK_CMD_ESWITCH_MODE_SET /* obsolete, never use this! */ \

 	DEVLINK_CMD_ESWITCH_SET

-	/* add new commands above here */

+	DEVLINK_CMD_DPIPE_TABLE_GET,

+	DEVLINK_CMD_DPIPE_ENTRIES_GET,

+	DEVLINK_CMD_DPIPE_HEADERS_GET,

+	DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,

+	/* add new commands above here */

 	__DEVLINK_CMD_MAX,

 	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1

 };

@@ -115,6 +119,11 @@ enum devlink_eswitch_inline_mode {

 	DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,

 };

+enum devlink_eswitch_encap_mode {

+	DEVLINK_ESWITCH_ENCAP_MODE_NONE,

+	DEVLINK_ESWITCH_ENCAP_MODE_BASIC,

+};

+

 enum devlink_attr {

 	/* don't change the order or add anything between, this is ABI! */

 	DEVLINK_ATTR_UNSPEC,

@@ -148,10 +157,91 @@ enum devlink_attr {

 	DEVLINK_ATTR_ESWITCH_MODE,		/* u16 */

 	DEVLINK_ATTR_ESWITCH_INLINE_MODE,	/* u8 */

+	DEVLINK_ATTR_DPIPE_TABLES,		/* nested */

+	DEVLINK_ATTR_DPIPE_TABLE,		/* nested */

+	DEVLINK_ATTR_DPIPE_TABLE_NAME,		/* string */

+	DEVLINK_ATTR_DPIPE_TABLE_SIZE,		/* u64 */

+	DEVLINK_ATTR_DPIPE_TABLE_MATCHES,	/* nested */

+	DEVLINK_ATTR_DPIPE_TABLE_ACTIONS,	/* nested */

+	DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,	/* u8 */

+

+	DEVLINK_ATTR_DPIPE_ENTRIES,		/* nested */

+	DEVLINK_ATTR_DPIPE_ENTRY,		/* nested */

+	DEVLINK_ATTR_DPIPE_ENTRY_INDEX,		/* u64 */

+	DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES,	/* nested */

+	DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES,	/* nested */

+	DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,	/* u64 */

+

+	DEVLINK_ATTR_DPIPE_MATCH,		/* nested */

+	DEVLINK_ATTR_DPIPE_MATCH_VALUE,		/* nested */

+	DEVLINK_ATTR_DPIPE_MATCH_TYPE,		/* u32 */

+

+	DEVLINK_ATTR_DPIPE_ACTION,		/* nested */

+	DEVLINK_ATTR_DPIPE_ACTION_VALUE,	/* nested */

+	DEVLINK_ATTR_DPIPE_ACTION_TYPE,		/* u32 */

+

+	DEVLINK_ATTR_DPIPE_VALUE,

+	DEVLINK_ATTR_DPIPE_VALUE_MASK,

+	DEVLINK_ATTR_DPIPE_VALUE_MAPPING,	/* u32 */

+

+	DEVLINK_ATTR_DPIPE_HEADERS,		/* nested */

+	DEVLINK_ATTR_DPIPE_HEADER,		/* nested */

+	DEVLINK_ATTR_DPIPE_HEADER_NAME,		/* string */

+	DEVLINK_ATTR_DPIPE_HEADER_ID,		/* u32 */

+	DEVLINK_ATTR_DPIPE_HEADER_FIELDS,	/* nested */

+	DEVLINK_ATTR_DPIPE_HEADER_GLOBAL,	/* u8 */

+	DEVLINK_ATTR_DPIPE_HEADER_INDEX,	/* u32 */

+

+	DEVLINK_ATTR_DPIPE_FIELD,		/* nested */

+	DEVLINK_ATTR_DPIPE_FIELD_NAME,		/* string */

+	DEVLINK_ATTR_DPIPE_FIELD_ID,		/* u32 */

+	DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH,	/* u32 */

+	DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE,	/* u32 */

+

+	DEVLINK_ATTR_PAD,

+

+	DEVLINK_ATTR_ESWITCH_ENCAP_MODE,	/* u8 */

+

 	/* add new attributes above here, update the policy in devlink.c */

 	__DEVLINK_ATTR_MAX,

 	DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1

 };

+/* Mapping between internal resource described by the field and system

+ * structure

+ */

+enum devlink_dpipe_field_mapping_type {

+	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE,

+	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX,

+};

+

+/* Match type - specify the type of the match */

+enum devlink_dpipe_match_type {

+	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT,

+};

+

+/* Action type - specify the action type */

+enum devlink_dpipe_action_type {

+	DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY,

+};

+

+enum devlink_dpipe_field_ethernet_id {

+	DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC,

+};

+

+enum devlink_dpipe_field_ipv4_id {

+	DEVLINK_DPIPE_FIELD_IPV4_DST_IP,

+};

+

+enum devlink_dpipe_field_ipv6_id {

+	DEVLINK_DPIPE_FIELD_IPV6_DST_IP,

+};

+

+enum devlink_dpipe_header_id {

+	DEVLINK_DPIPE_HEADER_ETHERNET,

+	DEVLINK_DPIPE_HEADER_IPV4,

+	DEVLINK_DPIPE_HEADER_IPV6,

+};

+

 #endif /* _LINUX_DEVLINK_H_ */

diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h

index cb5d1a5192027..9cd1de954c0ac 100644

--- a/include/linux/elf-em.h

+++ b/include/linux/elf-em.h

@@ -42,7 +42,6 @@

 #define EM_TILEGX	191	/* Tilera TILE-Gx */

 #define EM_BPF		247	/* Linux BPF - in-kernel virtual machine */

 #define EM_FRV		0x5441	/* Fujitsu FR-V */

-#define EM_AVR32	0x18ad	/* Atmel AVR32 */

 /*

  * This is an interim value that we will use until the committee comes

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

index d001bdb276b76..199f253bd1f66 100644

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

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

@@ -59,6 +59,7 @@

 #define ARPHRD_LAPB	516		/* LAPB				*/

 #define ARPHRD_DDCMP    517		/* Digital's DDCMP protocol     */

 #define ARPHRD_RAWHDLC	518		/* Raw HDLC			*/

+#define ARPHRD_RAWIP    519		/* Raw IP                       */

 #define ARPHRD_TUNNEL	768		/* IPIP tunnel			*/

 #define ARPHRD_TUNNEL6	769		/* IP6IP6 tunnel       		*/

@@ -95,6 +96,7 @@

 #define ARPHRD_IP6GRE	823		/* GRE over IPv6		*/

 #define ARPHRD_NETLINK	824		/* Netlink header		*/

 #define ARPHRD_6LOWPAN	825		/* IPv6 over LoWPAN             */

+#define ARPHRD_VSOCKMON	826		/* Vsock monitor header		*/

 #define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */

 #define ARPHRD_NONE	  0xFFFE	/* zero header length */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h

index b7d3beb50ce2d..7dde037a0cca6 100644

--- a/include/linux/if_ether.h

+++ b/include/linux/if_ether.h

@@ -66,6 +66,7 @@

 #define ETH_P_ATALK	0x809B		/* Appletalk DDP		*/

 #define ETH_P_AARP	0x80F3		/* Appletalk AARP		*/

 #define ETH_P_8021Q	0x8100          /* 802.1Q VLAN Extended Header  */

+#define ETH_P_ERSPAN	0x88BE		/* ERSPAN type II		*/

 #define ETH_P_IPX	0x8137		/* IPX over DIX			*/

 #define ETH_P_IPV6	0x86DD		/* IPv6 over bluebook		*/

 #define ETH_P_PAUSE	0x8808		/* IEEE Pause frames. See 802.3 31B */

@@ -98,11 +99,13 @@

 #define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */

 #define ETH_P_80221	0x8917		/* IEEE 802.21 Media Independent Handover Protocol */

 #define ETH_P_HSR	0x892F		/* IEC 62439-3 HSRv1	*/

+#define ETH_P_NSH	0x894F		/* Network Service Header */

 #define ETH_P_LOOPBACK	0x9000		/* Ethernet loopback packet, per IEEE 802.3 */

 #define ETH_P_QINQ1	0x9100		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

 #define ETH_P_QINQ2	0x9200		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

 #define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

 #define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */

+#define ETH_P_IFE	0xED3E		/* ForCES inter-FE LFB type */

 #define ETH_P_AF_IUCV   0xFBFB		/* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */

 #define ETH_P_802_3_MIN	0x0600		/* If the value in the ethernet type is less than this value

@@ -137,6 +140,9 @@

 #define ETH_P_IEEE802154 0x00F6		/* IEEE802.15.4 frame		*/

 #define ETH_P_CAIF	0x00F7		/* ST-Ericsson CAIF protocol	*/

 #define ETH_P_XDSA	0x00F8		/* Multiplexed DSA protocol	*/

+#define ETH_P_MAP	0x00F9		/* Qualcomm multiplexing and

+					 * aggregation protocol

+					 */

 /*

  *	This is an Ethernet frame header.

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

index b0bdbd6e16c04..1f97d0560b6cb 100644

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

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

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

 	IFLA_GSO_MAX_SIZE,

 	IFLA_PAD,

 	IFLA_XDP,

+	IFLA_EVENT,

 	__IFLA_MAX

 };

@@ -321,6 +322,7 @@ enum {

 	IFLA_BRPORT_MCAST_FLOOD,

 	IFLA_BRPORT_MCAST_TO_UCAST,

 	IFLA_BRPORT_VLAN_TUNNEL,

+	IFLA_BRPORT_BCAST_FLOOD,

 	__IFLA_BRPORT_MAX

 };

 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

@@ -536,11 +538,18 @@ enum {

 #define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)

 /* GTP section */

+

+enum ifla_gtp_role {

+	GTP_ROLE_GGSN = 0,

+	GTP_ROLE_SGSN,

+};

+

 enum {

 	IFLA_GTP_UNSPEC,

 	IFLA_GTP_FD0,

 	IFLA_GTP_FD1,

 	IFLA_GTP_PDP_HASHSIZE,

+	IFLA_GTP_ROLE,

 	__IFLA_GTP_MAX,

 };

 #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)

@@ -878,16 +887,42 @@ enum {

 /* XDP section */

 #define XDP_FLAGS_UPDATE_IF_NOEXIST	(1U << 0)

-#define XDP_FLAGS_MASK			(XDP_FLAGS_UPDATE_IF_NOEXIST)

+#define XDP_FLAGS_SKB_MODE		(1U << 1)

+#define XDP_FLAGS_DRV_MODE		(1U << 2)

+#define XDP_FLAGS_HW_MODE		(1U << 3)

+#define XDP_FLAGS_MODES			(XDP_FLAGS_SKB_MODE | \

+					 XDP_FLAGS_DRV_MODE | \

+					 XDP_FLAGS_HW_MODE)

+#define XDP_FLAGS_MASK			(XDP_FLAGS_UPDATE_IF_NOEXIST | \

+					 XDP_FLAGS_MODES)