pull-request: bpf 2023-09-06

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/for-netdev

Message

Daniel Borkmann Sept. 6, 2023, 9:51 a.m. UTC

Hi David, hi Jakub, hi Paolo, hi Eric,

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

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

The main changes are:

1) Fix bpf_sk_storage to address an invalid wait context lockdep report and
   another one to address missing omem uncharge, from Martin KaFai Lau.

2) Two BPF recursion detection related fixes, from Sebastian Andrzej Siewior.

3) Fix tailcall limit enforcement in trampolines for s390 JIT, from Ilya Leoshkevich.

4) Fix a sockmap refcount race where skbs in sk_psock_backlog can be referenced
   after user space side has already skb_consumed them, from John Fastabend.

5) Fix BPF CI flake/race wrt sockmap vsock write test where the transport
   endpoint is not connected, from Xu Kuohai.

6) Follow-up doc fix to address a cross-link warning, from Eduard Zingerman.

Please consider pulling these changes from:

  git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/for-netdev

Thanks a lot!

Also thanks to reporters, reviewers and testers of commits in this pull-request:

Jiri Olsa, kernel test robot, Leon Hwang, Xu Kuohai

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

The following changes since commit ae074e2b2fd410bf54d56509a7e48fb83873af3b:

  sfc: check for zero length in EF10 RX prefix (2023-09-01 08:14:57 +0100)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/for-netdev

for you to fetch changes up to a96d1cfb2da040bdf692d22022371b249742abb2:

  selftests/bpf: Check bpf_sk_storage has uncharged sk_omem_alloc (2023-09-06 11:08:47 +0200)

----------------------------------------------------------------
bpf-for-netdev

----------------------------------------------------------------
Eduard Zingerman (1):
      docs/bpf: Fix "file doesn't exist" warnings in {llvm_reloc,btf}.rst

Ilya Leoshkevich (1):
      s390/bpf: Pass through tail call counter in trampolines

John Fastabend (1):
      bpf, sockmap: Fix skb refcnt race after locking changes

Martin KaFai Lau (3):
      bpf: bpf_sk_storage: Fix invalid wait context lockdep report
      bpf: bpf_sk_storage: Fix the missing uncharge in sk_omem_alloc
      selftests/bpf: Check bpf_sk_storage has uncharged sk_omem_alloc

Sebastian Andrzej Siewior (2):
      bpf: Invoke __bpf_prog_exit_sleepable_recur() on recursion in kern_sys_bpf().
      bpf: Assign bpf_tramp_run_ctx::saved_run_ctx before recursion check.

Xu Kuohai (1):
      selftests/bpf: Fix a CI failure caused by vsock write

 Documentation/bpf/btf.rst                          |  2 +-
 Documentation/bpf/llvm_reloc.rst                   |  2 +-
 arch/s390/net/bpf_jit_comp.c                       | 10 ++++
 kernel/bpf/bpf_local_storage.c                     | 49 ++++++-----------
 kernel/bpf/syscall.c                               |  2 +-
 kernel/bpf/trampoline.c                            |  5 +-
 net/core/skmsg.c                                   | 12 +++--
 .../bpf/prog_tests/sk_storage_omem_uncharge.c      | 56 ++++++++++++++++++++
 .../selftests/bpf/prog_tests/sockmap_helpers.h     | 26 +++++++++
 .../selftests/bpf/prog_tests/sockmap_listen.c      |  7 +++
 .../testing/selftests/bpf/progs/bpf_tracing_net.h  |  1 +
 .../selftests/bpf/progs/sk_storage_omem_uncharge.c | 61 ++++++++++++++++++++++
 12 files changed, 189 insertions(+), 44 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_storage_omem_uncharge.c
 create mode 100644 tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c

Comments

[e-mail] Sept. 7, 2023, 3:40 a.m. UTC | #1

Hello:

This pull request was applied to netdev/net.git (main)
by Jakub Kicinski <[e-mail]>:

On Wed,  6 Sep 2023 11:51:17 +0200 you wrote:
> Hi David, hi Jakub, hi Paolo, hi Eric,
> 
> The following pull-request contains BPF updates for your *net* tree.
> 
> We've added 9 non-merge commits during the last 6 day(s) which contain
> a total of 12 files changed, 189 insertions(+), 44 deletions(-).
> 
> [...]

Here is the summary with links:
  - pull-request: bpf 2023-09-06
    https://git.kernel.org/netdev/net/c/f16d411c290b

You are awesome, thank you!