From: David S. Miller <davem@davemloft.net>
Date: Sat, 2 Nov 2019 22:27:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119;p=linux.git

Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

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

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

We've added 30 non-merge commits during the last 7 day(s) which contain
a total of 41 files changed, 1864 insertions(+), 474 deletions(-).

The main changes are:

1) Fix long standing user vs kernel access issue by introducing
   bpf_probe_read_user() and bpf_probe_read_kernel() helpers, from Daniel.

2) Accelerated xskmap lookup, from Björn and Maciej.

3) Support for automatic map pinning in libbpf, from Toke.

4) Cleanup of BTF-enabled raw tracepoints, from Alexei.

5) Various fixes to libbpf and selftests.
====================

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

ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119
diff --cc tools/testing/selftests/bpf/test_offload.py
index d1645cc5ecbbb,15a666329a34d..fc8a4319c1b28
--- a/tools/testing/selftests/bpf/test_offload.py
+++ b/tools/testing/selftests/bpf/test_offload.py
@@@ -312,12 -311,8 +312,9 @@@ class DebugfsDir
          for f in out.split():
              if f == "ports":
                  continue
 +
              p = os.path.join(path, f)
-             if not os.stat(p).st_mode & stat.S_IRUSR:
-                 continue
- 
 -            if os.path.isfile(p):
 +            if os.path.isfile(p) and os.access(p, os.R_OK):
                  _, out = cmd('cat %s/%s' % (path, f))
                  dfs[f] = out.strip()
              elif os.path.isdir(p):