bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* pull-request: bpf 2021-10-26
@ 2021-10-26 20:19 Daniel Borkmann
  2021-10-26 23:40 ` patchwork-bot+netdevbpf
  2021-10-27 22:03 ` Toke Høiland-Jørgensen
  0 siblings, 2 replies; 5+ messages in thread
From: Daniel Borkmann @ 2021-10-26 20:19 UTC (permalink / raw)
  To: davem; +Cc: kuba, daniel, ast, andrii.nakryiko, netdev, bpf

Hi David, hi Jakub,

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

We've added 12 non-merge commits during the last 7 day(s) which contain
a total of 23 files changed, 118 insertions(+), 98 deletions(-).

The main changes are:

1) Fix potential race window in BPF tail call compatibility check, from Toke Høiland-Jørgensen.

2) Fix memory leak in cgroup fs due to missing cgroup_bpf_offline(), from Quanyang Wang.

3) Fix file descriptor reference counting in generic_map_update_batch(), from Xu Kuohai.

4) Fix bpf_jit_limit knob to the max supported limit by the arch's JIT, from Lorenz Bauer.

5) Fix BPF sockmap ->poll callbacks for UDP and AF_UNIX sockets, from Cong Wang and Yucong Sun.

6) Fix BPF sockmap concurrency issue in TCP on non-blocking sendmsg calls, from Liu Jian.

7) Fix build failure of INODE_STORAGE and TASK_STORAGE maps on !CONFIG_NET, from Tejun Heo.

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:

Björn Töpel, John Fastabend, kernel test robot, Lorenzo Bianconi, Luke 
Nelson, Martin KaFai Lau, Roman Gushchin, Yucong Sun

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

The following changes since commit 4225fea1cb28370086e17e82c0f69bec2779dca0:

  ptp: Fix possible memory leak in ptp_clock_register() (2021-10-20 14:44:33 +0100)

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 54713c85f536048e685258f880bf298a74c3620d:

  bpf: Fix potential race in tail call compatibility check (2021-10-26 12:37:28 -0700)

----------------------------------------------------------------
Alexei Starovoitov (2):
      Merge branch 'Fix up bpf_jit_limit some more'
      Merge branch 'sock_map: fix ->poll() and update selftests'

Cong Wang (3):
      net: Rename ->stream_memory_read to ->sock_is_readable
      skmsg: Extract and reuse sk_msg_is_readable()
      net: Implement ->sock_is_readable() for UDP and AF_UNIX

Liu Jian (1):
      tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict function

Lorenz Bauer (3):
      bpf: Define bpf_jit_alloc_exec_limit for riscv JIT
      bpf: Define bpf_jit_alloc_exec_limit for arm64 JIT
      bpf: Prevent increasing bpf_jit_limit above max

Quanyang Wang (1):
      cgroup: Fix memory leak caused by missing cgroup_bpf_offline

Tejun Heo (1):
      bpf: Move BPF_MAP_TYPE for INODE_STORAGE and TASK_STORAGE outside of CONFIG_NET

Toke Høiland-Jørgensen (1):
      bpf: Fix potential race in tail call compatibility check

Xu Kuohai (1):
      bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()

Yucong Sun (1):
      selftests/bpf: Use recv_timeout() instead of retries

 arch/arm64/net/bpf_jit_comp.c                      |  5 ++
 arch/riscv/net/bpf_jit_core.c                      |  5 ++
 include/linux/bpf.h                                |  7 +-
 include/linux/bpf_types.h                          |  8 +--
 include/linux/filter.h                             |  1 +
 include/linux/skmsg.h                              |  1 +
 include/net/sock.h                                 |  8 ++-
 include/net/tls.h                                  |  2 +-
 kernel/bpf/arraymap.c                              |  1 +
 kernel/bpf/core.c                                  | 24 ++++---
 kernel/bpf/syscall.c                               | 11 ++--
 kernel/cgroup/cgroup.c                             |  4 +-
 net/core/skmsg.c                                   | 14 ++++
 net/core/sysctl_net_core.c                         |  2 +-
 net/ipv4/tcp.c                                     |  5 +-
 net/ipv4/tcp_bpf.c                                 | 27 ++++----
 net/ipv4/udp.c                                     |  3 +
 net/ipv4/udp_bpf.c                                 |  1 +
 net/tls/tls_main.c                                 |  4 +-
 net/tls/tls_sw.c                                   |  2 +-
 net/unix/af_unix.c                                 |  4 ++
 net/unix/unix_bpf.c                                |  2 +
 .../selftests/bpf/prog_tests/sockmap_listen.c      | 75 ++++++----------------
 23 files changed, 118 insertions(+), 98 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: bpf 2021-10-26
  2021-10-26 20:19 pull-request: bpf 2021-10-26 Daniel Borkmann
@ 2021-10-26 23:40 ` patchwork-bot+netdevbpf
  2021-10-27 22:03 ` Toke Høiland-Jørgensen
  1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-26 23:40 UTC (permalink / raw)
  To: Daniel Borkmann; +Cc: davem, kuba, ast, andrii.nakryiko, netdev, bpf

Hello:

This pull request was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 26 Oct 2021 22:19:20 +0200 you wrote:
> Hi David, hi Jakub,
> 
> The following pull-request contains BPF updates for your *net* tree.
> 
> We've added 12 non-merge commits during the last 7 day(s) which contain
> a total of 23 files changed, 118 insertions(+), 98 deletions(-).
> 
> [...]

Here is the summary with links:
  - pull-request: bpf 2021-10-26
    https://git.kernel.org/netdev/net/c/440ffcdd9db4

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: bpf 2021-10-26
  2021-10-26 20:19 pull-request: bpf 2021-10-26 Daniel Borkmann
  2021-10-26 23:40 ` patchwork-bot+netdevbpf
@ 2021-10-27 22:03 ` Toke Høiland-Jørgensen
  2021-10-27 22:13   ` Daniel Borkmann
  1 sibling, 1 reply; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2021-10-27 22:03 UTC (permalink / raw)
  To: Daniel Borkmann, davem
  Cc: kuba, daniel, ast, andrii.nakryiko, netdev, bpf, Lorenzo Bianconi

Daniel Borkmann <daniel@iogearbox.net> writes:

> The following pull-request contains BPF updates for your *net* tree.
>
> We've added 12 non-merge commits during the last 7 day(s) which contain
> a total of 23 files changed, 118 insertions(+), 98 deletions(-).

Hi Daniel

Any chance we could also get bpf merged into bpf-next? We'd like to use
this fix:

> 1) Fix potential race window in BPF tail call compatibility check,
> from Toke Høiland-Jørgensen.

in the next version of the XDP multi-buf submission without creating
merge conflicts. Or is there some other way we can achieve this without
creating more work for you? :)

-Toke


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: bpf 2021-10-26
  2021-10-27 22:03 ` Toke Høiland-Jørgensen
@ 2021-10-27 22:13   ` Daniel Borkmann
  2021-10-28  9:17     ` Toke Høiland-Jørgensen
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Borkmann @ 2021-10-27 22:13 UTC (permalink / raw)
  To: Toke Høiland-Jørgensen, davem
  Cc: kuba, ast, andrii.nakryiko, netdev, bpf, Lorenzo Bianconi

On 10/28/21 12:03 AM, Toke Høiland-Jørgensen wrote:
> Daniel Borkmann <daniel@iogearbox.net> writes:
> 
>> The following pull-request contains BPF updates for your *net* tree.
>>
>> We've added 12 non-merge commits during the last 7 day(s) which contain
>> a total of 23 files changed, 118 insertions(+), 98 deletions(-).
> 
> Hi Daniel
> 
> Any chance we could also get bpf merged into bpf-next? We'd like to use
> this fix:
> 
>> 1) Fix potential race window in BPF tail call compatibility check,
>> from Toke Høiland-Jørgensen.

Makes sense! I presume final net tree PR before merge win might go out today
or tomorrow (Jakub/David?) and would get fast-fwd'ed into net-next after that
as well, which means we get the current batch for bpf-next out by then. By
that we'd have mentioned commit in bpf-next after re-sync.

> in the next version of the XDP multi-buf submission without creating
> merge conflicts. Or is there some other way we can achieve this without
> creating more work for you? :)
> 
> -Toke
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: bpf 2021-10-26
  2021-10-27 22:13   ` Daniel Borkmann
@ 2021-10-28  9:17     ` Toke Høiland-Jørgensen
  0 siblings, 0 replies; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2021-10-28  9:17 UTC (permalink / raw)
  To: Daniel Borkmann, davem
  Cc: kuba, ast, andrii.nakryiko, netdev, bpf, Lorenzo Bianconi

Daniel Borkmann <daniel@iogearbox.net> writes:

> On 10/28/21 12:03 AM, Toke Høiland-Jørgensen wrote:
>> Daniel Borkmann <daniel@iogearbox.net> writes:
>> 
>>> The following pull-request contains BPF updates for your *net* tree.
>>>
>>> We've added 12 non-merge commits during the last 7 day(s) which contain
>>> a total of 23 files changed, 118 insertions(+), 98 deletions(-).
>> 
>> Hi Daniel
>> 
>> Any chance we could also get bpf merged into bpf-next? We'd like to use
>> this fix:
>> 
>>> 1) Fix potential race window in BPF tail call compatibility check,
>>> from Toke Høiland-Jørgensen.
>
> Makes sense! I presume final net tree PR before merge win might go out today
> or tomorrow (Jakub/David?) and would get fast-fwd'ed into net-next after that
> as well, which means we get the current batch for bpf-next out by then. By
> that we'd have mentioned commit in bpf-next after re-sync.

Alright, sounds good - thanks! :)

-Toke


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-10-28  9:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 20:19 pull-request: bpf 2021-10-26 Daniel Borkmann
2021-10-26 23:40 ` patchwork-bot+netdevbpf
2021-10-27 22:03 ` Toke Høiland-Jørgensen
2021-10-27 22:13   ` Daniel Borkmann
2021-10-28  9:17     ` Toke Høiland-Jørgensen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).