From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yonghong Song Subject: [PATCH bpf-next v2 06/13] tools/bpf: sync kernel uapi bpf.h header to tools directory Date: Wed, 17 Oct 2018 00:23:41 -0700 Message-ID: <20181017072344.2767700-2-yhs@fb.com> References: <20181017072344.2767700-1-yhs@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: To: , , , Return-path: Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:49064 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbeJQPSY (ORCPT ); Wed, 17 Oct 2018 11:18:24 -0400 Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w9H7O1x8002757 for ; Wed, 17 Oct 2018 00:24:04 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2n5ygyg5eg-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 17 Oct 2018 00:24:04 -0700 In-Reply-To: <20181017072344.2767700-1-yhs@fb.com> Sender: netdev-owner@vger.kernel.org List-ID: The kernel uapi bpf.h is synced to tools directory. Signed-off-by: Yonghong Song --- tools/include/uapi/linux/bpf.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f9187b41dff6..7ebbf4f06a65 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -332,6 +332,9 @@ union bpf_attr { * (context accesses, allowed helpers, etc). */ __u32 expected_attach_type; + __u32 prog_btf_fd; /* fd pointing to BTF type data */ + __u32 func_info_len; /* func_info length */ + __aligned_u64 func_info; /* func type info */ }; struct { /* anonymous struct used by BPF_OBJ_* commands */ @@ -2585,6 +2588,9 @@ struct bpf_prog_info { __u32 nr_jited_func_lens; __aligned_u64 jited_ksyms; __aligned_u64 jited_func_lens; + __u32 btf_id; + __u32 nr_jited_func_types; + __aligned_u64 jited_func_types; } __attribute__((aligned(8))); struct bpf_map_info { @@ -2896,4 +2902,9 @@ struct bpf_flow_keys { }; }; +struct bpf_func_info { + __u32 insn_offset; + __u32 type_id; +}; + #endif /* _UAPI__LINUX_BPF_H__ */ -- 2.17.1