pull-request: bpf 2020-11-19

Pull-request

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

Message

Alexei Starovoitov Nov. 19, 2020, 8:07 p.m. UTC

Hi David, hi Jakub,

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

We've added 18 non-merge commits during the last 12 day(s) which contain
a total of 17 files changed, 301 insertions(+), 49 deletions(-).

The main changes are:

1) libbpf should not attempt to load unused subprogs, from Andrii.

2) Make strncpy_from_user() mask out bytes after NUL terminator, from Daniel.

3) Relax return code check for subprograms in the BPF verifier, from Dmitrii.

4) Fix several sockmap issues, from John.

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, Dmitrii Banshchikov, Hulk Robot, Jakub Sitnicki, John 
Fastabend, Masami Hiramatsu, Song Liu, Tosk Robot, Yonghong Song

----------------------------------------------------------------

The following changes since commit 4e0396c59559264442963b349ab71f66e471f84d:

  net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m (2020-11-07 12:43:26 -0800)

are available in the Git repository at:

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

for you to fetch changes up to 2801a5da5b25b7af9dd2addd19b2315c02d17b64:

  fail_function: Remove a redundant mutex unlock (2020-11-19 11:58:16 -0800)

----------------------------------------------------------------
Alexei Starovoitov (2):
      MAINTAINERS/bpf: Update Andrii's entry.
      Merge branch 'Fix bpf_probe_read_user_str() overcopying'

Andrii Nakryiko (2):
      libbpf: Don't attempt to load unused subprog as an entry-point BPF program
      selftests/bpf: Fix unused attribute usage in subprogs_unused test

Daniel Xu (2):
      lib/strncpy_from_user.c: Mask out bytes after NUL terminator.
      selftest/bpf: Test bpf_probe_read_user_str() strips trailing bytes after NUL

Dmitrii Banshchikov (1):
      bpf: Relax return code check for subprograms

Jiri Olsa (1):
      libbpf: Fix VERSIONED_SYM_COUNT number parsing

John Fastabend (6):
      bpf, sockmap: Fix partial copy_page_to_iter so progress can still be made
      bpf, sockmap: Ensure SO_RCVBUF memory is observed on ingress redirect
      bpf, sockmap: Use truesize with sk_rmem_schedule()
      bpf, sockmap: Avoid returning unneeded EAGAIN when redirecting to self
      bpf, sockmap: Handle memory acct if skb_verdict prog redirects to self
      bpf, sockmap: Avoid failures from skb_to_sgvec when skb has frag_list

Kaixu Xia (1):
      bpf: Fix unsigned 'datasec_id' compared with zero in check_pseudo_btf_id

Luo Meng (1):
      fail_function: Remove a redundant mutex unlock

Wang Hai (2):
      tools, bpftool: Add missing close before bpftool net attach exit
      selftests/bpf: Fix error return code in run_getsockopt_test()

Wang Qing (1):
      bpf: Fix passing zero to PTR_ERR() in bpf_btf_printf_prepare

 MAINTAINERS                                        |  2 +-
 kernel/bpf/verifier.c                              | 18 ++++-
 kernel/fail_function.c                             |  5 +-
 kernel/trace/bpf_trace.c                           | 12 ++-
 lib/strncpy_from_user.c                            | 19 ++++-
 net/core/skmsg.c                                   | 87 ++++++++++++++++++----
 net/ipv4/tcp_bpf.c                                 | 18 +++--
 tools/bpf/bpftool/net.c                            | 18 ++---
 tools/lib/bpf/Makefile                             |  2 +
 tools/lib/bpf/libbpf.c                             | 23 +++---
 .../selftests/bpf/prog_tests/probe_read_user_str.c | 71 ++++++++++++++++++
 .../selftests/bpf/prog_tests/sockopt_multi.c       |  3 +-
 tools/testing/selftests/bpf/prog_tests/subprogs.c  |  6 ++
 .../selftests/bpf/prog_tests/test_global_funcs.c   |  1 +
 .../selftests/bpf/progs/test_global_func8.c        | 19 +++++
 .../selftests/bpf/progs/test_probe_read_user_str.c | 25 +++++++
 .../selftests/bpf/progs/test_subprogs_unused.c     | 21 ++++++
 17 files changed, 301 insertions(+), 49 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/probe_read_user_str.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_global_func8.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_probe_read_user_str.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_subprogs_unused.c

Comments

Jakub Kicinski Nov. 19, 2020, 9:33 p.m. UTC | #1

On Thu, 19 Nov 2020 12:07:21 -0800 Alexei Starovoitov wrote:
> Hi David, hi Jakub,
> 
> The following pull-request contains BPF updates for your *net* tree.
> 
> We've added 18 non-merge commits during the last 12 day(s) which contain
> a total of 17 files changed, 301 insertions(+), 49 deletions(-).
> 
> The main changes are:
> 
> 1) libbpf should not attempt to load unused subprogs, from Andrii.
> 
> 2) Make strncpy_from_user() mask out bytes after NUL terminator, from Daniel.
> 
> 3) Relax return code check for subprograms in the BPF verifier, from Dmitrii.
> 
> 4) Fix several sockmap issues, from John.

Looks like the bot didn't register the merge because I didn't set the
delegate before pushing