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

Alexei Starovoitov says:

====================
pull-request: bpf-next 2018-05-24

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) Björn Töpel cleans up AF_XDP (removes rebind, explicit cache alignment from uapi, etc).

2) David Ahern adds mtu checks to bpf_ipv{4,6}_fib_lookup() helpers.

3) Jesper Dangaard Brouer adds bulking support to ndo_xdp_xmit.

4) Jiong Wang adds support for indirect and arithmetic shifts to NFP

5) Martin KaFai Lau cleans up BTF uapi and makes the btf_header extensible.

6) Mathieu Xhonneux adds an End.BPF action to seg6local with BPF helpers allowing
   to edit/grow/shrink a SRH and apply on a packet generic SRv6 actions.

7) Sandipan Das adds support for bpf2bpf function calls in ppc64 JIT.

8) Yonghong Song adds BPF_TASK_FD_QUERY command for introspection of tracing events.

9) other misc fixes from Gustavo A. R. Silva, Sirio Balmelli, John Fastabend, and Magnus Karlsson
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 149 insertions, 31 deletions

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index d94d333a8225..9b8c6e310e9a 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -97,6 +97,7 @@ enum bpf_cmd {
         BPF_RAW_TRACEPOINT_OPEN,
         BPF_BTF_LOAD,
         BPF_BTF_GET_FD_BY_ID,
+        BPF_TASK_FD_QUERY,
 };
 
 enum bpf_map_type {
@@ -141,6 +142,7 @@ enum bpf_prog_type {
         BPF_PROG_TYPE_SK_MSG,
         BPF_PROG_TYPE_RAW_TRACEPOINT,
         BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
+        BPF_PROG_TYPE_LWT_SEG6LOCAL,
 };
 
 enum bpf_attach_type {
@@ -284,8 +286,8 @@ union bpf_attr {
                 char    map_name[BPF_OBJ_NAME_LEN];
                 __u32   map_ifindex;    /* ifindex of netdev to create on */
                 __u32   btf_fd;         /* fd pointing to a BTF type data */
-                __u32   btf_key_id;     /* BTF type_id of the key */
-                __u32   btf_value_id;   /* BTF type_id of the value */
+                __u32   btf_key_type_id;        /* BTF type_id of the key */
+                __u32   btf_value_type_id;      /* BTF type_id of the value */
         };
 
         struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
@@ -379,6 +381,22 @@ union bpf_attr {
                 __u32           btf_log_size;
                 __u32           btf_log_level;
         };
+
+        struct {
+                __u32           pid;            /* input: pid */
+                __u32           fd;             /* input: fd */
+                __u32           flags;          /* input: flags */
+                __u32           buf_len;        /* input/output: buf len */
+                __aligned_u64   buf;            /* input/output:
+                                                 *   tp_name for tracepoint
+                                                 *   symbol for kprobe
+                                                 *   filename for uprobe
+                                                 */
+                __u32           prog_id;        /* output: prod_id */
+                __u32           fd_type;        /* output: BPF_FD_TYPE_* */
+                __u64           probe_offset;   /* output: probe_offset */
+                __u64           probe_addr;     /* output: probe_addr */
+        } task_fd_query;
 } __attribute__((aligned(8)));
 
 /* The description below is an attempt at providing documentation to eBPF
@@ -1902,6 +1920,90 @@ union bpf_attr {
  *              egress otherwise). This is the only flag supported for now.
  *      Return
  *              **SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * int bpf_lwt_push_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len)
+ *      Description
+ *              Encapsulate the packet associated to *skb* within a Layer 3
+ *              protocol header. This header is provided in the buffer at
+ *              address *hdr*, with *len* its size in bytes. *type* indicates
+ *              the protocol of the header and can be one of:
+ *
+ *              **BPF_LWT_ENCAP_SEG6**
+ *                      IPv6 encapsulation with Segment Routing Header
+ *                      (**struct ipv6_sr_hdr**). *hdr* only contains the SRH,
+ *                      the IPv6 header is computed by the kernel.
+ *              **BPF_LWT_ENCAP_SEG6_INLINE**
+ *                      Only works if *skb* contains an IPv6 packet. Insert a
+ *                      Segment Routing Header (**struct ipv6_sr_hdr**) inside
+ *                      the IPv6 header.
+ *
+ *              A call to this helper is susceptible to change the underlaying
+ *              packet buffer. Therefore, at load time, all checks on pointers
+ *              previously done by the verifier are invalidated and must be
+ *              performed again, if the helper is used in combination with
+ *              direct packet access.
+ *      Return
+ *              0 on success, or a negative error in case of failure.
+ *
+ * int bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len)
+ *      Description
+ *              Store *len* bytes from address *from* into the packet
+ *              associated to *skb*, at *offset*. Only the flags, tag and TLVs
+ *              inside the outermost IPv6 Segment Routing Header can be
+ *              modified through this helper.
+ *
+ *              A call to this helper is susceptible to change the underlaying
+ *              packet buffer. Therefore, at load time, all checks on pointers
+ *              previously done by the verifier are invalidated and must be
+ *              performed again, if the helper is used in combination with
+ *              direct packet access.
+ *      Return
+ *              0 on success, or a negative error in case of failure.
+ *
+ * int bpf_lwt_seg6_adjust_srh(struct sk_buff *skb, u32 offset, s32 delta)
+ *      Description
+ *              Adjust the size allocated to TLVs in the outermost IPv6
+ *              Segment Routing Header contained in the packet associated to
+ *              *skb*, at position *offset* by *delta* bytes. Only offsets
+ *              after the segments are accepted. *delta* can be as well
+ *              positive (growing) as negative (shrinking).
+ *
+ *              A call to this helper is susceptible to change the underlaying
+ *              packet buffer. Therefore, at load time, all checks on pointers
+ *              previously done by the verifier are invalidated and must be
+ *              performed again, if the helper is used in combination with
+ *              direct packet access.
+ *      Return
+ *              0 on success, or a negative error in case of failure.
+ *
+ * int bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32 param_len)
+ *      Description
+ *              Apply an IPv6 Segment Routing action of type *action* to the
+ *              packet associated to *skb*. Each action takes a parameter
+ *              contained at address *param*, and of length *param_len* bytes.
+ *              *action* can be one of:
+ *
+ *              **SEG6_LOCAL_ACTION_END_X**
+ *                      End.X action: Endpoint with Layer-3 cross-connect.
+ *                      Type of *param*: **struct in6_addr**.
+ *              **SEG6_LOCAL_ACTION_END_T**
+ *                      End.T action: Endpoint with specific IPv6 table lookup.
+ *                      Type of *param*: **int**.
+ *              **SEG6_LOCAL_ACTION_END_B6**
+ *                      End.B6 action: Endpoint bound to an SRv6 policy.
+ *                      Type of param: **struct ipv6_sr_hdr**.
+ *              **SEG6_LOCAL_ACTION_END_B6_ENCAP**
+ *                      End.B6.Encap action: Endpoint bound to an SRv6
+ *                      encapsulation policy.
+ *                      Type of param: **struct ipv6_sr_hdr**.
+ *
+ *              A call to this helper is susceptible to change the underlaying
+ *              packet buffer. Therefore, at load time, all checks on pointers
+ *              previously done by the verifier are invalidated and must be
+ *              performed again, if the helper is used in combination with
+ *              direct packet access.
+ *      Return
+ *              0 on success, or a negative error in case of failure.
  */
 #define __BPF_FUNC_MAPPER(FN)           \
         FN(unspec),                     \
@@ -1976,7 +2078,11 @@ union bpf_attr {
         FN(fib_lookup),                 \
         FN(sock_hash_update),           \
         FN(msg_redirect_hash),          \
-        FN(sk_redirect_hash),
+        FN(sk_redirect_hash),           \
+        FN(lwt_push_encap),             \
+        FN(lwt_seg6_store_bytes),       \
+        FN(lwt_seg6_adjust_srh),        \
+        FN(lwt_seg6_action),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
@@ -2043,6 +2149,12 @@ enum bpf_hdr_start_off {
         BPF_HDR_START_NET,
 };
 
+/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */
+enum bpf_lwt_encap_mode {
+        BPF_LWT_ENCAP_SEG6,
+        BPF_LWT_ENCAP_SEG6_INLINE
+};
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
@@ -2176,6 +2288,14 @@ enum sk_action {
 struct sk_msg_md {
         void *data;
         void *data_end;
+
+        __u32 family;
+        __u32 remote_ip4;       /* Stored in network byte order */
+        __u32 local_ip4;        /* Stored in network byte order */
+        __u32 remote_ip6[4];    /* Stored in network byte order */
+        __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 */
 };
 
 #define BPF_TAG_SIZE    8
@@ -2197,6 +2317,10 @@ struct bpf_prog_info {
         __u32 gpl_compatible:1;
         __u64 netns_dev;
         __u64 netns_ino;
+        __u32 nr_jited_ksyms;
+        __u32 nr_jited_func_lens;
+        __aligned_u64 jited_ksyms;
+        __aligned_u64 jited_func_lens;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {
@@ -2211,8 +2335,8 @@ struct bpf_map_info {
         __u64 netns_dev;
         __u64 netns_ino;
         __u32 btf_id;
-        __u32 btf_key_id;
-        __u32 btf_value_id;
+        __u32 btf_key_type_id;
+        __u32 btf_value_type_id;
 } __attribute__((aligned(8)));
 
 struct bpf_btf_info {
@@ -2450,4 +2574,13 @@ struct bpf_fib_lookup {
         __u8    dmac[6];     /* ETH_ALEN */
 };
 
+enum bpf_task_fd_type {
+        BPF_FD_TYPE_RAW_TRACEPOINT,     /* tp name */
+        BPF_FD_TYPE_TRACEPOINT,         /* tp name */
+        BPF_FD_TYPE_KPROBE,             /* (symbol + offset) or addr */
+        BPF_FD_TYPE_KRETPROBE,          /* (symbol + offset) or addr */
+        BPF_FD_TYPE_UPROBE,             /* filename + offset */
+        BPF_FD_TYPE_URETPROBE,          /* filename + offset */
+};
+
 #endif /* _UAPI__LINUX_BPF_H__ */
diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index bcb56ee47014..0b5ddbe135a4 100644
--- a/tools/include/uapi/linux/btf.h
+++ b/tools/include/uapi/linux/btf.h
@@ -12,42 +12,29 @@ struct btf_header {
         __u16   magic;
         __u8    version;
         __u8    flags;
-
-        __u32   parent_label;
-        __u32   parent_name;
+        __u32   hdr_len;
 
         /* All offsets are in bytes relative to the end of this header */
-        __u32   label_off;      /* offset of label section      */
-        __u32   object_off;     /* offset of data object section*/
-        __u32   func_off;       /* offset of function section   */
         __u32   type_off;       /* offset of type section       */
+        __u32   type_len;       /* length of type section       */
         __u32   str_off;        /* offset of string section     */
         __u32   str_len;        /* length of string section     */
 };
 
 /* Max # of type identifier */
-#define BTF_MAX_TYPE    0x7fffffff
+#define BTF_MAX_TYPE    0x0000ffff
 /* Max offset into the string section */
-#define BTF_MAX_NAME_OFFSET     0x7fffffff
+#define BTF_MAX_NAME_OFFSET     0x0000ffff
 /* Max # of struct/union/enum members or func args */
 #define BTF_MAX_VLEN    0xffff
 
-/* The type id is referring to a parent BTF */
-#define BTF_TYPE_PARENT(id)     (((id) >> 31) & 0x1)
-#define BTF_TYPE_ID(id)         ((id) & BTF_MAX_TYPE)
-
-/* String is in the ELF string section */
-#define BTF_STR_TBL_ELF_ID(ref) (((ref) >> 31) & 0x1)
-#define BTF_STR_OFFSET(ref)     ((ref) & BTF_MAX_NAME_OFFSET)
-
 struct btf_type {
         __u32 name_off;
         /* "info" bits arrangement
          * bits  0-15: vlen (e.g. # of struct's members)
          * bits 16-23: unused
-         * bits 24-28: kind (e.g. int, ptr, array...etc)
-         * bits 29-30: unused
-         * bits    31: root
+         * bits 24-27: kind (e.g. int, ptr, array...etc)
+         * bits 28-31: unused
          */
         __u32 info;
         /* "size" is used by INT, ENUM, STRUCT and UNION.
@@ -62,8 +49,7 @@ struct btf_type {
         };
 };
 
-#define BTF_INFO_KIND(info)     (((info) >> 24) & 0x1f)
-#define BTF_INFO_ISROOT(info)   (!!(((info) >> 24) & 0x80))
+#define BTF_INFO_KIND(info)     (((info) >> 24) & 0x0f)
 #define BTF_INFO_VLEN(info)     ((info) & 0xffff)
 
 #define BTF_KIND_UNKN           0       /* Unknown      */
@@ -88,15 +74,14 @@ struct btf_type {
 /* BTF_KIND_INT is followed by a u32 and the following
  * is the 32 bits arrangement:
  */
-#define BTF_INT_ENCODING(VAL)   (((VAL) & 0xff000000) >> 24)
+#define BTF_INT_ENCODING(VAL)   (((VAL) & 0x0f000000) >> 24)
 #define BTF_INT_OFFSET(VAL)     (((VAL  & 0x00ff0000)) >> 16)
 #define BTF_INT_BITS(VAL)       ((VAL)  & 0x0000ffff)
 
 /* Attributes stored in the BTF_INT_ENCODING */
-#define BTF_INT_SIGNED  0x1
-#define BTF_INT_CHAR    0x2
-#define BTF_INT_BOOL    0x4
-#define BTF_INT_VARARGS 0x8
+#define BTF_INT_SIGNED  (1 << 0)
+#define BTF_INT_CHAR    (1 << 1)
+#define BTF_INT_BOOL    (1 << 2)
 
 /* BTF_KIND_ENUM is followed by multiple "struct btf_enum".
  * The exact number of btf_enum is stored in the vlen (of the