Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several conflicts, seemingly all over the place. I used Stephen Rothwell's sample resolutions for many of these, if not just to double check my own work, so definitely the credit largely goes to him. The NFP conflict consisted of a bug fix (moving operations past the rhashtable operation) while chaning the initial argument in the function call in the moved code. The net/dsa/master.c conflict had to do with a bug fix intermixing of making dsa_master_set_mtu() static with the fixing of the tagging attribute location. cls_flower had a conflict because the dup reject fix from Or overlapped with the addition of port range classifiction. __set_phy_supported()'s conflict was relatively easy to resolve because Andrew fixed it in both trees, so it was just a matter of taking the net-next copy. Or at least I think it was :-) Joe Stringer's fix to the handling of netns id 0 in bpf_sk_lookup() intermixed with changes on how the sdif and caller_net are calculated in these code paths in net-next. The remaining BPF conflicts were largely about the addition of the __bpf_md_ptr stuff in 'net' overlapping with adjustments and additions to the relevant data structure where the MD pointer macros are used.

David S. Miller committed 7 years ago

Commit 4cc1fee2 parents a60956e 40e020c576 files · +6121 −3146Browse files

Showing the changes to include/uapi/linux (2 of 576 files). Show all

Unified · Split

2 files

include/uapi/linux/bpf.h +37 −23
include/uapi/linux/prctl.h +1 −0

include/uapi/linux/bpf.h+37−23

  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags)
+ * struct bpf_sock *bpf_sk_lookup_tcp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
  *	Description
  *		Look for TCP socket matching *tuple*, optionally in a child
  *		network namespace *netns*. The return value must be checked,
  *		**sizeof**\ (*tuple*\ **->ipv6**)
  *			Look for an IPv6 socket.
  *
- *		If the *netns* is zero, then the socket lookup table in the
+ *		If the *netns* is a negative signed 32-bit integer, then the
- *		netns associated with the *ctx* will be used. For the TC hooks,
+ *		socket lookup table in the netns associated with the *ctx* will
- *		this in the netns of the device in the skb. For socket hooks,
+ *		will be used. For the TC hooks, this is the netns of the device
- *		this in the netns of the socket. If *netns* is non-zero, then
+ *		in the skb. For socket hooks, this is the netns of the socket.
- *		it specifies the ID of the netns relative to the netns
+ *		If *netns* is any other signed 32-bit value greater than or
- *		associated with the *ctx*.
+ *		equal to zero then it specifies the ID of the netns relative to
+ *		the netns associated with the *ctx*. *netns* values beyond the
+ *		range of 32-bit integers are reserved for future use.
  *
  *		All values for *flags* are reserved for future usage, and must
  *		be left at zero.
  *		**CONFIG_NET** configuration option.
  *	Return
  *		Pointer to *struct bpf_sock*, or NULL in case of failure.
- *		For sockets with reuseport option, *struct bpf_sock*
+ *		For sockets with reuseport option, the *struct bpf_sock*
- *		return is from reuse->socks[] using hash of the packet.
+ *		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, u32 netns, u64 flags)
+ * 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,
  *		**sizeof**\ (*tuple*\ **->ipv6**)
  *			Look for an IPv6 socket.
  *
- *		If the *netns* is zero, then the socket lookup table in the
+ *		If the *netns* is a negative signed 32-bit integer, then the
- *		netns associated with the *ctx* will be used. For the TC hooks,
+ *		socket lookup table in the netns associated with the *ctx* will
- *		this in the netns of the device in the skb. For socket hooks,
+ *		will be used. For the TC hooks, this is the netns of the device
- *		this in the netns of the socket. If *netns* is non-zero, then
+ *		in the skb. For socket hooks, this is the netns of the socket.
- *		it specifies the ID of the netns relative to the netns
+ *		If *netns* is any other signed 32-bit value greater than or
- *		associated with the *ctx*.
+ *		equal to zero then it specifies the ID of the netns relative to
+ *		the netns associated with the *ctx*. *netns* values beyond the
+ *		range of 32-bit integers are reserved for future use.
  *
  *		All values for *flags* are reserved for future usage, and must
  *		be left at zero.
  *		**CONFIG_NET** configuration option.
  *	Return
  *		Pointer to *struct bpf_sock*, or NULL in case of failure.
- *		For sockets with reuseport option, *struct bpf_sock*
+ *		For sockets with reuseport option, the *struct bpf_sock*
- *		return is from reuse->socks[] using hash of the packet.
+ *		result is from reuse->socks[] using the hash of the tuple.
  *
  * int bpf_sk_release(struct bpf_sock *sk)
  *	Description
 /* BPF_FUNC_perf_event_output for sk_buff input context. */
 #define BPF_F_CTXLEN_MASK		(0xfffffULL << 32)
+/* Current network namespace */
+#define BPF_F_CURRENT_NETNS		(-1L)
 /* Mode for BPF_FUNC_skb_adjust_room helper. */
 enum bpf_adj_room_mode {
 	BPF_ADJ_ROOM_NET,
 	BPF_LWT_ENCAP_SEG6_INLINE
 };
+#define __bpf_md_ptr(type, name)	\
+union {					\
+	type name;			\
+	__u64 :64;			\
+} __attribute__((aligned(8)))
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
 	/* ... here. */
 	__u32 data_meta;
-	struct bpf_flow_keys *flow_keys;
+	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
 	__u64 tstamp;
 };
  * be added to the end of this structure
  */
 struct sk_msg_md {
-	void *data;
+	__bpf_md_ptr(void *, data);
-	void *data_end;
+	__bpf_md_ptr(void *, data_end);
 	__u32 family;
 	__u32 remote_ip4;	/* Stored in network byte order */
 	 * Start of directly accessible data. It begins from
 	 * the tcp/udp header.
 	 */
-	void *data;
+	__bpf_md_ptr(void *, data);
-	void *data_end;		/* End of directly accessible data */
+	/* End of directly accessible data */
+	__bpf_md_ptr(void *, data_end);
 	/*
 	 * Total length of packet (starting from the tcp/udp header).
 	 * Note that the directly accessible bytes (data_end - data)

include/uapi/linux/prctl.h+1−0

@@ -212,6 +212,7 @@ struct prctl_mm_map { · 211 unmodified lines
212	#define PR_SET_SPECULATION_CTRL 53	212	#define PR_SET_SPECULATION_CTRL 53
213	/* Speculation control variants */	213	/* Speculation control variants */
214	# define PR_SPEC_STORE_BYPASS 0	214	# define PR_SPEC_STORE_BYPASS 0
		215	# define PR_SPEC_INDIRECT_BRANCH 1
215	/* Return and control values for PR_SET/GET_SPECULATION_CTRL */	216	/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
216	# define PR_SPEC_NOT_AFFECTED 0	217	# define PR_SPEC_NOT_AFFECTED 0
217	# define PR_SPEC_PRCTL (1UL << 0)	218	# define PR_SPEC_PRCTL (1UL << 0)