Hi David,
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 158 insertions(+), 59 deletions(-).
The main changes are:
1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.
2) [gs]etsockopt fix for large optlen, from Stanislav.
3) devmap allocation fix, from Toke.
Please consider pulling these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Thanks a lot!
Also thanks to reporters, reviewers and testers of commits in this pull-request:
Andrii Nakryiko, Christoph Hellwig, Jesper Dangaard Brouer, John
Fastabend, Xiumei Mu
----------------------------------------------------------------
The following changes since commit c92cbaea3cc0a80807e386922f801eb6d3652c81:
net: dsa: sja1105: fix PTP timestamping with large tc-taprio cycles (2020-06-15 13:45:59 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
for you to fetch changes up to 8030e250d882db174cbcd88273570ffb36a13080:
bpf: Document optval > PAGE_SIZE behavior for sockopt hooks (2020-06-17 10:54:05 -0700)
----------------------------------------------------------------
Andrii Nakryiko (3):
bpf: Fix definition of bpf_ringbuf_output() helper in UAPI comments
tools/bpftool: Add ringbuf map to a list of known map types
bpf: bpf_probe_read_kernel_str() has to return amount of data read on success
Gaurav Singh (1):
bpf, xdp, samples: Fix null pointer dereference in *_user code
Hangbin Liu (1):
xdp: Handle frame_sz in xdp_convert_zc_to_xdp_frame()
Stanislav Fomichev (3):
bpf: Don't return EINVAL from {get,set}sockopt when optlen > PAGE_SIZE
selftests/bpf: Make sure optvals > PAGE_SIZE are bypassed
bpf: Document optval > PAGE_SIZE behavior for sockopt hooks
Tobias Klauser (1):
tools, bpftool: Add ringbuf map type to map command docs
Toke Høiland-Jørgensen (1):
devmap: Use bpf_map_area_alloc() for allocating hash buckets
Documentation/bpf/prog_cgroup_sockopt.rst | 14 ++++++
include/uapi/linux/bpf.h | 2 +-
kernel/bpf/cgroup.c | 53 +++++++++++++--------
kernel/bpf/devmap.c | 10 ++--
kernel/trace/bpf_trace.c | 2 +-
net/core/xdp.c | 1 +
samples/bpf/xdp_monitor_user.c | 8 +---
samples/bpf/xdp_redirect_cpu_user.c | 7 +--
samples/bpf/xdp_rxq_info_user.c | 13 ++----
tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +-
tools/bpf/bpftool/map.c | 3 +-
tools/include/uapi/linux/bpf.h | 2 +-
.../testing/selftests/bpf/prog_tests/sockopt_sk.c | 46 +++++++++++++++---
tools/testing/selftests/bpf/progs/sockopt_sk.c | 54 +++++++++++++++++++++-
14 files changed, 158 insertions(+), 59 deletions(-)
