mbox series

pull-request: bpf 2018-03-29

Message ID 20180329143800.20949-1-daniel@iogearbox.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series pull-request: bpf 2018-03-29 | expand

Pull-request

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

Message

Daniel Borkmann March 29, 2018, 2:38 p.m. UTC
Hi David,

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

The main changes are:

1) Fix nfp to properly check max insn count while emitting
   instructions in the JIT which was wrongly comparing bytes
   against number of instructions before, from Jakub.

2) Fix for bpftool to avoid usage of hex numbers in JSON
   output since JSON doesn't accept hex numbers with 0x
   prefix, also from Jakub.

Please consider pulling these changes from:

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

Thanks a lot!

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

The following changes since commit 1bfa26ff8c4b7512f4e4efa6df211239223033d4:

  ipv6: fix possible deadlock in rt6_age_examine_exception() (2018-03-23 13:40:34 -0400)

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 e8a4796ee2954db9f7e9b52e5fbc66ef876752f6:

  nfp: bpf: fix check of program max insn count (2018-03-24 10:41:24 -0700)

----------------------------------------------------------------
Jakub Kicinski (2):
      tools: bpftool: don't use hex numbers in JSON output
      nfp: bpf: fix check of program max insn count

 drivers/net/ethernet/netronome/nfp/bpf/jit.c | 6 +++++-
 tools/bpf/bpftool/map.c                      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

Comments

David Miller March 29, 2018, 8:33 p.m. UTC | #1
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 29 Mar 2018 16:38:00 +0200

> The following pull-request contains BPF updates for your *net* tree.
> 
> The main changes are:
> 
> 1) Fix nfp to properly check max insn count while emitting
>    instructions in the JIT which was wrongly comparing bytes
>    against number of instructions before, from Jakub.
> 
> 2) Fix for bpftool to avoid usage of hex numbers in JSON
>    output since JSON doesn't accept hex numbers with 0x
>    prefix, also from Jakub.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Daniel.