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

Daniel Borkmann says:

====================
pull-request: bpf-next 2018-08-07

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

The main changes are:

1) Add cgroup local storage for BPF programs, which provides a fast
   accessible memory for storing various per-cgroup data like number
   of transmitted packets, etc, from Roman.

2) Support bpf_get_socket_cookie() BPF helper in several more program
   types that have a full socket available, from Andrey.

3) Significantly improve the performance of perf events which are
   reported from BPF offload. Also convert a couple of BPF AF_XDP
   samples overto use libbpf, both from Jakub.

4) seg6local LWT provides the End.DT6 action, which allows to
   decapsulate an outer IPv6 header containing a Segment Routing Header.
   Adds this action now to the seg6local BPF interface, from Mathieu.

5) Do not mark dst register as unbounded in MOV64 instruction when
   both src and dst register are the same, from Arthur.

6) Define u_smp_rmb() and u_smp_wmb() to their respective barrier
   instructions on arm64 for the AF_XDP sample code, from Brian.

7) Convert the tcp_client.py and tcp_server.py BPF selftest scripts
   over from Python 2 to Python 3, from Jeremy.

8) Enable BTF build flags to the BPF sample code Makefile, from Taeung.

9) Remove an unnecessary rcu_read_lock() in run_lwt_bpf(), from Taehee.

10) Several improvements to the README.rst from the BPF documentation
    to make it more consistent with RST format, from Tobin.

11) Replace all occurrences of strerror() by calls to strerror_r()
    in libbpf and fix a FORTIFY_SOURCE build error along with it,
    from Thomas.

12) Fix a bug in bpftool's get_btf() function to correctly propagate
    an error via PTR_ERR(), from Yue.
====================

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

2 files changed, 47 insertions, 13 deletions

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 26e9527ee464..40211b51427a 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -468,8 +468,10 @@ static int bpf_object__elf_init(struct bpf_object *obj)
         } else {
                 obj->efile.fd = open(obj->path, O_RDONLY);
                 if (obj->efile.fd < 0) {
-                        pr_warning("failed to open %s: %s\n", obj->path,
-                                        strerror(errno));
+                        char errmsg[STRERR_BUFSIZE];
+                        char *cp = strerror_r(errno, errmsg, sizeof(errmsg));
+
+                        pr_warning("failed to open %s: %s\n", obj->path, cp);
                         return -errno;
                 }
 
@@ -808,10 +810,11 @@ static int bpf_object__elf_collect(struct bpf_object *obj)
                                                       data->d_size, name, idx);
                         if (err) {
                                 char errmsg[STRERR_BUFSIZE];
+                                char *cp = strerror_r(-err, errmsg,
+                                                      sizeof(errmsg));
 
-                                strerror_r(-err, errmsg, sizeof(errmsg));
                                 pr_warning("failed to alloc program %s (%s): %s",
-                                           name, obj->path, errmsg);
+                                           name, obj->path, cp);
                         }
                 } else if (sh.sh_type == SHT_REL) {
                         void *reloc = obj->efile.reloc;
@@ -874,6 +877,18 @@ bpf_object__find_prog_by_idx(struct bpf_object *obj, int idx)
         return NULL;
 }
 
+struct bpf_program *
+bpf_object__find_program_by_title(struct bpf_object *obj, const char *title)
+{
+        struct bpf_program *pos;
+
+        bpf_object__for_each_program(pos, obj) {
+                if (pos->section_name && !strcmp(pos->section_name, title))
+                        return pos;
+        }
+        return NULL;
+}
+
 static int
 bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr,
                            Elf_Data *data, struct bpf_object *obj)
@@ -1097,6 +1112,7 @@ bpf_object__create_maps(struct bpf_object *obj)
         for (i = 0; i < obj->nr_maps; i++) {
                 struct bpf_map *map = &obj->maps[i];
                 struct bpf_map_def *def = &map->def;
+                char *cp, errmsg[STRERR_BUFSIZE];
                 int *pfd = &map->fd;
 
                 if (map->fd >= 0) {
@@ -1124,8 +1140,9 @@ bpf_object__create_maps(struct bpf_object *obj)
 
                 *pfd = bpf_create_map_xattr(&create_attr);
                 if (*pfd < 0 && create_attr.btf_key_type_id) {
+                        cp = strerror_r(errno, errmsg, sizeof(errmsg));
                         pr_warning("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",
-                                   map->name, strerror(errno), errno);
+                                   map->name, cp, errno);
                         create_attr.btf_fd = 0;
                         create_attr.btf_key_type_id = 0;
                         create_attr.btf_value_type_id = 0;
@@ -1138,9 +1155,9 @@ bpf_object__create_maps(struct bpf_object *obj)
                         size_t j;
 
                         err = *pfd;
+                        cp = strerror_r(errno, errmsg, sizeof(errmsg));
                         pr_warning("failed to create map (name: '%s'): %s\n",
-                                   map->name,
-                                   strerror(errno));
+                                   map->name, cp);
                         for (j = 0; j < i; j++)
                                 zclose(obj->maps[j].fd);
                         return err;
@@ -1292,6 +1309,7 @@ load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
              char *license, u32 kern_version, int *pfd, int prog_ifindex)
 {
         struct bpf_load_program_attr load_attr;
+        char *cp, errmsg[STRERR_BUFSIZE];
         char *log_buf;
         int ret;
 
@@ -1321,7 +1339,8 @@ load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
         }
 
         ret = -LIBBPF_ERRNO__LOAD;
-        pr_warning("load bpf program failed: %s\n", strerror(errno));
+        cp = strerror_r(errno, errmsg, sizeof(errmsg));
+        pr_warning("load bpf program failed: %s\n", cp);
 
         if (log_buf && log_buf[0] != '\0') {
                 ret = -LIBBPF_ERRNO__VERIFY;
@@ -1620,6 +1639,7 @@ out:
 
 static int check_path(const char *path)
 {
+        char *cp, errmsg[STRERR_BUFSIZE];
         struct statfs st_fs;
         char *dname, *dir;
         int err = 0;
@@ -1633,7 +1653,8 @@ static int check_path(const char *path)
 
         dir = dirname(dname);
         if (statfs(dir, &st_fs)) {
-                pr_warning("failed to statfs %s: %s\n", dir, strerror(errno));
+                cp = strerror_r(errno, errmsg, sizeof(errmsg));
+                pr_warning("failed to statfs %s: %s\n", dir, cp);
                 err = -errno;
         }
         free(dname);
@@ -1649,6 +1670,7 @@ static int check_path(const char *path)
 int bpf_program__pin_instance(struct bpf_program *prog, const char *path,
                               int instance)
 {
+        char *cp, errmsg[STRERR_BUFSIZE];
         int err;
 
         err = check_path(path);
@@ -1667,7 +1689,8 @@ int bpf_program__pin_instance(struct bpf_program *prog, const char *path,
         }
 
         if (bpf_obj_pin(prog->instances.fds[instance], path)) {
-                pr_warning("failed to pin program: %s\n", strerror(errno));
+                cp = strerror_r(errno, errmsg, sizeof(errmsg));
+                pr_warning("failed to pin program: %s\n", cp);
                 return -errno;
         }
         pr_debug("pinned program '%s'\n", path);
@@ -1677,13 +1700,16 @@ int bpf_program__pin_instance(struct bpf_program *prog, const char *path,
 
 static int make_dir(const char *path)
 {
+        char *cp, errmsg[STRERR_BUFSIZE];
         int err = 0;
 
         if (mkdir(path, 0700) && errno != EEXIST)
                 err = -errno;
 
-        if (err)
-                pr_warning("failed to mkdir %s: %s\n", path, strerror(-err));
+        if (err) {
+                cp = strerror_r(-err, errmsg, sizeof(errmsg));
+                pr_warning("failed to mkdir %s: %s\n", path, cp);
+        }
         return err;
 }
 
@@ -1730,6 +1756,7 @@ int bpf_program__pin(struct bpf_program *prog, const char *path)
 
 int bpf_map__pin(struct bpf_map *map, const char *path)
 {
+        char *cp, errmsg[STRERR_BUFSIZE];
         int err;
 
         err = check_path(path);
@@ -1742,7 +1769,8 @@ int bpf_map__pin(struct bpf_map *map, const char *path)
         }
 
         if (bpf_obj_pin(map->fd, path)) {
-                pr_warning("failed to pin map: %s\n", strerror(errno));
+                cp = strerror_r(errno, errmsg, sizeof(errmsg));
+                pr_warning("failed to pin map: %s\n", cp);
                 return -errno;
         }
 
@@ -1996,6 +2024,9 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n)
 {
         int fd;
 
+        if (!prog)
+                return -EINVAL;
+
         if (n >= prog->instances.nr || n < 0) {
                 pr_warning("Can't get the %dth fd from program %s: only %d instances\n",
                            n, prog->section_name, prog->instances.nr);
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 413778a93499..96c55fac54c3 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -86,6 +86,9 @@ const char *bpf_object__name(struct bpf_object *obj);
 unsigned int bpf_object__kversion(struct bpf_object *obj);
 int bpf_object__btf_fd(const struct bpf_object *obj);
 
+struct bpf_program *
+bpf_object__find_program_by_title(struct bpf_object *obj, const char *title);
+
 struct bpf_object *bpf_object__next(struct bpf_object *prev);
 #define bpf_object__for_each_safe(pos, tmp)                     \
         for ((pos) = bpf_object__next(NULL),            \