Remove XLAT_END

[strace] / bpf_attr.h

diff --git a/bpf_attr.h b/bpf_attr.h
index a789d10a08ae9520e7f542e0dd10add093e82fde..741a412407fb5cd3f5051310cc4e987b9ea7a9b9 100644 (file)
--- a/bpf_attr.h
+++ b/bpf_attr.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2018-2019 The strace developers.
  * All rights reserved.
  *
  * SPDX-License-Identifier: LGPL-2.1-or-later
@@ -94,6 +95,14 @@ struct BPF_MAP_GET_NEXT_KEY_struct {
        sizeof(struct BPF_MAP_GET_NEXT_KEY_struct)
 # define expected_BPF_MAP_GET_NEXT_KEY_struct_size 24
 
+struct BPF_MAP_FREEZE_struct {
+       uint32_t map_fd;
+};
+
+# define BPF_MAP_FREEZE_struct_size \
+       sizeof(struct BPF_MAP_FREEZE_struct)
+# define expected_BPF_MAP_FREEZE_struct_size 4
+
 struct BPF_PROG_LOAD_struct {
        uint32_t prog_type;
        uint32_t insn_cnt;
@@ -107,11 +116,18 @@ struct BPF_PROG_LOAD_struct {
        char     prog_name[BPF_OBJ_NAME_LEN];
        uint32_t prog_ifindex;
        uint32_t expected_attach_type;
+       uint32_t prog_btf_fd;
+       uint32_t func_info_rec_size;
+       uint64_t ATTRIBUTE_ALIGNED(8) func_info;
+       uint32_t func_info_cnt;
+       uint32_t line_info_rec_size;
+       uint64_t ATTRIBUTE_ALIGNED(8) line_info;
+       uint32_t line_info_cnt;
 };
 
 # define BPF_PROG_LOAD_struct_size \
-       offsetofend(struct BPF_PROG_LOAD_struct, expected_attach_type)
-# define expected_BPF_PROG_LOAD_struct_size 72
+       offsetofend(struct BPF_PROG_LOAD_struct, line_info_cnt)
+# define expected_BPF_PROG_LOAD_struct_size 108
 
 struct BPF_OBJ_PIN_struct {
        uint64_t ATTRIBUTE_ALIGNED(8) pathname;
@@ -156,11 +172,15 @@ struct BPF_PROG_TEST_RUN_struct /* test */ {
        uint64_t ATTRIBUTE_ALIGNED(8) data_out;
        uint32_t repeat;
        uint32_t duration;
+       uint32_t ctx_size_in;
+       uint32_t ctx_size_out;
+       uint64_t ATTRIBUTE_ALIGNED(8) ctx_in;
+       uint64_t ATTRIBUTE_ALIGNED(8) ctx_out;
 };
 
 # define BPF_PROG_TEST_RUN_struct_size \
        sizeof(struct BPF_PROG_TEST_RUN_struct)
-# define expected_BPF_PROG_TEST_RUN_struct_size 40
+# define expected_BPF_PROG_TEST_RUN_struct_size 64
 
 struct BPF_PROG_GET_NEXT_ID_struct {
        uint32_t start_id;
@@ -227,6 +247,42 @@ struct BPF_RAW_TRACEPOINT_OPEN_struct /* raw_tracepoint */ {
        offsetofend(struct BPF_RAW_TRACEPOINT_OPEN_struct, prog_fd)
 # define expected_BPF_RAW_TRACEPOINT_OPEN_struct_size 12
 
+struct BPF_BTF_LOAD_struct {
+       uint64_t ATTRIBUTE_ALIGNED(8) btf;
+       uint64_t ATTRIBUTE_ALIGNED(8) btf_log_buf;
+       uint32_t btf_size;
+       uint32_t btf_log_size;
+       uint32_t btf_log_level;
+};
+
+# define BPF_BTF_LOAD_struct_size \
+       offsetofend(struct BPF_BTF_LOAD_struct, btf_log_level)
+# define expected_BPF_BTF_LOAD_struct_size 28
+
+struct BPF_BTF_GET_FD_BY_ID_struct {
+       uint32_t btf_id;
+};
+
+# define BPF_BTF_GET_FD_BY_ID_struct_size \
+       sizeof(struct BPF_BTF_GET_FD_BY_ID_struct)
+# define expected_BPF_BTF_GET_FD_BY_ID_struct_size 4
+
+struct BPF_TASK_FD_QUERY_struct /* task_fd_query */ {
+       uint32_t pid;
+       uint32_t fd;
+       uint32_t flags;
+       uint32_t buf_len;
+       uint64_t ATTRIBUTE_ALIGNED(8) buf;
+       uint32_t prog_id;
+       uint32_t fd_type;
+       uint64_t ATTRIBUTE_ALIGNED(8) probe_offset;
+       uint64_t ATTRIBUTE_ALIGNED(8) probe_addr;
+};
+
+# define BPF_TASK_FD_QUERY_struct_size \
+       sizeof(struct BPF_TASK_FD_QUERY_struct)
+# define expected_BPF_TASK_FD_QUERY_struct_size 48
+
 struct bpf_map_info_struct {
        uint32_t type;
        uint32_t id;
@@ -242,11 +298,14 @@ struct bpf_map_info_struct {
         */
        uint64_t ATTRIBUTE_ALIGNED(8) netns_dev; /* skip check */
        uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
+       uint32_t btf_id;
+       uint32_t btf_key_type_id;
+       uint32_t btf_value_type_id;
 };
 
 # define bpf_map_info_struct_size \
-       sizeof(struct bpf_map_info_struct)
-# define expected_bpf_map_info_struct_size 64
+       offsetofend(struct bpf_map_info_struct, btf_value_type_id)
+# define expected_bpf_map_info_struct_size 76
 
 struct bpf_prog_info_struct {
        uint32_t type;
@@ -269,10 +328,28 @@ struct bpf_prog_info_struct {
         */
        uint64_t ATTRIBUTE_ALIGNED(8) netns_dev; /* skip check */
        uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
+       uint32_t nr_jited_ksyms;
+       uint32_t nr_jited_func_lens;
+       uint64_t ATTRIBUTE_ALIGNED(8) jited_ksyms;
+       uint64_t ATTRIBUTE_ALIGNED(8) jited_func_lens;
+       uint32_t btf_id;
+       uint32_t func_info_rec_size;
+       uint64_t ATTRIBUTE_ALIGNED(8) func_info;
+       uint32_t nr_func_info;
+       uint32_t nr_line_info;
+       uint64_t ATTRIBUTE_ALIGNED(8) line_info;
+       uint64_t ATTRIBUTE_ALIGNED(8) jited_line_info;
+       uint32_t nr_jited_line_info;
+       uint32_t line_info_rec_size;
+       uint32_t jited_line_info_rec_size;
+       uint32_t nr_prog_tags;
+       uint64_t ATTRIBUTE_ALIGNED(8) prog_tags;
+       uint64_t ATTRIBUTE_ALIGNED(8) run_time_ns;
+       uint64_t ATTRIBUTE_ALIGNED(8) run_cnt;
 };
 
 # define bpf_prog_info_struct_size \
        sizeof(struct bpf_prog_info_struct)
-# define expected_bpf_prog_info_struct_size 104
+# define expected_bpf_prog_info_struct_size 208
 
 #endif /* !STRACE_BPF_ATTR_H */