From patchwork Fri Jun 15 23:06:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Borkmann X-Patchwork-Id: 930278 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=iogearbox.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 416x2K3whDz9s3q for ; Sat, 16 Jun 2018 09:06:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756601AbeFOXGn (ORCPT ); Fri, 15 Jun 2018 19:06:43 -0400 Received: from www62.your-server.de ([213.133.104.62]:42445 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753572AbeFOXGm (ORCPT ); Fri, 15 Jun 2018 19:06:42 -0400 Received: from [178.197.249.15] (helo=localhost) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_2) (envelope-from ) id 1fTxnk-0002cq-Jl; Sat, 16 Jun 2018 01:06:40 +0200 From: Daniel Borkmann To: davem@davemloft.net Cc: daniel@iogearbox.net, ast@kernel.org, netdev@vger.kernel.org Subject: pull-request: bpf 2018-06-16 Date: Sat, 16 Jun 2018 01:06:30 +0200 Message-Id: <20180615230630.12117-1-daniel@iogearbox.net> X-Mailer: git-send-email 2.9.5 MIME-Version: 1.0 X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.99.3/24666/Fri Jun 15 22:38:25 2018) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Fix a panic in devmap handling in generic XDP where return type of __devmap_lookup_elem() got changed recently but generic XDP code missed the related update, from Toshiaki. 2) Fix a freeze when BPF progs are loaded that include BPF to BPF calls when JIT is enabled where we would later bail out via error path w/o dropping kallsyms, and another one to silence syzkaller splats from locking prog read-only, from Daniel. 3) Fix a bug in test_offloads.py BPF selftest which must not assume that the underlying system have no BPF progs loaded prior to test, and one in bpftool to fix accuracy of program load time, from Jakub. 4) Fix a bug in bpftool's probe for availability of the bpf(2) BPF_TASK_FD_QUERY subcommand, from Yonghong. 5) Fix a regression in AF_XDP's XDP_SKB receive path where queue id check got erroneously removed, from Björn. 6) Fix missing state cleanup in BPF's xfrm tunnel test, from William. 7) Check tunnel type more accurately in BPF's tunnel collect metadata kselftest, from Jian. 8) Fix missing Kconfig fragments for BPF kselftests, from Anders. 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 6892286e9c09925780fe2cb6db3585b56b71fe8e: tcp: Do not reload skb pointer after skb_gro_receive(). (2018-06-11 20:00:56 -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 6d5fc1957989266006db6ef3dfb9159b42cf0189: xdp: Fix handling of devmap in generic XDP (2018-06-15 23:47:15 +0200) ---------------------------------------------------------------- Alexei Starovoitov (1): Merge branch 'bpf-fixes' Anders Roxell (1): selftests: bpf: config: add config fragments Björn Töpel (1): xsk: re-add queue id check for XDP_SKB path Daniel Borkmann (3): Merge branch 'bpf-misc-fixes' bpf: fix panic in prog load calls cleanup bpf: reject any prog that failed read-only lock Jakub Kicinski (2): tools: bpftool: improve accuracy of load time selftests/bpf: test offloads even with BPF programs present Jian Wang (1): bpf, selftest: check tunnel type more accurately Toshiaki Makita (1): xdp: Fix handling of devmap in generic XDP William Tu (1): bpf, selftests: delete xfrm tunnel when test exits. Yonghong Song (1): tools/bpftool: fix a bug in bpftool perf include/linux/bpf.h | 12 +++++ include/linux/filter.h | 79 +++++++++++++++++++++-------- kernel/bpf/core.c | 69 ++++++++++++++++++++++--- kernel/bpf/devmap.c | 14 +++++ kernel/bpf/syscall.c | 12 ++--- net/core/filter.c | 21 ++------ net/xdp/xsk.c | 3 ++ tools/bpf/bpftool/perf.c | 5 +- tools/bpf/bpftool/prog.c | 4 +- tools/testing/selftests/bpf/config | 10 ++++ tools/testing/selftests/bpf/test_offload.py | 12 ++++- tools/testing/selftests/bpf/test_tunnel.sh | 26 +++++----- 12 files changed, 195 insertions(+), 72 deletions(-)