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

Pull networking updates from David Miller:

 1) New ipset extensions for matching on destination MAC addresses, from
    Stefano Brivio.

 2) Add ipv4 ttl and tos, plus ipv6 flow label and hop limit offloads to
    nfp driver. From Stefano Brivio.

 3) Implement GRO for plain UDP sockets, from Paolo Abeni.

 4) Lots of work from Michał Mirosław to eliminate the VLAN_TAG_PRESENT
    bit so that we could support the entire vlan_tci value.

 5) Rework the IPSEC policy lookups to better optimize more usecases,
    from Florian Westphal.

 6) Infrastructure changes eliminating direct manipulation of SKB lists
    wherever possible, and to always use the appropriate SKB list
    helpers. This work is still ongoing...

 7) Lots of PHY driver and state machine improvements and
    simplifications, from Heiner Kallweit.

 8) Various TSO deferral refinements, from Eric Dumazet.

 9) Add ntuple filter support to aquantia driver, from Dmitry Bogdanov.

10) Batch dropping of XDP packets in tuntap, from Jason Wang.

11) Lots of cleanups and improvements to the r8169 driver from Heiner
    Kallweit, including support for ->xmit_more. This driver has been
    getting some much needed love since he started working on it.

12) Lots of new forwarding selftests from Petr Machata.

13) Enable VXLAN learning in mlxsw driver, from Ido Schimmel.

14) Packed ring support for virtio, from Tiwei Bie.

15) Add new Aquantia AQtion USB driver, from Dmitry Bezrukov.

16) Add XDP support to dpaa2-eth driver, from Ioana Ciocoi Radulescu.

17) Implement coalescing on TCP backlog queue, from Eric Dumazet.

18) Implement carrier change in tun driver, from Nicolas Dichtel.

19) Support msg_zerocopy in UDP, from Willem de Bruijn.

20) Significantly improve garbage collection of neighbor objects when
    the table has many PERMANENT entries, from David Ahern.

21) Remove egdev usage from nfp and mlx5, and remove the facility
    completely from the tree as it no longer has any users. From Oz
    Shlomo and others.

22) Add a NETDEV_PRE_CHANGEADDR so that drivers can veto the change and
    therefore abort the operation before the commit phase (which is the
    NETDEV_CHANGEADDR event). From Petr Machata.

23) Add indirect call wrappers to avoid retpoline overhead, and use them
    in the GRO code paths. From Paolo Abeni.

24) Add support for netlink FDB get operations, from Roopa Prabhu.

25) Support bloom filter in mlxsw driver, from Nir Dotan.

26) Add SKB extension infrastructure. This consolidates the handling of
    the auxiliary SKB data used by IPSEC and bridge netfilter, and is
    designed to support the needs to MPTCP which could be integrated in
    the future.

27) Lots of XDP TX optimizations in mlx5 from Tariq Toukan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1845 commits)
  net: dccp: fix kernel crash on module load
  drivers/net: appletalk/cops: remove redundant if statement and mask
  bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
  net/net_namespace: Check the return value of register_pernet_subsys()
  net/netlink_compat: Fix a missing check of nla_parse_nested
  ieee802154: lowpan_header_create check must check daddr
  net/mlx4_core: drop useless LIST_HEAD
  mlxsw: spectrum: drop useless LIST_HEAD
  net/mlx5e: drop useless LIST_HEAD
  iptunnel: Set tun_flags in the iptunnel_metadata_reply from src
  net/mlx5e: fix semicolon.cocci warnings
  staging: octeon: fix build failure with XFRM enabled
  net: Revert recent Spectre-v1 patches.
  can: af_can: Fix Spectre v1 vulnerability
  packet: validate address length if non-zero
  nfc: af_nfc: Fix Spectre v1 vulnerability
  phonet: af_phonet: Fix Spectre v1 vulnerability
  net: core: Fix Spectre v1 vulnerability
  net: minor cleanup in skb_ext_add()
  net: drop the unused helper skb_ext_get()
  ...

2 files changed, 174 insertions, 52 deletions

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 72c453a8bf50..91c43884f295 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -133,6 +133,14 @@ enum bpf_map_type {
         BPF_MAP_TYPE_STACK,
 };
 
+/* Note that tracing related programs such as
+ * BPF_PROG_TYPE_{KPROBE,TRACEPOINT,PERF_EVENT,RAW_TRACEPOINT}
+ * are not subject to a stable API since kernel internal data
+ * structures can change from release to release and may
+ * therefore break existing tracing BPF programs. Tracing BPF
+ * programs correspond to /a/ specific kernel which is to be
+ * analyzed, and not /a/ specific kernel /and/ all future ones.
+ */
 enum bpf_prog_type {
         BPF_PROG_TYPE_UNSPEC,
         BPF_PROG_TYPE_SOCKET_FILTER,
@@ -232,6 +240,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 +279,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 +288,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,
@@ -326,7 +351,7 @@ union bpf_attr {
                 __u32           log_level;      /* verbosity level of verifier */
                 __u32           log_size;       /* size of user buffer */
                 __aligned_u64   log_buf;        /* user supplied buffer */
-                __u32           kern_version;   /* checked when prog_type=kprobe */
+                __u32           kern_version;   /* not used */
                 __u32           prog_flags;
                 char            prog_name[BPF_OBJ_NAME_LEN];
                 __u32           prog_ifindex;   /* ifindex of netdev to prep for */
@@ -335,6 +360,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 +385,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 +510,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 +1933,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 +1944,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 +2091,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 +2175,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 +2198,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 +2226,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 +2262,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 +2419,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 +2538,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 {
@@ -2599,6 +2665,7 @@ struct sk_msg_md {
         __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 */
+        __u32 size;             /* Total size of sk_msg */
 };
 
 struct sk_reuseport_md {
@@ -2649,6 +2716,18 @@ 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;
+        __u32 nr_prog_tags;
+        __aligned_u64 prog_tags;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {
@@ -2960,4 +3039,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 /* _UAPI__LINUX_BPF_H__ */
diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index 972265f32871..7b7475ef2f17 100644
--- a/tools/include/uapi/linux/btf.h
+++ b/tools/include/uapi/linux/btf.h
@@ -34,13 +34,16 @@ struct btf_type {
          * bits  0-15: vlen (e.g. # of struct's members)
          * bits 16-23: unused
          * bits 24-27: kind (e.g. int, ptr, array...etc)
-         * bits 28-31: unused
+         * bits 28-30: unused
+         * bit     31: kind_flag, currently used by
+         *             struct, union and fwd
          */
         __u32 info;
         /* "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 {
@@ -51,6 +54,7 @@ struct btf_type {
 
 #define BTF_INFO_KIND(info)     (((info) >> 24) & 0x0f)
 #define BTF_INFO_VLEN(info)     ((info) & 0xffff)
+#define BTF_INFO_KFLAG(info)    ((info) >> 31)
 
 #define BTF_KIND_UNKN           0       /* Unknown      */
 #define BTF_KIND_INT            1       /* Integer      */
@@ -64,8 +68,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.
@@ -107,7 +113,29 @@ struct btf_array {
 struct btf_member {
         __u32   name_off;
         __u32   type;
-        __u32   offset; /* offset in bits */
+        /* If the type info kind_flag is set, the btf_member offset
+         * contains both member bitfield size and bit offset. The
+         * bitfield size is set for bitfield members. If the type
+         * info kind_flag is not set, the offset contains only bit
+         * offset.
+         */
+        __u32   offset;
+};
+
+/* If the struct/union type info kind_flag is set, the
+ * following two macros are used to access bitfield_size
+ * and bit_offset from btf_member.offset.
+ */
+#define BTF_MEMBER_BITFIELD_SIZE(val)   ((val) >> 24)
+#define BTF_MEMBER_BIT_OFFSET(val)      ((val) & 0xffffff)
+
+/* 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 /* _UAPI__LINUX_BTF_H__ */