From patchwork Sun Jul 8 03:58:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 940890 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=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41NZSw4g2Hz9s0W for ; Sun, 8 Jul 2018 13:58:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754522AbeGHD63 (ORCPT ); Sat, 7 Jul 2018 23:58:29 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:37552 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754514AbeGHD62 (ORCPT ); Sat, 7 Jul 2018 23:58:28 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w683sdK0011132 for ; Sat, 7 Jul 2018 20:58:27 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2k2sth17tg-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sat, 07 Jul 2018 20:58:27 -0700 Received: from mx-out.facebook.com (192.168.52.123) by mail.thefacebook.com (192.168.16.23) with Microsoft SMTP Server (TLS) id 14.3.361.1; Sat, 7 Jul 2018 20:58:26 -0700 Received: by devbig007.ftw2.facebook.com (Postfix, from userid 572438) id 2D519760BFC; Sat, 7 Jul 2018 20:58:26 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Alexei Starovoitov Smtp-Origin-Hostname: devbig007.ftw2.facebook.com To: CC: , , , Smtp-Origin-Cluster: ftw2c04 Subject: pull-request: bpf 2018-07-07 Date: Sat, 7 Jul 2018 20:58:26 -0700 Message-ID: <20180708035826.2159429-1-ast@kernel.org> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-08_02:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe 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. Plenty of fixes for different components: 1) A set of critical fixes for sockmap and sockhash, from John Fastabend. 2) fixes for several race conditions in af_xdp, from Magnus Karlsson. 3) hash map refcnt fix, from Mauricio Vasquez. 4) samples/bpf fixes, from Taeung Song. 5) ifup+mtu check for xdp_redirect, from Toshiaki Makita. 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 d0fbad0aec1df29717fab736eb24c8a49cf2c70b: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (2018-07-02 12:40:59 -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 d8d7218ad842e18fc6976b87c08ed749e8d56313: xdp: XDP_REDIRECT should check IFF_UP and MTU (2018-07-07 15:25:35 -0700) ---------------------------------------------------------------- Alexei Starovoitov (3): Merge branch 'af_xdp-fixes' Merge branch 'sockmap-fixes' Merge branch 'sockhash-fixes' John Fastabend (6): bpf: sockmap, error path can not release psock in multi-map case bpf: sockmap, hash table is RCU so readers do not need locks bpf: fix sk_skb programs without skb->dev assigned bpf: sockhash, disallow bpf_tcp_close and update in parallel bpf: sockmap, consume_skb in close path bpf: sockmap, convert bpf_compute_data_pointers to bpf_*_sk_skb Magnus Karlsson (4): xsk: fix potential lost completion message in SKB path xsk: frame could be completed more than once in SKB path samples/bpf: deal with EBUSY return code from sendmsg in xdpsock sample xsk: fix potential race in SKB TX completion code Mauricio Vasquez B (1): bpf: hash map: decrement counter on error Taeung Song (4): samples/bpf: add missing samples/bpf: Check the result of system() samples/bpf: Check the error of write() and read() samples/bpf: add .gitignore file Toshiaki Makita (1): xdp: XDP_REDIRECT should check IFF_UP and MTU include/linux/filter.h | 6 +-- include/net/tcp.h | 4 ++ include/net/xdp_sock.h | 4 ++ kernel/bpf/devmap.c | 7 ++- kernel/bpf/hashtab.c | 16 ++++-- kernel/bpf/sockmap.c | 43 +++++++++------ kernel/bpf/syscall.c | 4 +- net/core/filter.c | 110 +++++++++++++++++++++++++++++++++++---- net/xdp/xsk.c | 10 ++-- net/xdp/xsk_queue.h | 9 +--- samples/bpf/.gitignore | 49 +++++++++++++++++ samples/bpf/parse_varlen.c | 6 +-- samples/bpf/test_overhead_user.c | 19 +++++-- samples/bpf/trace_event_user.c | 27 ++++++++-- samples/bpf/xdpsock_user.c | 2 +- 15 files changed, 257 insertions(+), 59 deletions(-) create mode 100644 samples/bpf/.gitignore