Hi David,
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Various BPF related improvements and fixes to nfp driver: i) do
not register XDP RXQ structure to control queues, ii) round up
program stack size to word size for nfp, iii) restrict MTU changes
when BPF offload is active, iv) add more fully featured relocation
support to JIT, v) add support for signed compare instructions to
the nfp JIT, vi) export and reuse verfier log routine for nfp, and
many more, from Jakub, Quentin and Nic.
2) Fix a syzkaller reported GPF in BPF's copy_verifier_state() when
we hit kmalloc failure path, from Alexei.
3) Add two follow-up fixes for the recent XDP RXQ series: i) kvzalloc()
allocated memory was only kfree()'ed, and ii) fix a memory leak where
RX queue was not freed in netif_free_rx_queues(), from Jakub.
4) Add a sample for transferring XDP meta data into the skb, here it
is used for setting skb->mark with the buffer from XDP, from Jesper.
Please consider pulling these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Thanks a lot!
Note, getting bpf-next out earlier this time around in order to
pull in dependencies from bpf that are needed in bpf-next for
upcoming series such as maps offload.
----------------------------------------------------------------
The following changes since commit f66faae2f80a45feafc04ce63ef744ac4b6e8c05:
Merge branch 'ipv6-ipv4-nexthop-align' (2018-01-07 21:29:41 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
for you to fetch changes up to 36e04a2d78d97cc3a02a168541dfa00c8e4b30f2:
samples/bpf: xdp2skb_meta shows transferring info from XDP to SKB (2018-01-11
01:02:25 +0100)
----------------------------------------------------------------
Alexei Starovoitov (1):
bpf: fix verifier GPF in kmalloc failure path
Daniel Borkmann (2):
Merge branch 'bpf-xdp-rxq-fixes'
Merge branch 'bpf-nfp-misc-improvements'
Jakub Kicinski (13):
net: use the right variant of kfree
net: free RX queue structures
nfp: don't try to register XDP rxq structures on control queues
nfp: fix incumbent kdoc warnings
nfp: bpf: round up the size of the stack
nfp: bpf: don't allow changing MTU above BPF offload limit when active
nfp: bpf: allow disabling TC offloads when XDP active
nfp: bpf: move jump resolution to jit.c
nfp: bpf: add helpers for modifying branch addresses
nfp: bpf: relocate jump targets just before the load
nfp: bpf: don't depend on high order allocations for program image
nfp: bpf: use a large constant in unresolved branches
nfp: hand over to BPF offload app at coarser granularity
Jesper Dangaard Brouer (1):
samples/bpf: xdp2skb_meta shows transferring info from XDP to SKB
Nic Viljoen (1):
nfp: bpf: add signed jump insns
Quentin Monnet (2):
bpf: export function to write into verifier log buffer
nfp: bpf: reuse verifier log for debug messages
drivers/net/ethernet/netronome/nfp/bpf/jit.c | 248 ++++++++++++++-------
drivers/net/ethernet/netronome/nfp/bpf/main.c | 38 +++-
drivers/net/ethernet/netronome/nfp/bpf/main.h | 44 ++--
drivers/net/ethernet/netronome/nfp/bpf/offload.c | 65 +++---
drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 30 +--
drivers/net/ethernet/netronome/nfp/nfp_app.h | 60 ++---
drivers/net/ethernet/netronome/nfp/nfp_asm.c | 30 +++
drivers/net/ethernet/netronome/nfp/nfp_asm.h | 5 +
.../net/ethernet/netronome/nfp/nfp_net_common.c | 27 +--
drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 111 ++++-----
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 8 +
drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 1 +
include/linux/bpf_verifier.h | 3 +
kernel/bpf/verifier.c | 20 +-
net/core/dev.c | 9 +-
samples/bpf/Makefile | 1 +
samples/bpf/xdp2skb_meta.sh | 220 ++++++++++++++++++
samples/bpf/xdp2skb_meta_kern.c | 103 +++++++++
18 files changed, 760 insertions(+), 263 deletions(-)
create mode 100755 samples/bpf/xdp2skb_meta.sh
create mode 100644 samples/bpf/xdp2skb_meta_kern.c
