From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexei Starovoitov Subject: [PATCH bpf-next 3/6] tools/bpf: sync uapi/bpf.h Date: Wed, 3 Oct 2018 19:57:47 -0700 Message-ID: <20181004025750.498303-4-ast@kernel.org> References: <20181004025750.498303-1-ast@kernel.org> Mime-Version: 1.0 Content-Type: text/plain Cc: , , , , , To: "David S . Miller" Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:41532 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727209AbeJDJtJ (ORCPT ); Thu, 4 Oct 2018 05:49:09 -0400 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w942vtON003622 for ; Wed, 3 Oct 2018 19:57:56 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2mw7gr8edn-3 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 03 Oct 2018 19:57:56 -0700 In-Reply-To: <20181004025750.498303-1-ast@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: sync uapi/bpf.h from kernel into tools Signed-off-by: Alexei Starovoitov --- tools/include/uapi/linux/bpf.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f9187b41dff6..c0df8dd99edc 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -154,6 +154,7 @@ enum bpf_prog_type { BPF_PROG_TYPE_LIRC_MODE2, BPF_PROG_TYPE_SK_REUSEPORT, BPF_PROG_TYPE_FLOW_DISSECTOR, + BPF_PROG_TYPE_FILE_FILTER, }; enum bpf_attach_type { @@ -175,6 +176,7 @@ enum bpf_attach_type { BPF_CGROUP_UDP6_SENDMSG, BPF_LIRC_MODE2, BPF_FLOW_DISSECTOR, + BPF_CGROUP_FILE_OPEN, __MAX_BPF_ATTACH_TYPE }; @@ -2215,6 +2217,18 @@ union bpf_attr { * pointer that was returned from bpf_sk_lookup_xxx\ (). * Return * 0 on success, or a negative error in case of failure. + * + * int bpf_get_file_path(struct bpf_file_info *file, char *buf, u32 size_of_buf) + * Description + * Reconstruct the full path of *file* and store it into *buf* of + * *size_of_buf*. The *size_of_buf* must be strictly positive. + * On success, the helper makes sure that the *buf* is NUL-terminated. + * On failure, it is filled with string "(error)". + * This helper should only be used for debugging. + * 'char *path' should never be used for permission checks. + * Return + * 0 on success, or a negative error in case of failure. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2303,7 +2317,8 @@ union bpf_attr { FN(skb_ancestor_cgroup_id), \ FN(sk_lookup_tcp), \ FN(sk_lookup_udp), \ - FN(sk_release), + FN(sk_release), \ + FN(get_file_path), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -2896,4 +2911,15 @@ struct bpf_flow_keys { }; }; +struct bpf_file_info { + __u64 inode; + __u32 dev_major; + __u32 dev_minor; + __u32 fs_magic; + __u32 mnt_id; + __u32 nlink; + __u32 mode; /* file mode S_ISDIR, S_ISLNK, 0755, etc */ + __u32 flags; /* open flags O_RDWR, O_CREAT, etc */ +}; + #endif /* _UAPI__LINUX_BPF_H__ */ -- 2.17.1