mbox series

pull-request: bpf 2020-07-09

Message ID 20200710024824.16936-1-alexei.starovoitov@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series pull-request: bpf 2020-07-09 | expand

Pull-request

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

Message

Alexei Starovoitov July 10, 2020, 2:48 a.m. UTC
Hi David,

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

We've added 4 non-merge commits during the last 1 day(s) which contain
a total of 4 files changed, 26 insertions(+), 15 deletions(-).

The main changes are:

1) fix crash in libbpf on 32-bit archs, from Jakub and Andrii.

2) fix crash when l2tp and bpf_sk_reuseport conflict, from Martin.

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:

Jakub Sitnicki, James Chapman, Martin KaFai Lau

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

The following changes since commit 365f9ae4ee36037e2a9268fe7296065356840b4c:

  ethtool: fix genlmsg_put() failure handling in ethnl_default_dumpit() (2020-07-09 12:35:33 -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 b2f9f1535bb93ee5fa2ea30ac1c26fa0d676154c:

  libbpf: Fix libbpf hashmap on (I)LP32 architectures (2020-07-09 19:38:55 -0700)

----------------------------------------------------------------
Jakub Bogusz (1):
      libbpf: Fix libbpf hashmap on (I)LP32 architectures

Lorenz Bauer (1):
      selftests: bpf: Fix detach from sockmap tests

Martin KaFai Lau (2):
      bpf: net: Avoid copying sk_user_data of reuseport_array during sk_clone
      bpf: net: Avoid incorrect bpf_sk_reuseport_detach call

 include/net/sock.h                      |  3 ++-
 kernel/bpf/reuseport_array.c            | 14 ++++++++++----
 tools/lib/bpf/hashmap.h                 | 12 ++++++++----
 tools/testing/selftests/bpf/test_maps.c | 12 ++++++------
 4 files changed, 26 insertions(+), 15 deletions(-)

Comments

David Miller July 10, 2020, 9:08 p.m. UTC | #1
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Thu,  9 Jul 2020 19:48:24 -0700

> The following pull-request contains BPF updates for your *net* tree.
> 
> We've added 4 non-merge commits during the last 1 day(s) which contain
> a total of 4 files changed, 26 insertions(+), 15 deletions(-).
> 
> The main changes are:
> 
> 1) fix crash in libbpf on 32-bit archs, from Jakub and Andrii.
> 
> 2) fix crash when l2tp and bpf_sk_reuseport conflict, from Martin.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Alexei.