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>

5 files changed, 56 insertions, 30 deletions

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 6a8a00097fd8..9ddc89dae962 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -89,8 +89,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
                min(name_len, BPF_OBJ_NAME_LEN - 1));
         attr.numa_node = create_attr->numa_node;
         attr.btf_fd = create_attr->btf_fd;
-        attr.btf_key_id = create_attr->btf_key_id;
-        attr.btf_value_id = create_attr->btf_value_id;
+        attr.btf_key_type_id = create_attr->btf_key_type_id;
+        attr.btf_value_type_id = create_attr->btf_value_type_id;
         attr.map_ifindex = create_attr->map_ifindex;
 
         return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
@@ -643,3 +643,26 @@ retry:
 
         return fd;
 }
+
+int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len,
+                      __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset,
+                      __u64 *probe_addr)
+{
+        union bpf_attr attr = {};
+        int err;
+
+        attr.task_fd_query.pid = pid;
+        attr.task_fd_query.fd = fd;
+        attr.task_fd_query.flags = flags;
+        attr.task_fd_query.buf = ptr_to_u64(buf);
+        attr.task_fd_query.buf_len = *buf_len;
+
+        err = sys_bpf(BPF_TASK_FD_QUERY, &attr, sizeof(attr));
+        *buf_len = attr.task_fd_query.buf_len;
+        *prog_id = attr.task_fd_query.prog_id;
+        *fd_type = attr.task_fd_query.fd_type;
+        *probe_offset = attr.task_fd_query.probe_offset;
+        *probe_addr = attr.task_fd_query.probe_addr;
+
+        return err;
+}
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 15bff7728cf1..0639a30a457d 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -36,8 +36,8 @@ struct bpf_create_map_attr {
         __u32 max_entries;
         __u32 numa_node;
         __u32 btf_fd;
-        __u32 btf_key_id;
-        __u32 btf_value_id;
+        __u32 btf_key_type_id;
+        __u32 btf_value_type_id;
         __u32 map_ifindex;
 };
 
@@ -107,4 +107,7 @@ int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,
 int bpf_raw_tracepoint_open(const char *name, int prog_fd);
 int bpf_load_btf(void *btf, __u32 btf_size, char *log_buf, __u32 log_buf_size,
                  bool do_log);
+int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len,
+                      __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset,
+                      __u64 *probe_addr);
 #endif
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 2bac710e3194..8c54a4b6f187 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -35,9 +35,8 @@ struct btf {
 
 static const char *btf_name_by_offset(const struct btf *btf, uint32_t offset)
 {
-        if (!BTF_STR_TBL_ELF_ID(offset) &&
-            BTF_STR_OFFSET(offset) < btf->hdr->str_len)
-                return &btf->strings[BTF_STR_OFFSET(offset)];
+        if (offset < btf->hdr->str_len)
+                return &btf->strings[offset];
         else
                 return NULL;
 }
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index cbdf34a6fb93..d20411ebfa2f 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -216,8 +216,8 @@ struct bpf_map {
         size_t offset;
         int map_ifindex;
         struct bpf_map_def def;
-        uint32_t btf_key_id;
-        uint32_t btf_value_id;
+        uint32_t btf_key_type_id;
+        uint32_t btf_value_type_id;
         void *priv;
         bpf_map_clear_priv_t clear_priv;
 };
@@ -1042,8 +1042,8 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf)
         }
 
         if (def->key_size != key_size) {
-                pr_warning("map:%s key_type:%s has BTF type_size:%ld != key_size:%u\n",
-                           map->name, name, key_size, def->key_size);
+                pr_warning("map:%s key_type:%s has BTF type_size:%u != key_size:%u\n",
+                           map->name, name, (unsigned int)key_size, def->key_size);
                 return -EINVAL;
         }
 
@@ -1069,13 +1069,13 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf)
         }
 
         if (def->value_size != value_size) {
-                pr_warning("map:%s value_type:%s has BTF type_size:%ld != value_size:%u\n",
-                           map->name, name, value_size, def->value_size);
+                pr_warning("map:%s value_type:%s has BTF type_size:%u != value_size:%u\n",
+                           map->name, name, (unsigned int)value_size, def->value_size);
                 return -EINVAL;
         }
 
-        map->btf_key_id = key_id;
-        map->btf_value_id = value_id;
+        map->btf_key_type_id = key_id;
+        map->btf_value_type_id = value_id;
 
         return 0;
 }
@@ -1100,24 +1100,24 @@ bpf_object__create_maps(struct bpf_object *obj)
                 create_attr.value_size = def->value_size;
                 create_attr.max_entries = def->max_entries;
                 create_attr.btf_fd = 0;
-                create_attr.btf_key_id = 0;
-                create_attr.btf_value_id = 0;
+                create_attr.btf_key_type_id = 0;
+                create_attr.btf_value_type_id = 0;
 
                 if (obj->btf && !bpf_map_find_btf_info(map, obj->btf)) {
                         create_attr.btf_fd = btf__fd(obj->btf);
-                        create_attr.btf_key_id = map->btf_key_id;
-                        create_attr.btf_value_id = map->btf_value_id;
+                        create_attr.btf_key_type_id = map->btf_key_type_id;
+                        create_attr.btf_value_type_id = map->btf_value_type_id;
                 }
 
                 *pfd = bpf_create_map_xattr(&create_attr);
-                if (*pfd < 0 && create_attr.btf_key_id) {
+                if (*pfd < 0 && create_attr.btf_key_type_id) {
                         pr_warning("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",
                                    map->name, strerror(errno), errno);
                         create_attr.btf_fd = 0;
-                        create_attr.btf_key_id = 0;
-                        create_attr.btf_value_id = 0;
-                        map->btf_key_id = 0;
-                        map->btf_value_id = 0;
+                        create_attr.btf_key_type_id = 0;
+                        create_attr.btf_value_type_id = 0;
+                        map->btf_key_type_id = 0;
+                        map->btf_value_type_id = 0;
                         *pfd = bpf_create_map_xattr(&create_attr);
                 }
 
@@ -1456,6 +1456,7 @@ static bool bpf_prog_type__needs_kver(enum bpf_prog_type type)
         case BPF_PROG_TYPE_LWT_IN:
         case BPF_PROG_TYPE_LWT_OUT:
         case BPF_PROG_TYPE_LWT_XMIT:
+        case BPF_PROG_TYPE_LWT_SEG6LOCAL:
         case BPF_PROG_TYPE_SOCK_OPS:
         case BPF_PROG_TYPE_SK_SKB:
         case BPF_PROG_TYPE_CGROUP_DEVICE:
@@ -2085,14 +2086,14 @@ const char *bpf_map__name(struct bpf_map *map)
         return map ? map->name : NULL;
 }
 
-uint32_t bpf_map__btf_key_id(const struct bpf_map *map)
+uint32_t bpf_map__btf_key_type_id(const struct bpf_map *map)
 {
-        return map ? map->btf_key_id : 0;
+        return map ? map->btf_key_type_id : 0;
 }
 
-uint32_t bpf_map__btf_value_id(const struct bpf_map *map)
+uint32_t bpf_map__btf_value_type_id(const struct bpf_map *map)
 {
-        return map ? map->btf_value_id : 0;
+        return map ? map->btf_value_type_id : 0;
 }
 
 int bpf_map__set_priv(struct bpf_map *map, void *priv,
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index cd3fd8d782c7..09976531aa74 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -244,8 +244,8 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj);
 int bpf_map__fd(struct bpf_map *map);
 const struct bpf_map_def *bpf_map__def(struct bpf_map *map);
 const char *bpf_map__name(struct bpf_map *map);
-uint32_t bpf_map__btf_key_id(const struct bpf_map *map);
-uint32_t bpf_map__btf_value_id(const struct bpf_map *map);
+uint32_t bpf_map__btf_key_type_id(const struct bpf_map *map);
+uint32_t bpf_map__btf_value_type_id(const struct bpf_map *map);
 
 typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
 int bpf_map__set_priv(struct bpf_map *map, void *priv,