[bpf-next,v4,03/13] tools/bpf: sync kernel btf.h header

Message ID	20181108203718.3139024-1-yhs@fb.com
State	Changes Requested, archived
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> Smtp-Origin-Hostprefix: devbig From: Yonghong Song <yhs@fb.com> Smtp-Origin-Hostname: devbig003.ftw2.facebook.com To: <ast@fb.com>, <daniel@iogearbox.net>, <netdev@vger.kernel.org> CC: <kernel-team@fb.com>, Martin KaFai Lau <kafai@fb.com> Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next v4 03/13] tools/bpf: sync kernel btf.h header Date: Thu, 8 Nov 2018 12:37:15 -0800 Message-ID: <20181108203718.3139024-1-yhs@fb.com> MIME-Version: 1.0 Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	bpf: add btf func info support \| expand [bpf-next,v4,00/13] bpf: add btf func info support [bpf-next,v4,01/13] bpf: btf: Break up btf_type_is_void() [bpf-next,v4,02/13] bpf: btf: Add BTF_KIND_FUNC [bpf-next,v4,03/13] tools/bpf: sync kernel btf.h header [bpf-next,v4,04/13] tools/bpf: add btf func unit tests in selftest test_btf [bpf-next,v4,05/13] bpf: get better bpf_prog ksyms based on btf func type_id [bpf-next,v4,06/13] tools/bpf: sync kernel uapi bpf.h header to tools directory [bpf-next,v4,07/13] tools/bpf: add new fields for program load in lib/bpf [bpf-next,v4,08/13] tools/bpf: extends test_btf to test load/retrieve func_type info [bpf-next,v4,09/13] tools/bpf: add support to read .BTF.ext sections [bpf-next,v4,10/13] tools/bpf: do not use pahole if clang/llvm can generate BTF sections [bpf-next,v4,11/13] tools/bpf: refactor to implement btf_get_from_id() in lib/bpf [bpf-next,v4,12/13] tools/bpf: enhance test_btf file testing to test func info [bpf-next,v4,13/13] tools/bpf: bpftool: add support for func types

Message ID

20181108203718.3139024-1-yhs@fb.com

State

Changes Requested, archived

Delegated to:

BPF Maintainers

Headers

Smtp-Origin-Hostprefix: devbig
From: Yonghong Song <yhs@fb.com>
Smtp-Origin-Hostname: devbig003.ftw2.facebook.com
To: <ast@fb.com>, <daniel@iogearbox.net>, <netdev@vger.kernel.org>
CC: <kernel-team@fb.com>, Martin KaFai Lau <kafai@fb.com>
Smtp-Origin-Cluster: ftw2c04
Subject: [PATCH bpf-next v4 03/13] tools/bpf: sync kernel btf.h header
Date: Thu, 8 Nov 2018 12:37:15 -0800
Message-ID: <20181108203718.3139024-1-yhs@fb.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

bpf: add btf func info support | expand

Commit Message

Yonghong Song Nov. 8, 2018, 8:37 p.m. UTC

The kernel uapi btf.h is synced to the tools directory.

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Yonghong Song <yhs@fb.com>
---
 tools/include/uapi/linux/btf.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index 972265f32871..9e7c74a83ee7 100644
--- a/tools/include/uapi/linux/btf.h
+++ b/tools/include/uapi/linux/btf.h
@@ -40,7 +40,8 @@  struct btf_type {
 	/* "size" is used by INT, ENUM, STRUCT and UNION.
 	 * "size" tells the size of the type it is describing.
 	 *
-	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST and RESTRICT.
+	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT
+	 * and FUNC.
 	 * "type" is a type_id referring to another type.
 	 */
 	union {
@@ -64,8 +65,9 @@  struct btf_type {
 #define BTF_KIND_VOLATILE	9	/* Volatile	*/
 #define BTF_KIND_CONST		10	/* Const	*/
 #define BTF_KIND_RESTRICT	11	/* Restrict	*/
-#define BTF_KIND_MAX		11
-#define NR_BTF_KINDS		12
+#define BTF_KIND_FUNC		12	/* Function	*/
+#define BTF_KIND_MAX		12
+#define NR_BTF_KINDS		13
 
 /* For some specific BTF_KIND, "struct btf_type" is immediately
  * followed by extra data.
@@ -110,4 +112,13 @@  struct btf_member {
 	__u32	offset;	/* offset in bits */
 };
 
+/* BTF_KIND_FUNC is followed by multiple "struct btf_param".
+ * The exact number of btf_param is stored in the vlen (of the
+ * info in "struct btf_type").
+ */
+struct btf_param {
+	__u32	name_off;
+	__u32	type;
+};
+
 #endif /* _UAPI__LINUX_BTF_H__ */

[bpf-next,v4,03/13] tools/bpf: sync kernel btf.h header

Commit Message

Patch