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

Pull networking updates from David Miller: "Reasonably busy this cycle, but perhaps not as busy as in the 4.12 merge window: 1) Several optimizations for UDP processing under high load from Paolo Abeni. 2) Support pacing internally in TCP when using the sch_fq packet scheduler for this is not practical. From Eric Dumazet. 3) Support mutliple filter chains per qdisc, from Jiri Pirko. 4) Move to 1ms TCP timestamp clock, from Eric Dumazet. 5) Add batch dequeueing to vhost_net, from Jason Wang. 6) Flesh out more completely SCTP checksum offload support, from Davide Caratti. 7) More plumbing of extended netlink ACKs, from David Ahern, Pablo Neira Ayuso, and Matthias Schiffer. 8) Add devlink support to nfp driver, from Simon Horman. 9) Add RTM_F_FIB_MATCH flag to RTM_GETROUTE queries, from Roopa Prabhu. 10) Add stack depth tracking to BPF verifier and use this information in the various eBPF JITs. From Alexei Starovoitov. 11) Support XDP on qed device VFs, from Yuval Mintz. 12) Introduce BPF PROG ID for better introspection of installed BPF programs. From Martin KaFai Lau. 13) Add bpf_set_hash helper for TC bpf programs, from Daniel Borkmann. 14) For loads, allow narrower accesses in bpf verifier checking, from Yonghong Song. 15) Support MIPS in the BPF selftests and samples infrastructure, the MIPS eBPF JIT will be merged in via the MIPS GIT tree. From David Daney. 16) Support kernel based TLS, from Dave Watson and others. 17) Remove completely DST garbage collection, from Wei Wang. 18) Allow installing TCP MD5 rules using prefixes, from Ivan Delalande. 19) Add XDP support to Intel i40e driver, from Björn Töpel 20) Add support for TC flower offload in nfp driver, from Simon Horman, Pieter Jansen van Vuuren, Benjamin LaHaise, Jakub Kicinski, and Bert van Leeuwen. 21) IPSEC offloading support in mlx5, from Ilan Tayari. 22) Add HW PTP support to macb driver, from Rafal Ozieblo. 23) Networking refcount_t conversions, From Elena Reshetova. 24) Add sock_ops support to BPF, from Lawrence Brako. This is useful for tuning the TCP sockopt settings of a group of applications, currently via CGROUPs" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1899 commits) net: phy: dp83867: add workaround for incorrect RX_CTRL pin strap dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strap cxgb4: Support for get_ts_info ethtool method cxgb4: Add PTP Hardware Clock (PHC) support cxgb4: time stamping interface for PTP nfp: default to chained metadata prepend format nfp: remove legacy MAC address lookup nfp: improve order of interfaces in breakout mode net: macb: remove extraneous return when MACB_EXT_DESC is defined bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP case bpf: fix return in load_bpf_file mpls: fix rtm policy in mpls_getroute net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t net, ax25: convert ax25_route.refcount from atomic_t to refcount_t net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_t net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_t net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_t net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_t net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t ...

Linus Torvalds committed 9 years ago

Commit 5518b692 parents 8ad06e5 0e725821901 files · +98596 −35934Browse files

Showing the changes to include/uapi/linux (16 of 1901 files). Show all

Unified · Split

16 files

include/uapi/linux/bpf.h +135 −5
include/uapi/linux/if_link.h +18 −2
include/uapi/linux/mroute.h +54 −0
include/uapi/linux/mroute6.h +12 −0
include/uapi/linux/neighbour.h +1 −0
include/uapi/linux/net_tstamp.h +14 −1
include/uapi/linux/nl80211.h +73 −9
include/uapi/linux/pkt_cls.h +17 −0
include/uapi/linux/rtnetlink.h +9 −0
include/uapi/linux/sctp.h +6 −0
include/uapi/linux/snmp.h +1 −0
include/uapi/linux/tc_act/tc_bpf.h +1 −0
include/uapi/linux/tc_act/tc_tunnel_key.h +1 −0
include/uapi/linux/tcp.h +8 −2
include/uapi/linux/tls.h +79 −0
include/uapi/linux/wil6210_uapi.h +0 −87

include/uapi/linux/bpf.h+135−5

@@ -82,6 +82,11 @@ enum bpf_cmd { · 81 unmodified lines
82	BPF_PROG_ATTACH,	82	BPF_PROG_ATTACH,
83	BPF_PROG_DETACH,	83	BPF_PROG_DETACH,
84	BPF_PROG_TEST_RUN,	84	BPF_PROG_TEST_RUN,
		85	BPF_PROG_GET_NEXT_ID,
		86	BPF_MAP_GET_NEXT_ID,
		87	BPF_PROG_GET_FD_BY_ID,
		88	BPF_MAP_GET_FD_BY_ID,
		89	BPF_OBJ_GET_INFO_BY_FD,
85	};	90	};
86		91
87	enum bpf_map_type {	92	enum bpf_map_type {
@@ -115,12 +120,14 @@ enum bpf_prog_type { · 27 unmodified lines
115	BPF_PROG_TYPE_LWT_IN,	120	BPF_PROG_TYPE_LWT_IN,
116	BPF_PROG_TYPE_LWT_OUT,	121	BPF_PROG_TYPE_LWT_OUT,
117	BPF_PROG_TYPE_LWT_XMIT,	122	BPF_PROG_TYPE_LWT_XMIT,
		123	BPF_PROG_TYPE_SOCK_OPS,
118	};	124	};
119		125
120	enum bpf_attach_type {	126	enum bpf_attach_type {
121	BPF_CGROUP_INET_INGRESS,	127	BPF_CGROUP_INET_INGRESS,
122	BPF_CGROUP_INET_EGRESS,	128	BPF_CGROUP_INET_EGRESS,
123	BPF_CGROUP_INET_SOCK_CREATE,	129	BPF_CGROUP_INET_SOCK_CREATE,
		130	BPF_CGROUP_SOCK_OPS,
124	__MAX_BPF_ATTACH_TYPE	131	__MAX_BPF_ATTACH_TYPE
125	};	132	};
126		133
@@ -209,6 +216,21 @@ union bpf_attr { · 82 unmodified lines
209	__u32 repeat;	216	__u32 repeat;
210	__u32 duration;	217	__u32 duration;
211	} test;	218	} test;
		219
		220	struct { /* anonymous struct used by BPF__GET__ID */
		221	union {
		222	__u32 start_id;
		223	__u32 prog_id;
		224	__u32 map_id;
		225	};
		226	__u32 next_id;
		227	};
		228
		229	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
		230	__u32 bpf_fd;
		231	__u32 info_len;
		232	__aligned_u64 info;
		233	} info;
212	} __attribute__((aligned(8)));	234	} __attribute__((aligned(8)));
213		235
214	/* BPF helper function descriptions:	236	/* BPF helper function descriptions:
@@ -313,8 +335,11 @@ union bpf_attr { · 98 unmodified lines
313	* @flags: room for future extensions	335	* @flags: room for future extensions
314	* Return: 0 on success or negative error	336	* Return: 0 on success or negative error
315	*	337	*
316	* u64 bpf_perf_event_read(&map, index)	338	* u64 bpf_perf_event_read(map, flags)
317	* Return: Number events read or error code	339	* read perf event counter value
		340	* @map: pointer to perf_event_array map
		341	* @flags: index of event in the map or bitmask flags
		342	* Return: value of perf event counter read or error code
318	*	343	*
319	* int bpf_redirect(ifindex, flags)	344	* int bpf_redirect(ifindex, flags)
320	* redirect to another netdev	345	* redirect to another netdev
@@ -328,11 +353,11 @@ union bpf_attr { · 7 unmodified lines
328	* @skb: pointer to skb	353	* @skb: pointer to skb
329	* Return: realm if != 0	354	* Return: realm if != 0
330	*	355	*
331	* int bpf_perf_event_output(ctx, map, index, data, size)	356	* int bpf_perf_event_output(ctx, map, flags, data, size)
332	* output perf raw sample	357	* output perf raw sample
333	* @ctx: struct pt_regs*	358	* @ctx: struct pt_regs*
334	* @map: pointer to perf_event_array map	359	* @map: pointer to perf_event_array map
335	* @index: index of event in the map	360	* @flags: index of event in the map or bitmask flags
336	* @data: data on stack to be output as raw data	361	* @data: data on stack to be output as raw data
337	* @size: size of data	362	* @size: size of data
338	* Return: 0 on success or negative error	363	* Return: 0 on success or negative error
@@ -490,6 +515,30 @@ union bpf_attr { · 151 unmodified lines
490	* Get the owner uid of the socket stored inside sk_buff.	515	* Get the owner uid of the socket stored inside sk_buff.
491	* @skb: pointer to skb	516	* @skb: pointer to skb
492	* Return: uid of the socket owner on success or overflowuid if failed.	517	* Return: uid of the socket owner on success or overflowuid if failed.
		518	*
		519	* u32 bpf_set_hash(skb, hash)
		520	* Set full skb->hash.
		521	* @skb: pointer to skb
		522	* @hash: hash to set
		523	*
		524	* int bpf_setsockopt(bpf_socket, level, optname, optval, optlen)
		525	* Calls setsockopt. Not all opts are available, only those with
		526	* integer optvals plus TCP_CONGESTION.
		527	* Supported levels: SOL_SOCKET and IPROTO_TCP
		528	* @bpf_socket: pointer to bpf_socket
		529	* @level: SOL_SOCKET or IPROTO_TCP
		530	* @optname: option name
		531	* @optval: pointer to option value
		532	* @optlen: length of optval in byes
		533	* Return: 0 or negative error
		534	*
		535	* int bpf_skb_adjust_room(skb, len_diff, mode, flags)
		536	* Grow or shrink room in sk_buff.
		537	* @skb: pointer to skb
		538	* @len_diff: (signed) amount of room to grow/shrink
		539	* @mode: operation mode (enum bpf_adj_room_mode)
		540	* @flags: reserved for future use
		541	* Return: 0 on success or negative error code
493	*/	542	*/
494	#define __BPF_FUNC_MAPPER(FN) \	543	#define __BPF_FUNC_MAPPER(FN) \
495	FN(unspec), \	544	FN(unspec), \
@@ -539,7 +588,10 @@ union bpf_attr { · 43 unmodified lines
539	FN(xdp_adjust_head), \	588	FN(xdp_adjust_head), \
540	FN(probe_read_str), \	589	FN(probe_read_str), \
541	FN(get_socket_cookie), \	590	FN(get_socket_cookie), \
542	FN(get_socket_uid),	591	FN(get_socket_uid), \
		592	FN(set_hash), \
		593	FN(setsockopt), \
		594	FN(skb_adjust_room),
543		595
544	/* integer value in 'imm' field of BPF_CALL instruction selects which helper	596	/* integer value in 'imm' field of BPF_CALL instruction selects which helper
545	* function eBPF program intends to call	597	* function eBPF program intends to call
@@ -589,6 +641,11 @@ enum bpf_func_id { · 43 unmodified lines
589	/* BPF_FUNC_perf_event_output for sk_buff input context. */	641	/* BPF_FUNC_perf_event_output for sk_buff input context. */
590	#define BPF_F_CTXLEN_MASK (0xfffffULL << 32)	642	#define BPF_F_CTXLEN_MASK (0xfffffULL << 32)
591		643
		644	/* Mode for BPF_FUNC_skb_adjust_room helper. */
		645	enum bpf_adj_room_mode {
		646	BPF_ADJ_ROOM_NET,
		647	};
		648
592	/* user accessible mirror of in-kernel sk_buff.	649	/* user accessible mirror of in-kernel sk_buff.
593	* new fields can only be added to the end of this structure	650	* new fields can only be added to the end of this structure
594	*/	651	*/
@@ -670,4 +727,77 @@ struct xdp_md { · 75 unmodified lines
670	__u32 data_end;	727	__u32 data_end;
671	};	728	};
672		729
		730	#define BPF_TAG_SIZE 8
		731
		732	struct bpf_prog_info {
		733	__u32 type;
		734	__u32 id;
		735	__u8 tag[BPF_TAG_SIZE];
		736	__u32 jited_prog_len;
		737	__u32 xlated_prog_len;
		738	__aligned_u64 jited_prog_insns;
		739	__aligned_u64 xlated_prog_insns;
		740	} __attribute__((aligned(8)));
		741
		742	struct bpf_map_info {
		743	__u32 type;
		744	__u32 id;
		745	__u32 key_size;
		746	__u32 value_size;
		747	__u32 max_entries;
		748	__u32 map_flags;
		749	} __attribute__((aligned(8)));
		750
		751	/* User bpf_sock_ops struct to access socket values and specify request ops
		752	* and their replies.
		753	* Some of this fields are in network (bigendian) byte order and may need
		754	* to be converted before use (bpf_ntohl() defined in samples/bpf/bpf_endian.h).
		755	* New fields can only be added at the end of this structure
		756	*/
		757	struct bpf_sock_ops {
		758	__u32 op;
		759	union {
		760	__u32 reply;
		761	__u32 replylong[4];
		762	};
		763	__u32 family;
		764	__u32 remote_ip4; /* Stored in network byte order */
		765	__u32 local_ip4; /* Stored in network byte order */
		766	__u32 remote_ip6[4]; /* Stored in network byte order */
		767	__u32 local_ip6[4]; /* Stored in network byte order */
		768	__u32 remote_port; /* Stored in network byte order */
		769	__u32 local_port; /* stored in host byte order */
		770	};
		771
		772	/* List of known BPF sock_ops operators.
		773	* New entries can only be added at the end
		774	*/
		775	enum {
		776	BPF_SOCK_OPS_VOID,
		777	BPF_SOCK_OPS_TIMEOUT_INIT, /* Should return SYN-RTO value to use or
		778	* -1 if default value should be used
		779	*/
		780	BPF_SOCK_OPS_RWND_INIT, /* Should return initial advertized
		781	* window (in packets) or -1 if default
		782	* value should be used
		783	*/
		784	BPF_SOCK_OPS_TCP_CONNECT_CB, /* Calls BPF program right before an
		785	* active connection is initialized
		786	*/
		787	BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB, /* Calls BPF program when an
		788	* active connection is
		789	* established
		790	*/
		791	BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB, /* Calls BPF program when a
		792	* passive connection is
		793	* established
		794	*/
		795	BPF_SOCK_OPS_NEEDS_ECN, /* If connection's congestion control
		796	* needs ECN
		797	*/
		798	};
		799
		800	#define TCP_BPF_IW 1001 /* Set TCP initial congestion window */
		801	#define TCP_BPF_SNDCWND_CLAMP 1002 /* Set sndcwnd_clamp */
		802
673	#endif /* _UAPI__LINUX_BPF_H__ */	803	#endif /* _UAPI__LINUX_BPF_H__ */

include/uapi/linux/if_link.h+18−2

 	IFLA_GSO_MAX_SIZE,
 	IFLA_PAD,
 	IFLA_XDP,
+	IFLA_EVENT,
 	__IFLA_MAX
 };
 #define XDP_FLAGS_UPDATE_IF_NOEXIST	(1U << 0)
 #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_SKB_MODE | \
+					 XDP_FLAGS_MODES)
-					 XDP_FLAGS_DRV_MODE)
 /* These are stored into IFLA_XDP_ATTACHED on dump. */
 enum {
 	XDP_ATTACHED_NONE = 0,
 	XDP_ATTACHED_DRV,
 	XDP_ATTACHED_SKB,
+	XDP_ATTACHED_HW,
 };
 enum {
 	IFLA_XDP_FD,
 	IFLA_XDP_ATTACHED,
 	IFLA_XDP_FLAGS,
+	IFLA_XDP_PROG_ID,
 	__IFLA_XDP_MAX,
 };
 #define IFLA_XDP_MAX (__IFLA_XDP_MAX - 1)
+enum {
+	IFLA_EVENT_NONE,
+	IFLA_EVENT_REBOOT,		/* internal reset / reboot */
+	IFLA_EVENT_FEATURES,		/* change in offload features */
+	IFLA_EVENT_BONDING_FAILOVER,	/* change in active slave */
+	IFLA_EVENT_NOTIFY_PEERS,	/* re-sent grat. arp/ndisc */
+	IFLA_EVENT_IGMP_RESEND,		/* re-sent IGMP JOIN */
+	IFLA_EVENT_BONDING_OPTIONS,	/* change in bonding options */
+};
 #endif /* _UAPI_LINUX_IF_LINK_H */

include/uapi/linux/mroute.h+54−0

@@ -110,6 +110,60 @@ struct igmpmsg { · 109 unmodified lines
110	struct in_addr im_src,im_dst;	110	struct in_addr im_src,im_dst;
111	};	111	};
112		112
		113	/* ipmr netlink table attributes */
		114	enum {
		115	IPMRA_TABLE_UNSPEC,
		116	IPMRA_TABLE_ID,
		117	IPMRA_TABLE_CACHE_RES_QUEUE_LEN,
		118	IPMRA_TABLE_MROUTE_REG_VIF_NUM,
		119	IPMRA_TABLE_MROUTE_DO_ASSERT,
		120	IPMRA_TABLE_MROUTE_DO_PIM,
		121	IPMRA_TABLE_VIFS,
		122	__IPMRA_TABLE_MAX
		123	};
		124	#define IPMRA_TABLE_MAX (__IPMRA_TABLE_MAX - 1)
		125
		126	/* ipmr netlink vif attribute format
		127	* [ IPMRA_TABLE_VIFS ] - nested attribute
		128	* [ IPMRA_VIF ] - nested attribute
		129	* [ IPMRA_VIFA_xxx ]
		130	*/
		131	enum {
		132	IPMRA_VIF_UNSPEC,
		133	IPMRA_VIF,
		134	__IPMRA_VIF_MAX
		135	};
		136	#define IPMRA_VIF_MAX (__IPMRA_VIF_MAX - 1)
		137
		138	/* vif-specific attributes */
		139	enum {
		140	IPMRA_VIFA_UNSPEC,
		141	IPMRA_VIFA_IFINDEX,
		142	IPMRA_VIFA_VIF_ID,
		143	IPMRA_VIFA_FLAGS,
		144	IPMRA_VIFA_BYTES_IN,
		145	IPMRA_VIFA_BYTES_OUT,
		146	IPMRA_VIFA_PACKETS_IN,
		147	IPMRA_VIFA_PACKETS_OUT,
		148	IPMRA_VIFA_LOCAL_ADDR,
		149	IPMRA_VIFA_REMOTE_ADDR,
		150	IPMRA_VIFA_PAD,
		151	__IPMRA_VIFA_MAX
		152	};
		153	#define IPMRA_VIFA_MAX (__IPMRA_VIFA_MAX - 1)
		154
		155	/* ipmr netlink cache report attributes */
		156	enum {
		157	IPMRA_CREPORT_UNSPEC,
		158	IPMRA_CREPORT_MSGTYPE,
		159	IPMRA_CREPORT_VIF_ID,
		160	IPMRA_CREPORT_SRC_ADDR,
		161	IPMRA_CREPORT_DST_ADDR,
		162	IPMRA_CREPORT_PKT,
		163	__IPMRA_CREPORT_MAX
		164	};
		165	#define IPMRA_CREPORT_MAX (__IPMRA_CREPORT_MAX - 1)
		166
113	/* That's all usermode folks */	167	/* That's all usermode folks */
114		168
115	#define MFC_ASSERT_THRESH (3HZ) / Maximal freq. of asserts */	169	#define MFC_ASSERT_THRESH (3HZ) / Maximal freq. of asserts */

include/uapi/linux/mroute6.h+12−0

@@ -133,4 +133,16 @@ struct mrt6msg { · 132 unmodified lines
133	struct in6_addr im6_src, im6_dst;	133	struct in6_addr im6_src, im6_dst;
134	};	134	};
135		135
		136	/* ip6mr netlink cache report attributes */
		137	enum {
		138	IP6MRA_CREPORT_UNSPEC,
		139	IP6MRA_CREPORT_MSGTYPE,
		140	IP6MRA_CREPORT_MIF_ID,
		141	IP6MRA_CREPORT_SRC_ADDR,
		142	IP6MRA_CREPORT_DST_ADDR,
		143	IP6MRA_CREPORT_PKT,
		144	__IP6MRA_CREPORT_MAX
		145	};
		146	#define IP6MRA_CREPORT_MAX (__IP6MRA_CREPORT_MAX - 1)
		147
136	#endif /* _UAPI__LINUX_MROUTE6_H */	148	#endif /* _UAPI__LINUX_MROUTE6_H */

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

@@ -41,6 +41,7 @@ enum { · 40 unmodified lines
41	#define NTF_MASTER 0x04	41	#define NTF_MASTER 0x04
42	#define NTF_PROXY 0x08 /* == ATF_PUBL */	42	#define NTF_PROXY 0x08 /* == ATF_PUBL */
43	#define NTF_EXT_LEARNED 0x10	43	#define NTF_EXT_LEARNED 0x10
		44	#define NTF_OFFLOADED 0x20
44	#define NTF_ROUTER 0x80	45	#define NTF_ROUTER 0x80
45		46
46	/*	47	/*

include/uapi/linux/net_tstamp.h+14−1

 #ifndef _NET_TIMESTAMPING_H
 #define _NET_TIMESTAMPING_H
+#include <linux/types.h>
 #include <linux/socket.h>   /* for SO_TIMESTAMPING */
 /* SO_TIMESTAMPING gets an integer bit field comprised of these values */
 	SOF_TIMESTAMPING_OPT_CMSG = (1<<10),
 	SOF_TIMESTAMPING_OPT_TSONLY = (1<<11),
 	SOF_TIMESTAMPING_OPT_STATS = (1<<12),
+	SOF_TIMESTAMPING_OPT_PKTINFO = (1<<13),
+	SOF_TIMESTAMPING_OPT_TX_SWHW = (1<<14),
-	SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_STATS,
+	SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TX_SWHW,
 	SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
 				 SOF_TIMESTAMPING_LAST
 };
 	HWTSTAMP_FILTER_PTP_V2_SYNC,
 	/* PTP v2/802.AS1, any layer, Delay_req packet */
 	HWTSTAMP_FILTER_PTP_V2_DELAY_REQ,
+	/* NTP, UDP, all versions and packet modes */
+	HWTSTAMP_FILTER_NTP_ALL,
+};
+/* SCM_TIMESTAMPING_PKTINFO control message */
+struct scm_ts_pktinfo {
+	__u32 if_index;
+	__u32 pkt_length;
+	__u32 reserved[2];
 };
 #endif /* _NET_TIMESTAMPING_H */

include/uapi/linux/nl80211.h+73−9

  * Multiple such rules can be created.
  */
+/**
+ * DOC: WPA/WPA2 EAPOL handshake offload
+ *
+ * By setting @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK flag drivers
+ * can indicate they support offloading EAPOL handshakes for WPA/WPA2
+ * preshared key authentication. In %NL80211_CMD_CONNECT the preshared
+ * key should be specified using %NL80211_ATTR_PMK. Drivers supporting
+ * this offload may reject the %NL80211_CMD_CONNECT when no preshared
+ * key material is provided, for example when that driver does not
+ * support setting the temporal keys through %CMD_NEW_KEY.
+ *
+ * Similarly @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X flag can be
+ * set by drivers indicating offload support of the PTK/GTK EAPOL
+ * handshakes during 802.1X authentication. In order to use the offload
+ * the %NL80211_CMD_CONNECT should have %NL80211_ATTR_WANT_1X_4WAY_HS
+ * attribute flag. Drivers supporting this offload may reject the
+ * %NL80211_CMD_CONNECT when the attribute flag is not present.
+ *
+ * For 802.1X the PMK or PMK-R0 are set by providing %NL80211_ATTR_PMK
+ * using %NL80211_CMD_SET_PMK. For offloaded FT support also
+ * %NL80211_ATTR_PMKR0_NAME must be provided.
+ */
 /**
  * DOC: FILS shared key authentication offload
  *
  *	authentication/association or not receiving a response from the AP.
  *	Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as
  *	well to remain backwards compatible.
- * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
+ * @NL80211_CMD_ROAM: notifcation indicating the card/driver roamed by itself.
- *	sent as an event when the card/driver roamed by itself.
+ *	When the driver roamed in a network that requires 802.1X authentication,
+ *	%NL80211_ATTR_PORT_AUTHORIZED should be set if the 802.1X authentication
+ *	was done by the driver or if roaming was done using Fast Transition
+ *	protocol (in which case 802.1X authentication is not needed). If
+ *	%NL80211_ATTR_PORT_AUTHORIZED is not set, user space is responsible for
+ *	the 802.1X authentication.
  * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
  *	userspace that a connection was dropped by the AP or due to other
  *	reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
  *	does not result in a change for the current association. Currently,
  *	only the %NL80211_ATTR_IE data is used and updated with this command.
  *
+ * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0
+ *	for the given authenticator address (specified with &NL80211_ATTR_MAC).
+ *	When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the
+ *	PMK-R0, otherwise it specifies the PMK.
+ * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
+ *	configured PMK for the authenticator address identified by
+ *	&NL80211_ATTR_MAC.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
 	NL80211_CMD_UPDATE_CONNECT_PARAMS,
+	NL80211_CMD_SET_PMK,
+	NL80211_CMD_DEL_PMK,
 	/* add new commands above here */
 	/* used to define NL80211_CMD_MAX below */
  *	that configured the indoor setting, and the indoor operation would be
  *	cleared when the socket is closed.
  *	If set during NAN interface creation, the interface will be destroyed
- *	if the socket is closed just like any other interface. Moreover, only
+ *	if the socket is closed just like any other interface. Moreover, NAN
- *	the netlink socket that created the interface will be allowed to add
+ *	notifications will be sent in unicast to that socket. Without this
- *	and remove functions. NAN notifications will be sent in unicast to that
+ *	attribute, the notifications will be sent to the %NL80211_MCGRP_NAN
- *	socket. Without this attribute, any socket can add functions and the
+ *	multicast group.
- *	notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
  *	If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
  *	station will deauthenticate when the socket is closed.
  *
  *	identifying the scope of PMKSAs. This is used with
  *	@NL80211_CMD_SET_PMKSA and @NL80211_CMD_DEL_PMKSA.
  *
- * @NL80211_ATTR_PMK: PMK for the PMKSA identified by %NL80211_ATTR_PMKID.
+ * @NL80211_ATTR_PMK: attribute for passing PMK key material. Used with
- *	This is used with @NL80211_CMD_SET_PMKSA.
+ *	%NL80211_CMD_SET_PMKSA for the PMKSA identified by %NL80211_ATTR_PMKID.
+ *	For %NL80211_CMD_CONNECT it is used to provide PSK for offloading 4-way
+ *	handshake for WPA/WPA2-PSK networks. For 802.1X authentication it is
+ *	used with %NL80211_CMD_SET_PMK. For offloaded FT support this attribute
+ *	specifies the PMK-R0 if NL80211_ATTR_PMKR0_NAME is included as well.
  *
  * @NL80211_ATTR_SCHED_SCAN_MULTI: flag attribute which user-space shall use to
  *	indicate that it supports multiple active scheduled scan requests.
  * @NL80211_ATTR_SCHED_SCAN_MAX_REQS: indicates maximum number of scheduled
  *	scan request that may be active for the device (u32).
  *
+ * @NL80211_ATTR_WANT_1X_4WAY_HS: flag attribute which user-space can include
+ *	in %NL80211_CMD_CONNECT to indicate that for 802.1X authentication it
+ *	wants to use the supported offload of the 4-way handshake.
+ * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
+ * @NL80211_ATTR_PORT_AUTHORIZED: flag attribute used in %NL80211_CMD_ROAMED
+ *	notification indicating that that 802.1X authentication was done by
+ *	the driver or is not needed (because roaming used the Fast Transition
+ *	protocol).
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
 	NL80211_ATTR_SCHED_SCAN_MULTI,
 	NL80211_ATTR_SCHED_SCAN_MAX_REQS,
+	NL80211_ATTR_WANT_1X_4WAY_HS,
+	NL80211_ATTR_PMKR0_NAME,
+	NL80211_ATTR_PORT_AUTHORIZED,
 	/* add attributes here, update the policy in nl80211.c */
 	__NL80211_ATTR_AFTER_LAST,
  *	RSSI threshold values to monitor rather than exactly one threshold.
  * @NL80211_EXT_FEATURE_FILS_SK_OFFLOAD: Driver SME supports FILS shared key
  *	authentication with %NL80211_CMD_CONNECT.
+ * @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK: Device wants to do 4-way
+ *	handshake with PSK in station mode (PSK is passed as part of the connect
+ *	and associate commands), doing it in the host might not be supported.
+ * @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X: Device wants to do doing 4-way
+ *	handshake with 802.1X in station mode (will pass EAP frames to the host
+ *	and accept the set_pmk/del_pmk commands), doing it in the host might not
+ *	be supported.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
 	NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI,
 	NL80211_EXT_FEATURE_CQM_RSSI_LIST,
 	NL80211_EXT_FEATURE_FILS_SK_OFFLOAD,
+	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK,
+	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X,
 	/* add new features before the definition below */
 	NUM_NL80211_EXT_FEATURES,

include/uapi/linux/pkt_cls.h+17−0

 #define TC_ACT_QUEUED		5
 #define TC_ACT_REPEAT		6
 #define TC_ACT_REDIRECT		7
+#define TC_ACT_TRAP		8 /* For hw path, this means "trap to cpu"
+				   * and don't further process the frame
+				   * in hardware. For sw path, this is
+				   * equivalent of TC_ACT_STOLEN - drop
+				   * the skb and act like everything
+				   * is alright.
+				   */
 /* There is a special kind of actions called "extended actions",
  * which need a value parameter. These have a local opcode located in
 	(((combined) & (~TC_ACT_EXT_VAL_MASK)) == opcode)
 #define TC_ACT_JUMP __TC_ACT_EXT(1)
+#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)
 /* Action type identifiers*/
 enum {
 	TCA_BPF_FLAGS,
 	TCA_BPF_FLAGS_GEN,
 	TCA_BPF_TAG,
+	TCA_BPF_ID,
 	__TCA_BPF_MAX,
 };
 	TCA_FLOWER_KEY_MPLS_TC,		/* u8 - 3 bits */
 	TCA_FLOWER_KEY_MPLS_LABEL,	/* be32 - 20 bits */
+	TCA_FLOWER_KEY_TCP_FLAGS,	/* be16 */
+	TCA_FLOWER_KEY_TCP_FLAGS_MASK,	/* be16 */
+	TCA_FLOWER_KEY_IP_TOS,		/* u8 */
+	TCA_FLOWER_KEY_IP_TOS_MASK,	/* u8 */
+	TCA_FLOWER_KEY_IP_TTL,		/* u8 */
+	TCA_FLOWER_KEY_IP_TTL_MASK,	/* u8 */
 	__TCA_FLOWER_MAX,
 };

include/uapi/linux/rtnetlink.h+9−0

 	RTM_GETSTATS = 94,
 #define RTM_GETSTATS RTM_GETSTATS
+	RTM_NEWCACHEREPORT = 96,
+#define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT
 	__RTM_MAX,
 #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)
 };
 #define RTM_F_EQUALIZE		0x400	/* Multipath equalizer: NI	*/
 #define RTM_F_PREFIX		0x800	/* Prefix addresses		*/
 #define RTM_F_LOOKUP_TABLE	0x1000	/* set rtm_table to FIB lookup result */
+#define RTM_F_FIB_MATCH	        0x2000	/* return full fib lookup match */
 /* Reserved table identifiers */
 	TCA_STAB,
 	TCA_PAD,
 	TCA_DUMP_INVISIBLE,
+	TCA_CHAIN,
 	__TCA_MAX
 };
 #define RTNLGRP_NSID		RTNLGRP_NSID
 	RTNLGRP_MPLS_NETCONF,
 #define RTNLGRP_MPLS_NETCONF	RTNLGRP_MPLS_NETCONF
+	RTNLGRP_IPV4_MROUTE_R,
+#define RTNLGRP_IPV4_MROUTE_R	RTNLGRP_IPV4_MROUTE_R
+	RTNLGRP_IPV6_MROUTE_R,
+#define RTNLGRP_IPV6_MROUTE_R	RTNLGRP_IPV6_MROUTE_R
 	__RTNLGRP_MAX
 };
 #define RTNLGRP_MAX	(__RTNLGRP_MAX - 1)

include/uapi/linux/sctp.h+6−0

 #define SCTP_RESET_STREAMS	119
 #define SCTP_RESET_ASSOC	120
 #define SCTP_ADD_STREAMS	121
+#define SCTP_SOCKOPT_PEELOFF_FLAGS 122
 /* PR-SCTP policies */
 #define SCTP_PR_SCTP_NONE	0x0000
 	int sd;
 } sctp_peeloff_arg_t;
+typedef struct {
+	sctp_peeloff_arg_t p_arg;
+	unsigned flags;
+} sctp_peeloff_flags_arg_t;
 /*
  *  Peer Address Thresholds socket option
  */

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

@@ -228,6 +228,7 @@ enum · 227 unmodified lines
228	LINUX_MIB_TCPABORTONLINGER, /* TCPAbortOnLinger */	228	LINUX_MIB_TCPABORTONLINGER, /* TCPAbortOnLinger */
229	LINUX_MIB_TCPABORTFAILED, /* TCPAbortFailed */	229	LINUX_MIB_TCPABORTFAILED, /* TCPAbortFailed */
230	LINUX_MIB_TCPMEMORYPRESSURES, /* TCPMemoryPressures */	230	LINUX_MIB_TCPMEMORYPRESSURES, /* TCPMemoryPressures */
		231	LINUX_MIB_TCPMEMORYPRESSURESCHRONO, /* TCPMemoryPressuresChrono */
231	LINUX_MIB_TCPSACKDISCARD, /* TCPSACKDiscard */	232	LINUX_MIB_TCPSACKDISCARD, /* TCPSACKDiscard */
232	LINUX_MIB_TCPDSACKIGNOREDOLD, /* TCPSACKIgnoredOld */	233	LINUX_MIB_TCPDSACKIGNOREDOLD, /* TCPSACKIgnoredOld */
233	LINUX_MIB_TCPDSACKIGNOREDNOUNDO, /* TCPSACKIgnoredNoUndo */	234	LINUX_MIB_TCPDSACKIGNOREDNOUNDO, /* TCPSACKIgnoredNoUndo */

include/uapi/linux/tc_act/tc_bpf.h+1−0

@@ -28,6 +28,7 @@ enum { · 27 unmodified lines
28	TCA_ACT_BPF_NAME,	28	TCA_ACT_BPF_NAME,
29	TCA_ACT_BPF_PAD,	29	TCA_ACT_BPF_PAD,
30	TCA_ACT_BPF_TAG,	30	TCA_ACT_BPF_TAG,
		31	TCA_ACT_BPF_ID,
31	__TCA_ACT_BPF_MAX,	32	__TCA_ACT_BPF_MAX,
32	};	33	};
33	#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)	34	#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)

include/uapi/linux/tc_act/tc_tunnel_key.h+1−0

@@ -34,6 +34,7 @@ enum { · 33 unmodified lines
34	TCA_TUNNEL_KEY_ENC_KEY_ID, /* be64 */	34	TCA_TUNNEL_KEY_ENC_KEY_ID, /* be64 */
35	TCA_TUNNEL_KEY_PAD,	35	TCA_TUNNEL_KEY_PAD,
36	TCA_TUNNEL_KEY_ENC_DST_PORT, /* be16 */	36	TCA_TUNNEL_KEY_ENC_DST_PORT, /* be16 */
		37	TCA_TUNNEL_KEY_NO_CSUM, /* u8 */
37	__TCA_TUNNEL_KEY_MAX,	38	__TCA_TUNNEL_KEY_MAX,
38	};	39	};
39		40

include/uapi/linux/tcp.h+8−2

 #define TCP_SAVED_SYN		28	/* Get SYN headers recorded for connection */
 #define TCP_REPAIR_WINDOW	29	/* Get/set window parameters */
 #define TCP_FASTOPEN_CONNECT	30	/* Attempt FastOpen with connect */
+#define TCP_ULP			31	/* Attach a ULP to a TCP connection */
+#define TCP_MD5SIG_EXT		32	/* TCP MD5 Signature with extensions */
 struct tcp_repair_opt {
 	__u32	opt_code;
 /* for TCP_MD5SIG socket option */
 #define TCP_MD5SIG_MAXKEYLEN	80
+/* tcp_md5sig extension flags for TCP_MD5SIG_EXT */
+#define TCP_MD5SIG_FLAG_PREFIX		1	/* address prefix length */
 struct tcp_md5sig {
 	struct __kernel_sockaddr_storage tcpm_addr;	/* address associated */
-	__u16	__tcpm_pad1;				/* zero */
+	__u8	tcpm_flags;				/* extension flags */
+	__u8	tcpm_prefixlen;				/* address prefix */
 	__u16	tcpm_keylen;				/* key length */
-	__u32	__tcpm_pad2;				/* zero */
+	__u32	__tcpm_pad;				/* zero */
 	__u8	tcpm_key[TCP_MD5SIG_MAXKEYLEN];		/* key (binary) */
 };

include/uapi/linux/tls.h+79−0

@@ -0,0 +1,79 @@
	1	/*
	2	* Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef _UAPI_LINUX_TLS_H
	34	#define _UAPI_LINUX_TLS_H
	35
	36	#include <linux/types.h>
	37	#include <asm/byteorder.h>
	38	#include <linux/socket.h>
	39	#include <linux/tcp.h>
	40	#include <net/tcp.h>
	41
	42	/* TLS socket options */
	43	#define TLS_TX 1 /* Set transmit parameters */
	44
	45	/* Supported versions */
	46	#define TLS_VERSION_MINOR(ver) ((ver) & 0xFF)
	47	#define TLS_VERSION_MAJOR(ver) (((ver) >> 8) & 0xFF)
	48
	49	#define TLS_VERSION_NUMBER(id) ((((id##_VERSION_MAJOR) & 0xFF) << 8) \| \
	50	((id##_VERSION_MINOR) & 0xFF))
	51
	52	#define TLS_1_2_VERSION_MAJOR 0x3
	53	#define TLS_1_2_VERSION_MINOR 0x3
	54	#define TLS_1_2_VERSION TLS_VERSION_NUMBER(TLS_1_2)
	55
	56	/* Supported ciphers */
	57	#define TLS_CIPHER_AES_GCM_128 51
	58	#define TLS_CIPHER_AES_GCM_128_IV_SIZE 8
	59	#define TLS_CIPHER_AES_GCM_128_KEY_SIZE 16
	60	#define TLS_CIPHER_AES_GCM_128_SALT_SIZE 4
	61	#define TLS_CIPHER_AES_GCM_128_TAG_SIZE 16
	62	#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE 8
	63
	64	#define TLS_SET_RECORD_TYPE 1
	65
	66	struct tls_crypto_info {
	67	__u16 version;
	68	__u16 cipher_type;
	69	};
	70
	71	struct tls12_crypto_info_aes_gcm_128 {
	72	struct tls_crypto_info info;
	73	unsigned char iv[TLS_CIPHER_AES_GCM_128_IV_SIZE];
	74	unsigned char key[TLS_CIPHER_AES_GCM_128_KEY_SIZE];
	75	unsigned char salt[TLS_CIPHER_AES_GCM_128_SALT_SIZE];
	76	unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];
	77	};
	78
	79	#endif /* _UAPI_LINUX_TLS_H */

include/uapi/linux/wil6210_uapi.h+0−87

@@ -1,87 +0,0 @@
1	/*
2	* Copyright (c) 2014 Qualcomm Atheros, Inc.
3	*
4	* Permission to use, copy, modify, and/or distribute this software for any
5	* purpose with or without fee is hereby granted, provided that the above
6	* copyright notice and this permission notice appear in all copies.
7	*
8	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15	*/
16
17	#ifndef __WIL6210_UAPI_H__
18	#define __WIL6210_UAPI_H__
19
20	#if !defined(__KERNEL__)
21	#define __user
22	#endif
23
24	#include <linux/sockios.h>
25
26	/* Numbers SIOCDEVPRIVATE and SIOCDEVPRIVATE + 1
27	* are used by Android devices to implement PNO (preferred network offload).
28	* Albeit it is temporary solution, use different numbers to avoid conflicts
29	*/
30
31	/**
32	* Perform 32-bit I/O operation to the card memory
33	*
34	* User code should arrange data in memory like this:
35	*
36	* struct wil_memio io;
37	* struct ifreq ifr = {
38	* .ifr_data = &io,
39	* };
40	*/
41	#define WIL_IOCTL_MEMIO (SIOCDEVPRIVATE + 2)
42
43	/**
44	* Perform block I/O operation to the card memory
45	*
46	* User code should arrange data in memory like this:
47	*
48	* void *buf;
49	* struct wil_memio_block io = {
50	* .block = buf,
51	* };
52	* struct ifreq ifr = {
53	* .ifr_data = &io,
54	* };
55	*/
56	#define WIL_IOCTL_MEMIO_BLOCK (SIOCDEVPRIVATE + 3)
57
58	/**
59	* operation to perform
60	*
61	* @wil_mmio_op_mask - bits defining operation,
62	* @wil_mmio_addr_mask - bits defining addressing mode
63	*/
64	enum wil_memio_op {
65	wil_mmio_read = 0,
66	wil_mmio_write = 1,
67	wil_mmio_op_mask = 0xff,
68	wil_mmio_addr_linker = 0 << 8,
69	wil_mmio_addr_ahb = 1 << 8,
70	wil_mmio_addr_bar = 2 << 8,
71	wil_mmio_addr_mask = 0xff00,
72	};
73
74	struct wil_memio {
75	uint32_t op; /* enum wil_memio_op */
76	uint32_t addr; /* should be 32-bit aligned */
77	uint32_t val;
78	};
79
80	struct wil_memio_block {
81	uint32_t op; /* enum wil_memio_op */
82	uint32_t addr; /* should be 32-bit aligned */
83	uint32_t size; /* should be multiple of 4 */
84	void __user block; / block address */
85	};
86
87	#endif /* __WIL6210_UAPI_H__ */

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code