{"id":818019,"url":"http://patchwork.ozlabs.org/api/patches/818019/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/4bdb49b4387d698443e32b8a6a85414e57ef4de0.1506297988.git.daniel@iogearbox.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<4bdb49b4387d698443e32b8a6a85414e57ef4de0.1506297988.git.daniel@iogearbox.net>","list_archive_url":null,"date":"2017-09-25T00:25:52","name":"[net-next,3/6] bpf: update bpf.h uapi header for tools","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"7da5d7f158a9af852fb13e11b2ecea78ac1d8556","submitter":{"id":65705,"url":"http://patchwork.ozlabs.org/api/people/65705/?format=json","name":"Daniel Borkmann","email":"daniel@iogearbox.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/4bdb49b4387d698443e32b8a6a85414e57ef4de0.1506297988.git.daniel@iogearbox.net/mbox/","series":[{"id":4860,"url":"http://patchwork.ozlabs.org/api/series/4860/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4860","date":"2017-09-25T00:25:49","name":"BPF metadata for direct access","version":1,"mbox":"http://patchwork.ozlabs.org/series/4860/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818019/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818019/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0lK009VQz9t3R\n\tfor ;\n\tMon, 25 Sep 2017 10:27:16 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933148AbdIYA1J (ORCPT );\n\tSun, 24 Sep 2017 20:27:09 -0400","from www62.your-server.de ([213.133.104.62]:37207 \"EHLO\n\twww62.your-server.de\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932906AbdIYA1G (ORCPT\n\t); Sun, 24 Sep 2017 20:27:06 -0400","from [85.7.161.218] (helo=localhost)\n\tby www62.your-server.de with esmtpsa\n\t(TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.85_2)\n\t(envelope-from )\n\tid 1dwHEm-0000Hk-4h; Mon, 25 Sep 2017 02:27:04 +0200"],"From":"Daniel Borkmann ","To":"davem@davemloft.net","Cc":"alexei.starovoitov@gmail.com, john.fastabend@gmail.com,\n\tpeter.waskiewicz.jr@intel.com, jakub.kicinski@netronome.com,\n\tnetdev@vger.kernel.org, Daniel Borkmann ","Subject":"[PATCH net-next 3/6] bpf: update bpf.h uapi header for tools","Date":"Mon, 25 Sep 2017 02:25:52 +0200","Message-Id":"<4bdb49b4387d698443e32b8a6a85414e57ef4de0.1506297988.git.daniel@iogearbox.net>","X-Mailer":"git-send-email 1.9.3","In-Reply-To":["",""],"References":["",""],"X-Authenticated-Sender":"daniel@iogearbox.net","X-Virus-Scanned":"Clear (ClamAV 0.99.2/23869/Sun Sep 24 18:45:57 2017)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Looks like a couple of updates missed to get carried into tools/include/uapi/,\nso copy the bpf.h header as usual to pull in latest updates.\n\nSigned-off-by: Daniel Borkmann \nAcked-by: Alexei Starovoitov \nAcked-by: John Fastabend \n---\n tools/include/uapi/linux/bpf.h | 45 ++++++++++++++++++++++++++++++------------\n 1 file changed, 32 insertions(+), 13 deletions(-)","diff":"diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h\nindex 461811e..e43491a 100644\n--- a/tools/include/uapi/linux/bpf.h\n+++ b/tools/include/uapi/linux/bpf.h\n@@ -143,12 +143,6 @@ enum bpf_attach_type {\n \n #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE\n \n-enum bpf_sockmap_flags {\n-\tBPF_SOCKMAP_UNSPEC,\n-\tBPF_SOCKMAP_STRPARSER,\n-\t__MAX_BPF_SOCKMAP_FLAG\n-};\n-\n /* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command\n * to the given target_fd cgroup the descendent cgroup will be able to\n * override effective bpf program that was inherited from this cgroup\n@@ -368,9 +362,20 @@ enum bpf_sockmap_flags {\n * int bpf_redirect(ifindex, flags)\n * redirect to another netdev\n * @ifindex: ifindex of the net device\n- * @flags: bit 0 - if set, redirect to ingress instead of egress\n- * other bits - reserved\n- * Return: TC_ACT_REDIRECT\n+ * @flags:\n+ *\t cls_bpf:\n+ * bit 0 - if set, redirect to ingress instead of egress\n+ * other bits - reserved\n+ *\t xdp_bpf:\n+ *\t all bits - reserved\n+ * Return: cls_bpf: TC_ACT_REDIRECT on success or TC_ACT_SHOT on error\n+ *\t xdp_bfp: XDP_REDIRECT on success or XDP_ABORT on error\n+ * int bpf_redirect_map(map, key, flags)\n+ * redirect to endpoint in map\n+ * @map: pointer to dev map\n+ * @key: index in map to lookup\n+ * @flags: --\n+ * Return: XDP_REDIRECT on success or XDP_ABORT on error\n *\n * u32 bpf_get_route_realm(skb)\n * retrieve a dst's tclassid\n@@ -577,6 +582,12 @@ enum bpf_sockmap_flags {\n *\t@map: pointer to sockmap to update\n *\t@key: key to insert/update sock in map\n *\t@flags: same flags as map update elem\n+ *\n+ * int bpf_xdp_adjust_meta(xdp_md, delta)\n+ * Adjust the xdp_md.data_meta by delta\n+ * @xdp_md: pointer to xdp_md\n+ * @delta: An positive/negative integer to be added to xdp_md.data_meta\n+ * Return: 0 on success or negative on error\n */\n #define __BPF_FUNC_MAPPER(FN)\t\t\\\n \tFN(unspec),\t\t\t\\\n@@ -632,7 +643,8 @@ enum bpf_sockmap_flags {\n \tFN(skb_adjust_room),\t\t\\\n \tFN(redirect_map),\t\t\\\n \tFN(sk_redirect_map),\t\t\\\n-\tFN(sock_map_update),\n+\tFN(sock_map_update),\t\t\\\n+\tFN(xdp_adjust_meta),\n \n /* integer value in 'imm' field of BPF_CALL instruction selects which helper\n * function eBPF program intends to call\n@@ -710,7 +722,7 @@ struct __sk_buff {\n \t__u32 data_end;\n \t__u32 napi_id;\n \n-\t/* accessed by BPF_PROG_TYPE_sk_skb types */\n+\t/* Accessed by BPF_PROG_TYPE_sk_skb types from here to ... */\n \t__u32 family;\n \t__u32 remote_ip4;\t/* Stored in network byte order */\n \t__u32 local_ip4;\t/* Stored in network byte order */\n@@ -718,6 +730,9 @@ struct __sk_buff {\n \t__u32 local_ip6[4];\t/* Stored in network byte order */\n \t__u32 remote_port;\t/* Stored in network byte order */\n \t__u32 local_port;\t/* stored in host byte order */\n+\t/* ... here. */\n+\n+\t__u32 data_meta;\n };\n \n struct bpf_tunnel_key {\n@@ -753,20 +768,23 @@ struct bpf_sock {\n \t__u32 family;\n \t__u32 type;\n \t__u32 protocol;\n+\t__u32 mark;\n+\t__u32 priority;\n };\n \n #define XDP_PACKET_HEADROOM 256\n \n /* User return codes for XDP prog type.\n * A valid XDP program must return one of these defined values. All other\n- * return codes are reserved for future use. Unknown return codes will result\n- * in packet drop.\n+ * return codes are reserved for future use. Unknown return codes will\n+ * result in packet drops and a warning via bpf_warn_invalid_xdp_action().\n */\n enum xdp_action {\n \tXDP_ABORTED = 0,\n \tXDP_DROP,\n \tXDP_PASS,\n \tXDP_TX,\n+\tXDP_REDIRECT,\n };\n \n /* user accessible metadata for XDP packet hook\n@@ -775,6 +793,7 @@ enum xdp_action {\n struct xdp_md {\n \t__u32 data;\n \t__u32 data_end;\n+\t__u32 data_meta;\n };\n \n enum sk_action {\n","prefixes":["net-next","3/6"]}