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

Daniel Borkmann says:

====================
pull-request: bpf 2019-11-02

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

We've added 6 non-merge commits during the last 6 day(s) which contain
a total of 8 files changed, 35 insertions(+), 9 deletions(-).

The main changes are:

1) Fix ppc BPF JIT's tail call implementation by performing a second pass
   to gather a stable JIT context before opcode emission, from Eric Dumazet.

2) Fix build of BPF samples sys_perf_event_open() usage to compiled out
   unavailable test_attr__{enabled,open} checks. Also fix potential overflows
   in bpf_map_{area_alloc,charge_init} on 32 bit archs, from Björn Töpel.

3) Fix narrow loads of bpf_sysctl context fields with offset > 0 on big endian
   archs like s390x and also improve the test coverage, from Ilya Leoshkevich.
====================

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

2 files changed, 11 insertions, 3 deletions

diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
index 63e4349a772a..15e458e150bd 100644
--- a/tools/perf/perf-sys.h
+++ b/tools/perf/perf-sys.h
@@ -15,7 +15,9 @@ void test_attr__init(void);
 void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
                      int fd, int group_fd, unsigned long flags);
 
-#define HAVE_ATTR_TEST
+#ifndef HAVE_ATTR_TEST
+#define HAVE_ATTR_TEST 1
+#endif
 
 static inline int
 sys_perf_event_open(struct perf_event_attr *attr,
@@ -27,7 +29,7 @@ sys_perf_event_open(struct perf_event_attr *attr,
         fd = syscall(__NR_perf_event_open, attr, pid, cpu,
                      group_fd, flags);
 
-#ifdef HAVE_ATTR_TEST
+#if HAVE_ATTR_TEST
         if (unlikely(test_attr__enabled))
                 test_attr__open(attr, pid, cpu, fd, group_fd, flags);
 #endif
diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c
index a320e3844b17..7c6e5b173f33 100644
--- a/tools/testing/selftests/bpf/test_sysctl.c
+++ b/tools/testing/selftests/bpf/test_sysctl.c
@@ -161,9 +161,14 @@ static struct sysctl_test tests[] = {
                 .descr = "ctx:file_pos sysctl:read read ok narrow",
                 .insns = {
                         /* If (file_pos == X) */
+#if __BYTE_ORDER == __LITTLE_ENDIAN
                         BPF_LDX_MEM(BPF_B, BPF_REG_7, BPF_REG_1,
                                     offsetof(struct bpf_sysctl, file_pos)),
-                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0, 2),
+#else
+                        BPF_LDX_MEM(BPF_B, BPF_REG_7, BPF_REG_1,
+                                    offsetof(struct bpf_sysctl, file_pos) + 3),
+#endif
+                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 4, 2),
 
                         /* return ALLOW; */
                         BPF_MOV64_IMM(BPF_REG_0, 1),
@@ -176,6 +181,7 @@ static struct sysctl_test tests[] = {
                 .attach_type = BPF_CGROUP_SYSCTL,
                 .sysctl = "kernel/ostype",
                 .open_flags = O_RDONLY,
+                .seek = 4,
                 .result = SUCCESS,
         },
         {