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

Message ID	20181017233026.1071519-4-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>, <kafai@fb.com>, <daniel@iogearbox.net>, <netdev@vger.kernel.org> CC: <kernel-team@fb.com> Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next v3 03/13] tools/bpf: sync kernel btf.h header Date: Wed, 17 Oct 2018 16:30:25 -0700 Message-ID: <20181017233026.1071519-4-yhs@fb.com> In-Reply-To: <20181017233026.1071519-1-yhs@fb.com> References: <20181017233026.1071519-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,v3,00/13] bpf: add btf func info support [bpf-next,v3,01/13] bpf: btf: Break up btf_type_is_void() [bpf-next,v3,02/13] bpf: btf: Add BTF_KIND_FUNC and BTF_KIND_FUNC_PROTO [bpf-next,v3,03/13] tools/bpf: sync kernel btf.h header [bpf-next,v3,04/13] tools/bpf: add btf func/func_proto unit tests in selftest test_btf [bpf-next,v3,05/13] bpf: get better bpf_prog ksyms based on btf func type_id [bpf-next,v3,06/13] tools/bpf: sync kernel uapi bpf.h header to tools directory [bpf-next,v3,07/13] tools/bpf: add new fields for program load in lib/bpf [bpf-next,v3,08/13] tools/bpf: extends test_btf to test load/retrieve func_type info [bpf-next,v3,09/13] tools/bpf: add support to read .BTF.ext sections [bpf-next,v3,10/13] tools/bpf: do not use pahole if clang/llvm can generate BTF sections [bpf-next,v3,11/13] tools/bpf: refactor to implement btf_get_from_id() in lib/bpf [bpf-next,v3,12/13] tools/bpf: enhance test_btf file testing to test func info [bpf-next,v3,13/13] tools/bpf: bpftool: add support for jited func types

Message ID

20181017233026.1071519-4-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>, <kafai@fb.com>, <daniel@iogearbox.net>,
	<netdev@vger.kernel.org>
CC: <kernel-team@fb.com>
Smtp-Origin-Cluster: ftw2c04
Subject: [PATCH bpf-next v3 03/13] tools/bpf: sync kernel btf.h header
Date: Wed, 17 Oct 2018 16:30:25 -0700
Message-ID: <20181017233026.1071519-4-yhs@fb.com>
In-Reply-To: <20181017233026.1071519-1-yhs@fb.com>
References: <20181017233026.1071519-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 Oct. 17, 2018, 11:30 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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index 972265f32871..63f8500e6f34 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,
+	 * FUNC and FUNC_PROTO.
 	 * "type" is a type_id referring to another type.
 	 */
 	union {
@@ -64,8 +65,10 @@  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_FUNC_PROTO	13	/* Function Prototype	*/
+#define BTF_KIND_MAX		13
+#define NR_BTF_KINDS		14
 
 /* For some specific BTF_KIND, "struct btf_type" is immediately
  * followed by extra data.

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

Commit Message

Patch