Merge remote-tracking branch 'net-next/master' into mac80211-next

Resolve the merge conflict between Felix's/my and Toke's patches
coming into the tree through net and mac80211-next respectively.
Most of Felix's changes go away due to Toke's new infrastructure
work, my patch changes to "goto begin" (the label wasn't there
before) instead of returning NULL so flow control towards drivers
is preserved better.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

15 files changed, 164 insertions, 10 deletions

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index f896dfac4ac0..f09c70b97eca 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -398,6 +398,34 @@ enum bpf_func_id {
          */
         BPF_FUNC_skb_change_tail,
 
+        /**
+         * bpf_skb_pull_data(skb, len)
+         * The helper will pull in non-linear data in case the
+         * skb is non-linear and not all of len are part of the
+         * linear section. Only needed for read/write with direct
+         * packet access.
+         * @skb: pointer to skb
+         * @len: len to make read/writeable
+         * Return: 0 on success or negative error
+         */
+        BPF_FUNC_skb_pull_data,
+
+        /**
+         * bpf_csum_update(skb, csum)
+         * Adds csum into skb->csum in case of CHECKSUM_COMPLETE.
+         * @skb: pointer to skb
+         * @csum: csum to add
+         * Return: csum on success or negative error
+         */
+        BPF_FUNC_csum_update,
+
+        /**
+         * bpf_set_hash_invalid(skb)
+         * Invalidate current skb>hash.
+         * @skb: pointer to skb
+         */
+        BPF_FUNC_set_hash_invalid,
+
         __BPF_FUNC_MAX_ID,
 };
 
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 9bf3aecfe05b..b4fba662cd32 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -464,6 +464,7 @@ enum {
 enum ipvlan_mode {
         IPVLAN_MODE_L2 = 0,
         IPVLAN_MODE_L3,
+        IPVLAN_MODE_L3S,
         IPVLAN_MODE_MAX
 };
 
@@ -618,7 +619,7 @@ enum {
 enum {
         IFLA_VF_UNSPEC,
         IFLA_VF_MAC,            /* Hardware queue specific attributes */
-        IFLA_VF_VLAN,
+        IFLA_VF_VLAN,           /* VLAN ID and QoS */
         IFLA_VF_TX_RATE,        /* Max TX Bandwidth Allocation */
         IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
         IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
@@ -630,6 +631,7 @@ enum {
         IFLA_VF_TRUST,          /* Trust VF */
         IFLA_VF_IB_NODE_GUID,   /* VF Infiniband node GUID */
         IFLA_VF_IB_PORT_GUID,   /* VF Infiniband port GUID */
+        IFLA_VF_VLAN_LIST,      /* nested list of vlans, option for QinQ */
         __IFLA_VF_MAX,
 };
 
@@ -646,6 +648,22 @@ struct ifla_vf_vlan {
         __u32 qos;
 };
 
+enum {
+        IFLA_VF_VLAN_INFO_UNSPEC,
+        IFLA_VF_VLAN_INFO,      /* VLAN ID, QoS and VLAN protocol */
+        __IFLA_VF_VLAN_INFO_MAX,
+};
+
+#define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
+#define MAX_VLAN_LIST_LEN 1
+
+struct ifla_vf_vlan_info {
+        __u32 vf;
+        __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
+        __u32 qos;
+        __be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
+};
+
 struct ifla_vf_tx_rate {
         __u32 vf;
         __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
@@ -826,6 +844,7 @@ enum {
         IFLA_STATS_LINK_64,
         IFLA_STATS_LINK_XSTATS,
         IFLA_STATS_LINK_XSTATS_SLAVE,
+        IFLA_STATS_LINK_OFFLOAD_XSTATS,
         __IFLA_STATS_MAX,
 };
 
@@ -845,6 +864,14 @@ enum {
 };
 #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
 
+/* These are stats embedded into IFLA_STATS_LINK_OFFLOAD_XSTATS */
+enum {
+        IFLA_OFFLOAD_XSTATS_UNSPEC,
+        IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
+        __IFLA_OFFLOAD_XSTATS_MAX
+};
+#define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
+
 /* XDP section */
 
 enum {
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index 18d5dc13985d..92f3c8677523 100644
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -39,6 +39,7 @@
 #define GRE_IS_REC(f)           ((f) & GRE_REC)
 #define GRE_IS_ACK(f)           ((f) & GRE_ACK)
 
+#define GRE_VERSION_0           __cpu_to_be16(0x0000)
 #define GRE_VERSION_1           __cpu_to_be16(0x0001)
 #define GRE_PROTO_PPP           __cpu_to_be16(0x880b)
 #define GRE_PPTP_KEY_MASK       __cpu_to_be32(0xffff)
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index b5c366f87b3e..509cd961068d 100644
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -124,6 +124,7 @@ enum {
         INET_DIAG_PEERS,
         INET_DIAG_PAD,
         INET_DIAG_MARK,
+        INET_DIAG_BBRINFO,
         __INET_DIAG_MAX,
 };
 
@@ -157,8 +158,20 @@ struct tcp_dctcp_info {
         __u32   dctcp_ab_tot;
 };
 
+/* INET_DIAG_BBRINFO */
+
+struct tcp_bbr_info {
+        /* u64 bw: max-filtered BW (app throughput) estimate in Byte per sec: */
+        __u32   bbr_bw_lo;              /* lower 32 bits of bw */
+        __u32   bbr_bw_hi;              /* upper 32 bits of bw */
+        __u32   bbr_min_rtt;            /* min-filtered RTT in uSec */
+        __u32   bbr_pacing_gain;        /* pacing gain shifted left 8 bits */
+        __u32   bbr_cwnd_gain;          /* cwnd gain shifted left 8 bits */
+};
+
 union tcp_cc_info {
         struct tcpvegas_info    vegas;
         struct tcp_dctcp_info   dctcp;
+        struct tcp_bbr_info     bbr;
 };
 #endif /* _UAPI_INET_DIAG_H_ */
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 395876060f50..8c2772340c3f 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -177,6 +177,7 @@ enum {
         DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
         DEVCONF_DROP_UNSOLICITED_NA,
         DEVCONF_KEEP_ADDR_ON_DOWN,
+        DEVCONF_RTR_SOLICIT_MAX_INTERVAL,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/netfilter/nf_log.h b/include/uapi/linux/netfilter/nf_log.h
new file mode 100644
index 000000000000..8be21e02387d
--- /dev/null
+++ b/include/uapi/linux/netfilter/nf_log.h
@@ -0,0 +1,12 @@
+#ifndef _NETFILTER_NF_LOG_H
+#define _NETFILTER_NF_LOG_H
+
+#define NF_LOG_TCPSEQ           0x01    /* Log TCP sequence numbers */
+#define NF_LOG_TCPOPT           0x02    /* Log TCP options */
+#define NF_LOG_IPOPT            0x04    /* Log IP options */
+#define NF_LOG_UID              0x08    /* Log UID owning local socket */
+#define NF_LOG_NFLOG            0x10    /* Unsupported, don't reuse */
+#define NF_LOG_MACDECODE        0x20    /* Decode MAC header */
+#define NF_LOG_MASK             0x2f
+
+#endif /* _NETFILTER_NF_LOG_H */
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 28ce01d79707..c6c4477c136b 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -546,6 +546,35 @@ enum nft_cmp_attributes {
 };
 #define NFTA_CMP_MAX            (__NFTA_CMP_MAX - 1)
 
+/**
+ * enum nft_range_ops - nf_tables range operator
+ *
+ * @NFT_RANGE_EQ: equal
+ * @NFT_RANGE_NEQ: not equal
+ */
+enum nft_range_ops {
+        NFT_RANGE_EQ,
+        NFT_RANGE_NEQ,
+};
+
+/**
+ * enum nft_range_attributes - nf_tables range expression netlink attributes
+ *
+ * @NFTA_RANGE_SREG: source register of data to compare (NLA_U32: nft_registers)
+ * @NFTA_RANGE_OP: cmp operation (NLA_U32: nft_cmp_ops)
+ * @NFTA_RANGE_FROM_DATA: data range from (NLA_NESTED: nft_data_attributes)
+ * @NFTA_RANGE_TO_DATA: data range to (NLA_NESTED: nft_data_attributes)
+ */
+enum nft_range_attributes {
+        NFTA_RANGE_UNSPEC,
+        NFTA_RANGE_SREG,
+        NFTA_RANGE_OP,
+        NFTA_RANGE_FROM_DATA,
+        NFTA_RANGE_TO_DATA,
+        __NFTA_RANGE_MAX
+};
+#define NFTA_RANGE_MAX          (__NFTA_RANGE_MAX - 1)
+
 enum nft_lookup_flags {
         NFT_LOOKUP_F_INV = (1 << 0),
 };
@@ -575,6 +604,10 @@ enum nft_dynset_ops {
         NFT_DYNSET_OP_UPDATE,
 };
 
+enum nft_dynset_flags {
+        NFT_DYNSET_F_INV        = (1 << 0),
+};
+
 /**
  * enum nft_dynset_attributes - dynset expression attributes
  *
@@ -585,6 +618,7 @@ enum nft_dynset_ops {
  * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
  * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
  * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes)
+ * @NFTA_DYNSET_FLAGS: flags (NLA_U32)
  */
 enum nft_dynset_attributes {
         NFTA_DYNSET_UNSPEC,
@@ -596,6 +630,7 @@ enum nft_dynset_attributes {
         NFTA_DYNSET_TIMEOUT,
         NFTA_DYNSET_EXPR,
         NFTA_DYNSET_PAD,
+        NFTA_DYNSET_FLAGS,
         __NFTA_DYNSET_MAX,
 };
 #define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
@@ -731,6 +766,7 @@ enum nft_meta_keys {
  * @NFTA_HASH_LEN: source data length (NLA_U32)
  * @NFTA_HASH_MODULUS: modulus value (NLA_U32)
  * @NFTA_HASH_SEED: seed value (NLA_U32)
+ * @NFTA_HASH_OFFSET: add this offset value to hash result (NLA_U32)
  */
 enum nft_hash_attributes {
         NFTA_HASH_UNSPEC,
@@ -739,6 +775,7 @@ enum nft_hash_attributes {
         NFTA_HASH_LEN,
         NFTA_HASH_MODULUS,
         NFTA_HASH_SEED,
+        NFTA_HASH_OFFSET,
         __NFTA_HASH_MAX,
 };
 #define NFTA_HASH_MAX   (__NFTA_HASH_MAX - 1)
@@ -886,12 +923,14 @@ enum nft_log_attributes {
  * @NFTA_QUEUE_NUM: netlink queue to send messages to (NLA_U16)
  * @NFTA_QUEUE_TOTAL: number of queues to load balance packets on (NLA_U16)
  * @NFTA_QUEUE_FLAGS: various flags (NLA_U16)
+ * @NFTA_QUEUE_SREG_QNUM: source register of queue number (NLA_U32: nft_registers)
  */
 enum nft_queue_attributes {
         NFTA_QUEUE_UNSPEC,
         NFTA_QUEUE_NUM,
         NFTA_QUEUE_TOTAL,
         NFTA_QUEUE_FLAGS,
+        NFTA_QUEUE_SREG_QNUM,
         __NFTA_QUEUE_MAX
 };
 #define NFTA_QUEUE_MAX          (__NFTA_QUEUE_MAX - 1)
@@ -1126,14 +1165,16 @@ enum nft_trace_types {
  * enum nft_ng_attributes - nf_tables number generator expression netlink attributes
  *
  * @NFTA_NG_DREG: destination register (NLA_U32)
- * @NFTA_NG_UNTIL: source value to increment the counter until reset (NLA_U32)
+ * @NFTA_NG_MODULUS: maximum counter value (NLA_U32)
  * @NFTA_NG_TYPE: operation type (NLA_U32)
+ * @NFTA_NG_OFFSET: offset to be added to the counter (NLA_U32)
  */
 enum nft_ng_attributes {
         NFTA_NG_UNSPEC,
         NFTA_NG_DREG,
-        NFTA_NG_UNTIL,
+        NFTA_NG_MODULUS,
         NFTA_NG_TYPE,
+        NFTA_NG_OFFSET,
         __NFTA_NG_MAX
 };
 #define NFTA_NG_MAX     (__NFTA_NG_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index 9df789709abe..6deb8867c5fc 100644
--- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -231,13 +231,13 @@ enum ctattr_secctx {
 
 enum ctattr_stats_cpu {
         CTA_STATS_UNSPEC,
-        CTA_STATS_SEARCHED,
+        CTA_STATS_SEARCHED,     /* no longer used */
         CTA_STATS_FOUND,
-        CTA_STATS_NEW,
+        CTA_STATS_NEW,          /* no longer used */
         CTA_STATS_INVALID,
         CTA_STATS_IGNORE,
-        CTA_STATS_DELETE,
-        CTA_STATS_DELETE_LIST,
+        CTA_STATS_DELETE,       /* no longer used */
+        CTA_STATS_DELETE_LIST,  /* no longer used */
         CTA_STATS_INSERT,
         CTA_STATS_INSERT_FAILED,
         CTA_STATS_DROP,
diff --git a/include/uapi/linux/netfilter/xt_hashlimit.h b/include/uapi/linux/netfilter/xt_hashlimit.h
index 6db90372f09c..3efc0ca18345 100644
--- a/include/uapi/linux/netfilter/xt_hashlimit.h
+++ b/include/uapi/linux/netfilter/xt_hashlimit.h
@@ -6,6 +6,7 @@
 
 /* timings are in milliseconds. */
 #define XT_HASHLIMIT_SCALE 10000
+#define XT_HASHLIMIT_SCALE_v2 1000000llu
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
  * seconds, or one packet every 59 hours.
  */
@@ -63,6 +64,20 @@ struct hashlimit_cfg1 {
         __u8 srcmask, dstmask;
 };
 
+struct hashlimit_cfg2 {
+        __u64 avg;              /* Average secs between packets * scale */
+        __u64 burst;            /* Period multiplier for upper limit. */
+        __u32 mode;             /* bitmask of XT_HASHLIMIT_HASH_* */
+
+        /* user specified */
+        __u32 size;             /* how many buckets */
+        __u32 max;              /* max number of entries */
+        __u32 gc_interval;      /* gc interval */
+        __u32 expire;           /* when do entries expire? */
+
+        __u8 srcmask, dstmask;
+};
+
 struct xt_hashlimit_mtinfo1 {
         char name[IFNAMSIZ];
         struct hashlimit_cfg1 cfg;
@@ -71,4 +86,12 @@ struct xt_hashlimit_mtinfo1 {
         struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
 };
 
+struct xt_hashlimit_mtinfo2 {
+        char name[NAME_MAX];
+        struct hashlimit_cfg2 cfg;
+
+        /* Used internally by the kernel */
+        struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
+};
+
 #endif /* _UAPI_XT_HASHLIMIT_H */
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 8915b61bbf83..8fd715f806a2 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -396,6 +396,7 @@ enum {
         TCA_BPF_FD,
         TCA_BPF_NAME,
         TCA_BPF_FLAGS,
+        TCA_BPF_FLAGS_GEN,
         __TCA_BPF_MAX,
 };
 
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 2382eed50278..df7451d35131 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -792,6 +792,8 @@ enum {
 
         TCA_FQ_ORPHAN_MASK,     /* mask applied to orphaned skb hashes */
 
+        TCA_FQ_LOW_RATE_THRESHOLD, /* per packet delay under this rate */
+
         __TCA_FQ_MAX
 };
 
@@ -809,7 +811,7 @@ struct tc_fq_qd_stats {
         __u32   flows;
         __u32   inactive_flows;
         __u32   throttled_flows;
-        __u32   pad;
+        __u32   unthrottle_latency_ns;
 };
 
 /* Heavy-Hitter Filter */
diff --git a/include/uapi/linux/tc_act/tc_ife.h b/include/uapi/linux/tc_act/tc_ife.h
index 4ece02a77b9a..cd18360eca24 100644
--- a/include/uapi/linux/tc_act/tc_ife.h
+++ b/include/uapi/linux/tc_act/tc_ife.h
@@ -32,8 +32,9 @@ enum {
 #define IFE_META_HASHID 2
 #define IFE_META_PRIO 3
 #define IFE_META_QMAP 4
+#define IFE_META_TCINDEX 5
 /*Can be overridden at runtime by module option*/
-#define __IFE_META_MAX 5
+#define __IFE_META_MAX 6
 #define IFE_META_MAX (__IFE_META_MAX - 1)
 
 #endif
diff --git a/include/uapi/linux/tc_act/tc_vlan.h b/include/uapi/linux/tc_act/tc_vlan.h
index be72b6e3843b..bddb272b843f 100644
--- a/include/uapi/linux/tc_act/tc_vlan.h
+++ b/include/uapi/linux/tc_act/tc_vlan.h
@@ -16,6 +16,7 @@
 
 #define TCA_VLAN_ACT_POP        1
 #define TCA_VLAN_ACT_PUSH       2
+#define TCA_VLAN_ACT_MODIFY     3
 
 struct tc_vlan {
         tc_gen;
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 482898fc433a..73ac0db487f8 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -167,6 +167,7 @@ struct tcp_info {
         __u8    tcpi_backoff;
         __u8    tcpi_options;
         __u8    tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+        __u8    tcpi_delivery_rate_app_limited:1;
 
         __u32   tcpi_rto;
         __u32   tcpi_ato;
@@ -211,6 +212,8 @@ struct tcp_info {
         __u32   tcpi_min_rtt;
         __u32   tcpi_data_segs_in;      /* RFC4898 tcpEStatsDataSegsIn */
         __u32   tcpi_data_segs_out;     /* RFC4898 tcpEStatsDataSegsOut */
+
+        __u64   tcpi_delivery_rate;
 };
 
 /* for TCP_MD5SIG socket option */
diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 143338978b48..1fc62b239f1b 100644
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -298,7 +298,7 @@ enum xfrm_attr_type_t {
         XFRMA_ALG_AUTH_TRUNC,   /* struct xfrm_algo_auth */
         XFRMA_MARK,             /* struct xfrm_mark */
         XFRMA_TFCPAD,           /* __u32 */
-        XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_esn */
+        XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_state_esn */
         XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
         XFRMA_PROTO,            /* __u8 */
         XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */