From patchwork Tue Nov 19 19:30:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Vazquez X-Patchwork-Id: 1197604 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.b="qRnAj9sL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47HbXR3dyFz9sPv for ; Wed, 20 Nov 2019 06:31:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727522AbfKSTbC (ORCPT ); Tue, 19 Nov 2019 14:31:02 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:39409 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727498AbfKSTbB (ORCPT ); Tue, 19 Nov 2019 14:31:01 -0500 Received: by mail-pf1-f202.google.com with SMTP id z2so16705831pfg.6 for ; Tue, 19 Nov 2019 11:30:59 -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=jXrWlSvxSIV7SLutAc92WU1LozEt5/o5gmsENSdeMlw=; b=qRnAj9sLFjfyidZkY77ZuLNvqnfOM2c7OsFHowTq1B61urCpWGgj83PZqUwv5U68j9 nmbEI+CVIVaMsYYe7ObuAZuMsvdEgJcWUcmUpWqODQKgoVp4beMP4FHCd/GVTG5XMZ/f Dg8ad+YPlG7acNGLIInEzKl2qcrLhEYv0aIIWJ7hUcnXBaGP2yBNDg9GRZc4eNNhWMmB nbvi4sxTJTtMIcGb+pnb7UEcsm5lMb6mPQB1eShne6yUnHElJDYs2tPrnrSnvEtZlRCj dt1iusYpASeJ8MG0scyYp1twH2lT10O1Xa13zwoRQ1RBfonUk3C0quB6b2pe1QhIDQwI diEg== 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=jXrWlSvxSIV7SLutAc92WU1LozEt5/o5gmsENSdeMlw=; b=Ng/nVAv7C5V6bqn3udcYayZ7jCoUPxozZe27PsRkFeSjBW0wbNzCB7TXfytmD7xvPm rqYWXCdWRI2tmJchcPvnHE0BoBgeBE6IVQgKJsmfLOQ0EEHy2iCsyVU3DGtmq9frw3mB 2BBzBHC2FOsyNGf1xVq+x8aRGR2t9Rj7pqpktmE4QzuQ7XRwgbar/uM7zybihc7X9mOx ERWo8dJdc67V4sB6J1YVW0/7Z5bCEaxiwZhPI373OgPVc/XRvMrKFHSHodYje0tEDvSv TxmfAEtrg3x84mJ2nV0VHZvk0aovGBALY04K0FtzE9SmWCFuSWNzBQaB5NWM7Iki0Jiv Lu/g== X-Gm-Message-State: APjAAAXvD4FxulPyd2KMIoJpsJU5a7VtI6eIXjBfHn03AMIIkIJlaRxN KGnWAzgyqmKBrsgUJzieKkZYVFkiSdlI X-Google-Smtp-Source: APXvYqwL5tKN6MLbbinOhEr3EbjZs9T1WyD1ZfcTtUFtgeNZqCEfxlfny6rPELtrE4bo+lnFpV2eVPVoR/k8 X-Received: by 2002:a63:ff66:: with SMTP id s38mr7329802pgk.84.1574191858436; Tue, 19 Nov 2019 11:30:58 -0800 (PST) Date: Tue, 19 Nov 2019 11:30:33 -0800 In-Reply-To: <20191119193036.92831-1-brianvv@google.com> Message-Id: <20191119193036.92831-7-brianvv@google.com> Mime-Version: 1.0 References: <20191119193036.92831-1-brianvv@google.com> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog Subject: [PATCH v2 bpf-next 6/9] tools/bpf: sync uapi header bpf.h From: Brian Vazquez To: Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Yonghong Song , 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 4842a134b202a..0f6ff0c4d79dd 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 { @@ -400,6 +404,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;