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

Daniel Borkmann says:

====================
pull-request: bpf 2019-09-27

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

The main changes are:

1) Fix libbpf's BTF dumper to not skip anonymous enum definitions, from Andrii.

2) Fix BTF verifier issues when handling the BTF of vmlinux, from Alexei.

3) Fix nested calls into bpf_event_output() from TCP sockops BPF
   programs, from Allan.

4) Fix NULL pointer dereference in AF_XDP's xsk map creation when
   allocation fails, from Jonathan.

5) Remove unneeded 64 byte alignment requirement of the AF_XDP UMEM
   headroom, from Bjorn.

6) Remove unused XDP_OPTIONS getsockopt() call which results in an error
   on older kernels, from Toke.

7) Fix a client/server race in tcp_rtt BPF kselftest case, from Stanislav.

8) Fix indentation issue in BTF's btf_enum_check_kflag_member(), from Colin.
====================

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

3 files changed, 23 insertions, 4 deletions

diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
index fdc0b3614a9e..a82da555b1b0 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
@@ -203,14 +203,24 @@ static int start_server(void)
         return fd;
 }
 
+static pthread_mutex_t server_started_mtx = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t server_started = PTHREAD_COND_INITIALIZER;
+
 static void *server_thread(void *arg)
 {
         struct sockaddr_storage addr;
         socklen_t len = sizeof(addr);
         int fd = *(int *)arg;
         int client_fd;
+        int err;
+
+        err = listen(fd, 1);
+
+        pthread_mutex_lock(&server_started_mtx);
+        pthread_cond_signal(&server_started);
+        pthread_mutex_unlock(&server_started_mtx);
 
-        if (CHECK_FAIL(listen(fd, 1)) < 0) {
+        if (CHECK_FAIL(err < 0)) {
                 perror("Failed to listed on socket");
                 return NULL;
         }
@@ -248,7 +258,14 @@ void test_tcp_rtt(void)
         if (CHECK_FAIL(server_fd < 0))
                 goto close_cgroup_fd;
 
-        pthread_create(&tid, NULL, server_thread, (void *)&server_fd);
+        if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
+                                      (void *)&server_fd)))
+                goto close_cgroup_fd;
+
+        pthread_mutex_lock(&server_started_mtx);
+        pthread_cond_wait(&server_started, &server_started_mtx);
+        pthread_mutex_unlock(&server_started_mtx);
+
         CHECK_FAIL(run_test(cgroup_fd, server_fd));
         close(server_fd);
 close_cgroup_fd:
diff --git a/tools/testing/selftests/bpf/progs/strobemeta.h b/tools/testing/selftests/bpf/progs/strobemeta.h
index 8a399bdfd920..067eb625d01c 100644
--- a/tools/testing/selftests/bpf/progs/strobemeta.h
+++ b/tools/testing/selftests/bpf/progs/strobemeta.h
@@ -413,7 +413,10 @@ static __always_inline void *read_map_var(struct strobemeta_cfg *cfg,
 #else
 #pragma unroll
 #endif
-        for (int i = 0; i < STROBE_MAX_MAP_ENTRIES && i < map.cnt; ++i) {
+        for (int i = 0; i < STROBE_MAX_MAP_ENTRIES; ++i) {
+                if (i >= map.cnt)
+                        break;
+
                 descr->key_lens[i] = 0;
                 len = bpf_probe_read_str(payload, STROBE_MAX_STR_LEN,
                                          map.entries[i].key);
diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c
index 4f8ec1f10a80..a320e3844b17 100644
--- a/tools/testing/selftests/bpf/test_sysctl.c
+++ b/tools/testing/selftests/bpf/test_sysctl.c
@@ -1385,7 +1385,6 @@ static int fixup_sysctl_value(const char *buf, size_t buf_len,
                 uint8_t raw[sizeof(uint64_t)];
                 uint64_t num;
         } value = {};
-        uint8_t c, i;
 
         if (buf_len > sizeof(value)) {
                 log_err("Value is too big (%zd) to use in fixup", buf_len);