From patchwork Tue Jan 14 16:46:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Vazquez X-Patchwork-Id: 1222932 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=fxhBY6GJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47xxFC1lcXz9sRV for ; Wed, 15 Jan 2020 03:46:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729045AbgANQqy (ORCPT ); Tue, 14 Jan 2020 11:46:54 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:35439 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729035AbgANQqw (ORCPT ); Tue, 14 Jan 2020 11:46:52 -0500 Received: by mail-pf1-f201.google.com with SMTP id r17so9125258pfl.2 for ; Tue, 14 Jan 2020 08:46:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xQls5+iJi5Kqz7m3pR6x7QjrYUU6eZohn0NALbSGdKM=; b=fxhBY6GJyfZmJR7rTwfsKpKUIE04Kq0SWTO9fSrJydbyqAZ42ZVfBxUf2cZ1MzpoXX HITp9Cai+fr1dHgI3V51RVruG5RorGsWMyN5/CI7b6DOMq9eDOdfUXoxNB7vw3CJp2v0 jcGjw1bpE3K2LG3UQz3ZQoc/7rjuvDUibLkKhQfGlzDsPtd6e7oOT9eD1AdlGH3XYbIS O5xCae37Owl9agHMXCJNt1obzV2ks2PQVaTz5MlrTqAZbop1P4zEZJSozMoJD+PUMbyG GtfhTT943n+DR6wff+3Iy5x13KDeRAiuABvRCE0kTCuKHTmnXut7e24JHadrdTVFomMJ OJqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xQls5+iJi5Kqz7m3pR6x7QjrYUU6eZohn0NALbSGdKM=; b=V0Qh9lZKbUhI3jCsu7tLadxjxQWQRwuSbaohVJAG4rQdd57XhTY1CLvZh5OFhUUyTa KYdwmbgpeXAjg5D45j/btgTxkTBQpWvacwOuGU7NKSJAnOAln4flTYqlGk7vXMHDV3HD IkaExkpP+iycv4ItUZluJdUHaNPn5RtHrks2Uc1Y+irin04k7LxW8VkFBNpIOJ8Nfcy1 6GXR5GNqcWb81WDY1eLlklF8bL2XjdvweMfup/Z3+8au9zTluumYoCR3NXzABw721fMF XEUZ0MjYE1sXSeHoBw95ZmKdh5oJtMqf7rlMNvdSfa47Wqu50+SnWPEJx2eAAl5DEYcj AAbQ== X-Gm-Message-State: APjAAAVe/olYAiyY95LtsUy9AdKJmR2dSFfMbBUS/b5VSCAvxra46MUR Tvvll1+WjBBOgl0ipMQHxpnm8IZ5HUqB X-Google-Smtp-Source: APXvYqz4O0SYpBmBS3JghD5AxAlsNFp6IkPmhyVtKyPudG10ac42CeBOdTM+nz5pu1/pgfl7g9k/aFCkvHyF X-Received: by 2002:a63:4a1c:: with SMTP id x28mr27353866pga.7.1579020411670; Tue, 14 Jan 2020 08:46:51 -0800 (PST) Date: Tue, 14 Jan 2020 08:46:11 -0800 In-Reply-To: <20200114164614.47029-1-brianvv@google.com> Message-Id: <20200114164614.47029-8-brianvv@google.com> Mime-Version: 1.0 References: <20200114164614.47029-1-brianvv@google.com> X-Mailer: git-send-email 2.25.0.rc1.283.g88dfdc4193-goog Subject: [PATCH v4 bpf-next 6/9] tools/bpf: sync uapi header bpf.h From: Brian Vazquez To: Brian Vazquez , Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Yonghong Song , Andrii Nakryiko , Stanislav Fomichev , Petar Penkov , Willem de Bruijn , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Yonghong Song sync uapi header include/uapi/linux/bpf.h to tools/include/uapi/linux/bpf.h Signed-off-by: Yonghong Song --- tools/include/uapi/linux/bpf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 52966e758fe59..9536729a03d57 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -107,6 +107,10 @@ enum bpf_cmd { BPF_MAP_LOOKUP_AND_DELETE_ELEM, BPF_MAP_FREEZE, BPF_BTF_GET_NEXT_ID, + BPF_MAP_LOOKUP_BATCH, + BPF_MAP_LOOKUP_AND_DELETE_BATCH, + BPF_MAP_UPDATE_BATCH, + BPF_MAP_DELETE_BATCH, }; enum bpf_map_type { @@ -420,6 +424,23 @@ union bpf_attr { __u64 flags; }; + struct { /* struct used by BPF_MAP_*_BATCH commands */ + __aligned_u64 in_batch; /* start batch, + * NULL to start from beginning + */ + __aligned_u64 out_batch; /* output: next start batch */ + __aligned_u64 keys; + __aligned_u64 values; + __u32 count; /* input/output: + * input: # of key/value + * elements + * output: # of filled elements + */ + __u32 map_fd; + __u64 elem_flags; + __u64 flags; + } batch; + struct { /* anonymous struct used by BPF_PROG_LOAD command */ __u32 prog_type; /* one of enum bpf_prog_type */ __u32 insn_cnt;