From 356758b3303ab24b6fe8dccf94ed98ed7cbad224 Mon Sep 17 00:00:00 2001

From: Andrea Claudi <aclaudi@redhat.com>

Date: Thu, 13 Jun 2019 14:37:57 +0200

Subject: [PATCH] Update kernel headers

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

Upstream Status: iproute2.git commit 17689d3075c8b

commit 17689d3075c8b9a29b8f398a57defb9dcabafe81

Author: David Ahern <dsahern@gmail.com>

Date:   Wed Dec 19 12:47:29 2018 -0800

    Update kernel headers

    Update kernel headers to commit

       055722716c39 ("tipc: fix uninitialized value for broadcast retransmission")

    Signed-off-by: David Ahern <dsahern@gmail.com>

---

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

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

 include/uapi/linux/if_bridge.h     |  21 ++++

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

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

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

 include/uapi/linux/net_namespace.h |   2 +

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

 8 files changed, 171 insertions(+), 49 deletions(-)

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

index ff651ca661308..960a7f0a4d99b 100644

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

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

@@ -232,6 +232,20 @@ enum bpf_attach_type {

  */

 #define BPF_F_STRICT_ALIGNMENT	(1U << 0)

+/* If BPF_F_ANY_ALIGNMENT is used in BPF_PROF_LOAD command, the

+ * verifier will allow any alignment whatsoever.  On platforms

+ * with strict alignment requirements for loads ands stores (such

+ * as sparc and mips) the verifier validates that all loads and

+ * stores provably follow this requirement.  This flag turns that

+ * checking and enforcement off.

+ *

+ * It is mostly used for testing when we want to validate the

+ * context and memory access aspects of the verifier, but because

+ * of an unaligned access the alignment check would trigger before

+ * the one we are interested in.

+ */

+#define BPF_F_ANY_ALIGNMENT	(1U << 1)

+

 /* when bpf_ldimm64->src_reg == BPF_PSEUDO_MAP_FD, bpf_ldimm64->imm == fd */

 #define BPF_PSEUDO_MAP_FD	1

@@ -257,9 +271,6 @@ enum bpf_attach_type {

 /* Specify numa node during map creation */

 #define BPF_F_NUMA_NODE		(1U << 2)

-/* flags for BPF_PROG_QUERY */

-#define BPF_F_QUERY_EFFECTIVE	(1U << 0)

-

 #define BPF_OBJ_NAME_LEN 16U

 /* Flags for accessing BPF object */

@@ -269,6 +280,12 @@ enum bpf_attach_type {

 /* Flag for stack_map, store build_id+offset instead of pointer */

 #define BPF_F_STACK_BUILD_ID	(1U << 5)

+/* Zero-initialize hash function seed. This should only be used for testing. */

+#define BPF_F_ZERO_SEED		(1U << 6)

+

+/* flags for BPF_PROG_QUERY */

+#define BPF_F_QUERY_EFFECTIVE	(1U << 0)

+

 enum bpf_stack_build_id_status {

 	/* user space need an empty entry to identify end of a trace */

 	BPF_STACK_BUILD_ID_EMPTY = 0,

@@ -335,6 +352,13 @@ union bpf_attr {

 		 * (context accesses, allowed helpers, etc).

 		 */

 		__u32		expected_attach_type;

+		__u32		prog_btf_fd;	/* fd pointing to BTF type data */

+		__u32		func_info_rec_size;	/* userspace bpf_func_info size */

+		__aligned_u64	func_info;	/* func info */

+		__u32		func_info_cnt;	/* number of bpf_func_info records */

+		__u32		line_info_rec_size;	/* userspace bpf_line_info size */

+		__aligned_u64	line_info;	/* line info */

+		__u32		line_info_cnt;	/* number of bpf_line_info records */

 	};

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

@@ -353,8 +377,11 @@ union bpf_attr {

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

 		__u32		prog_fd;

 		__u32		retval;

-		__u32		data_size_in;

-		__u32		data_size_out;

+		__u32		data_size_in;	/* input: len of data_in */

+		__u32		data_size_out;	/* input/output: len of data_out

+						 *   returns ENOSPC if data_out

+						 *   is too small.

+						 */

 		__aligned_u64	data_in;

 		__aligned_u64	data_out;

 		__u32		repeat;

@@ -475,18 +502,6 @@ union bpf_attr {

  * 	Return

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

  *

- * int bpf_map_pop_elem(struct bpf_map *map, void *value)

- * 	Description

- * 		Pop an element from *map*.

- * Return

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

- *

- * int bpf_map_peek_elem(struct bpf_map *map, void *value)

- * 	Description

- * 		Get an element from *map* without removing it.

- * Return

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

- *

  * int bpf_probe_read(void *dst, u32 size, const void *src)

  * 	Description

  * 		For tracing programs, safely attempt to read *size* bytes from

@@ -1910,9 +1925,9 @@ union bpf_attr {

  *		is set to metric from route (IPv4/IPv6 only), and ifindex

  *		is set to the device index of the nexthop from the FIB lookup.

  *

- *             *plen* argument is the size of the passed in struct.

- *             *flags* argument can be a combination of one or more of the

- *             following values:

+ *		*plen* argument is the size of the passed in struct.

+ *		*flags* argument can be a combination of one or more of the

+ *		following values:

  *

  *		**BPF_FIB_LOOKUP_DIRECT**

  *			Do a direct table lookup vs full lookup using FIB

@@ -1921,9 +1936,9 @@ union bpf_attr {

  *			Perform lookup from an egress perspective (default is

  *			ingress).

  *

- *             *ctx* is either **struct xdp_md** for XDP programs or

- *             **struct sk_buff** tc cls_act programs.

- *     Return

+ *		*ctx* is either **struct xdp_md** for XDP programs or

+ *		**struct sk_buff** tc cls_act programs.

+ *	Return

  *		* < 0 if any input argument is invalid

  *		*   0 on success (packet is forwarded, nexthop neighbor exists)

  *		* > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the

@@ -2068,8 +2083,8 @@ union bpf_attr {

  *		translated to a keycode using the rc keymap, and reported as

  *		an input key down event. After a period a key up event is

  *		generated. This period can be extended by calling either

- *		**bpf_rc_keydown** () again with the same values, or calling

- *		**bpf_rc_repeat** ().

+ *		**bpf_rc_keydown**\ () again with the same values, or calling

+ *		**bpf_rc_repeat**\ ().

  *

  *		Some protocols include a toggle bit, in case the button	was

  *		released and pressed again between consecutive scancodes.

@@ -2152,21 +2167,22 @@ union bpf_attr {

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

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

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

  *		the shared data.

  *	Return

- *		Pointer to the local storage area.

+ *		A 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.

+ *		Select a **SO_REUSEPORT** socket from a

+ *		**BPF_MAP_TYPE_REUSEPORT_ARRAY** *map*.

+ *		It checks the selected socket is matching the incoming

+ *		request in the socket buffer.

  *	Return

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

  *

@@ -2174,7 +2190,7 @@ union bpf_attr {

  *	Description

  *		Look for TCP socket matching *tuple*, optionally in a child

  *		network namespace *netns*. The return value must be checked,

- *		and if non-NULL, released via **bpf_sk_release**\ ().

+ *		and if non-**NULL**, released via **bpf_sk_release**\ ().

  *

  *		The *ctx* should point to the context of the program, such as

  *		the skb or socket (depending on the hook in use). This is used

@@ -2202,15 +2218,15 @@ union bpf_attr {

  *		This helper is available only if the kernel was compiled with

  *		**CONFIG_NET** configuration option.

  *	Return

- *		Pointer to *struct bpf_sock*, or NULL in case of failure.

- *		For sockets with reuseport option, the *struct bpf_sock*

- *		result is from reuse->socks[] using the hash of the tuple.

+ *		Pointer to **struct bpf_sock**, or **NULL** in case of failure.

+ *		For sockets with reuseport option, the **struct bpf_sock**

+ *		result is from **reuse->socks**\ [] using the hash of the tuple.

  *

  * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)

  *	Description

  *		Look for UDP socket matching *tuple*, optionally in a child

  *		network namespace *netns*. The return value must be checked,

- *		and if non-NULL, released via **bpf_sk_release**\ ().

+ *		and if non-**NULL**, released via **bpf_sk_release**\ ().

  *

  *		The *ctx* should point to the context of the program, such as

  *		the skb or socket (depending on the hook in use). This is used

@@ -2238,33 +2254,71 @@ union bpf_attr {

  *		This helper is available only if the kernel was compiled with

  *		**CONFIG_NET** configuration option.

  *	Return

- *		Pointer to *struct bpf_sock*, or NULL in case of failure.

- *		For sockets with reuseport option, the *struct bpf_sock*

- *		result is from reuse->socks[] using the hash of the tuple.

+ *		Pointer to **struct bpf_sock**, or **NULL** in case of failure.

+ *		For sockets with reuseport option, the **struct bpf_sock**

+ *		result is from **reuse->socks**\ [] using the hash of the tuple.

  *

- * int bpf_sk_release(struct bpf_sock *sk)

+ * int bpf_sk_release(struct bpf_sock *sock)

  *	Description

- *		Release the reference held by *sock*. *sock* must be a non-NULL

- *		pointer that was returned from bpf_sk_lookup_xxx\ ().

+ *		Release the reference held by *sock*. *sock* must be a

+ *		non-**NULL** pointer that was returned from

+ *		**bpf_sk_lookup_xxx**\ ().

  *	Return

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

  *

+ * int bpf_map_pop_elem(struct bpf_map *map, void *value)

+ * 	Description

+ * 		Pop an element from *map*.

+ * 	Return

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

+ *

+ * int bpf_map_peek_elem(struct bpf_map *map, void *value)

+ * 	Description

+ * 		Get an element from *map* without removing it.

+ * 	Return

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

+ *

  * int bpf_msg_push_data(struct sk_buff *skb, u32 start, u32 len, u64 flags)

  *	Description

- *		For socket policies, insert *len* bytes into msg at offset

+ *		For socket policies, insert *len* bytes into *msg* at offset

  *		*start*.

  *

  *		If a program of type **BPF_PROG_TYPE_SK_MSG** is run on a

- *		*msg* it may want to insert metadata or options into the msg.

+ *		*msg* it may want to insert metadata or options into the *msg*.

  *		This can later be read and used by any of the lower layer BPF

  *		hooks.

  *

  *		This helper may fail if under memory pressure (a malloc

  *		fails) in these cases BPF programs will get an appropriate

  *		error and BPF programs will need to handle them.

+ *	Return

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

  *

+ * int bpf_msg_pop_data(struct sk_msg_buff *msg, u32 start, u32 pop, u64 flags)

+ *	Description

+ *		Will remove *pop* bytes from a *msg* starting at byte *start*.

+ *		This may result in **ENOMEM** errors under certain situations if

+ *		an allocation and copy are required due to a full ring buffer.

+ *		However, the helper will try to avoid doing the allocation

+ *		if possible. Other errors can occur if input parameters are

+ *		invalid either due to *start* byte not being valid part of *msg*

+ *		payload and/or *pop* value being to large.

  *	Return

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

+ *

+ * int bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)

+ *	Description

+ *		This helper is used in programs implementing IR decoding, to

+ *		report a successfully decoded pointer movement.

+ *

+ *		The *ctx* should point to the lirc sample as passed into

+ *		the program.

+ *

+ *		This helper is only available is the kernel was compiled with

+ *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to

+ *		"**y**".

+ *	Return

+ *		0

  */

 #define __BPF_FUNC_MAPPER(FN)		\

 	FN(unspec),			\

@@ -2357,7 +2411,9 @@ union bpf_attr {

 	FN(map_push_elem),		\

 	FN(map_pop_elem),		\

 	FN(map_peek_elem),		\

-	FN(msg_push_data),

+	FN(msg_push_data),		\

+	FN(msg_pop_data),		\

+	FN(rc_pointer_rel),

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

  * function eBPF program intends to call

@@ -2474,6 +2530,8 @@ struct __sk_buff {

 	__u32 data_meta;

 	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);

+	__u64 tstamp;

+	__u32 wire_len;

 };

 struct bpf_tunnel_key {

@@ -2649,6 +2707,16 @@ struct bpf_prog_info {

 	__u32 nr_jited_func_lens;

 	__aligned_u64 jited_ksyms;

 	__aligned_u64 jited_func_lens;

+	__u32 btf_id;

+	__u32 func_info_rec_size;

+	__aligned_u64 func_info;

+	__u32 nr_func_info;

+	__u32 nr_line_info;

+	__aligned_u64 line_info;

+	__aligned_u64 jited_line_info;

+	__u32 nr_jited_line_info;

+	__u32 line_info_rec_size;

+	__u32 jited_line_info_rec_size;

 } __attribute__((aligned(8)));

 struct bpf_map_info {

@@ -2960,4 +3028,19 @@ struct bpf_flow_keys {

 	};

 };

+struct bpf_func_info {

+	__u32	insn_off;

+	__u32	type_id;

+};

+

+#define BPF_LINE_INFO_LINE_NUM(line_col)	((line_col) >> 10)

+#define BPF_LINE_INFO_LINE_COL(line_col)	((line_col) & 0x3ff)

+

+struct bpf_line_info {

+	__u32	insn_off;

+	__u32	file_name_off;

+	__u32	line_off;

+	__u32	line_col;

+};

+

 #endif /* __LINUX_BPF_H__ */

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

index 8d2a8ffad56f9..f43d5a8e13d31 100644

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

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

@@ -40,7 +40,8 @@ struct btf_type {

 	/* "size" is used by INT, ENUM, STRUCT and UNION.

 	 * "size" tells the size of the type it is describing.

 	 *

-	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST and RESTRICT.

+	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,

+	 * FUNC and FUNC_PROTO.

 	 * "type" is a type_id referring to another type.

 	 */

 	union {

@@ -64,8 +65,10 @@ struct btf_type {

 #define BTF_KIND_VOLATILE	9	/* Volatile	*/

 #define BTF_KIND_CONST		10	/* Const	*/

 #define BTF_KIND_RESTRICT	11	/* Restrict	*/

-#define BTF_KIND_MAX		11

-#define NR_BTF_KINDS		12

+#define BTF_KIND_FUNC		12	/* Function	*/

+#define BTF_KIND_FUNC_PROTO	13	/* Function Proto	*/

+#define BTF_KIND_MAX		13

+#define NR_BTF_KINDS		14

 /* For some specific BTF_KIND, "struct btf_type" is immediately

  * followed by extra data.

@@ -110,4 +113,13 @@ struct btf_member {

 	__u32	offset;	/* offset in bits */

 };

+/* BTF_KIND_FUNC_PROTO is followed by multiple "struct btf_param".

+ * The exact number of btf_param is stored in the vlen (of the

+ * info in "struct btf_type").

+ */

+struct btf_param {

+	__u32	name_off;

+	__u32	type;

+};

+

 #endif /* __LINUX_BTF_H__ */

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

index bdfecf9411320..04f763cf53029 100644

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

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

@@ -292,4 +292,25 @@ struct br_mcast_stats {

 	__u64 mcast_bytes[BR_MCAST_DIR_SIZE];

 	__u64 mcast_packets[BR_MCAST_DIR_SIZE];

 };

+

+/* bridge boolean options

+ * BR_BOOLOPT_NO_LL_LEARN - disable learning from link-local packets

+ *

+ * IMPORTANT: if adding a new option do not forget to handle

+ *            it in br_boolopt_toggle/get and bridge sysfs

+ */

+enum br_boolopt_id {

+	BR_BOOLOPT_NO_LL_LEARN,

+	BR_BOOLOPT_MAX

+};

+

+/* struct br_boolopt_multi - change multiple bridge boolean options

+ *

+ * @optval: new option values (bit per option)

+ * @optmask: options to change (bit per option)

+ */

+struct br_boolopt_multi {

+	__u32 optval;

+	__u32 optmask;

+};

 #endif /* _LINUX_IF_BRIDGE_H */

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

index 52e95197e0790..8e6087aee2c29 100644

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

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

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

 	IFLA_BR_MCAST_IGMP_VERSION,

 	IFLA_BR_MCAST_MLD_VERSION,

 	IFLA_BR_VLAN_STATS_PER_PORT,

+	IFLA_BR_MULTI_BOOLOPT,

 	__IFLA_BR_MAX,

 };

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

index be9b744a16458..2f01165514a77 100644

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

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

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

 #define TUNGETVNETBE _IOR('T', 223, int)

 #define TUNSETSTEERINGEBPF _IOR('T', 224, int)

 #define TUNSETFILTEREBPF _IOR('T', 225, int)

+#define TUNSETCARRIER _IOW('T', 226, int)

 /* TUNSETIFF ifr flags */

 #define IFF_TUN		0x0001

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

index 998155444e0db..cd144e3099a3c 100644

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

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

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

 	NDA_MASTER,

 	NDA_LINK_NETNSID,

 	NDA_SRC_VNI,

+	NDA_PROTOCOL,  /* Originator of entry */

 	__NDA_MAX

 };

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

index 6d64d0716800f..fa81f1e5ffa8f 100644

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

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

@@ -16,6 +16,8 @@ enum {

 	NETNSA_NSID,

 	NETNSA_PID,

 	NETNSA_FD,

+	NETNSA_TARGET_NSID,

+	NETNSA_CURRENT_NSID,

 	__NETNSA_MAX,

 };

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

index f80135e5feaa8..86dc24a96c90a 100644

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

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

@@ -243,6 +243,7 @@ enum

 	LINUX_MIB_TCPREQQFULLDROP,		/* TCPReqQFullDrop */

 	LINUX_MIB_TCPRETRANSFAIL,		/* TCPRetransFail */

 	LINUX_MIB_TCPRCVCOALESCE,		/* TCPRcvCoalesce */

+	LINUX_MIB_TCPBACKLOGCOALESCE,		/* TCPBacklogCoalesce */

 	LINUX_MIB_TCPOFOQUEUE,			/* TCPOFOQueue */

 	LINUX_MIB_TCPOFODROP,			/* TCPOFODrop */

 	LINUX_MIB_TCPOFOMERGE,			/* TCPOFOMerge */

-- 

2.20.1