From 0bc886f1634443d202e24f56cb74d3dce2e66e37 Mon Sep 17 00:00:00 2001 From: alessandrod Date: Mon, 29 May 2023 05:27:07 +0000 Subject: [PATCH] [codegen] Update libbpf to f7eb43b90f4c8882edf6354f8585094f8f3aade0Update libbpf to f7eb43b90f4c8882edf6354f8585094f8f3aade0 Files changed: M aya-obj/src/generated/btf_internal_bindings.rs M aya-obj/src/generated/linux_bindings_aarch64.rs M aya-obj/src/generated/linux_bindings_armv7.rs M aya-obj/src/generated/linux_bindings_riscv64.rs M aya-obj/src/generated/linux_bindings_x86_64.rs M bpf/aya-bpf-bindings/src/aarch64/bindings.rs M bpf/aya-bpf-bindings/src/armv7/bindings.rs M bpf/aya-bpf-bindings/src/riscv64/bindings.rs M bpf/aya-bpf-bindings/src/x86_64/bindings.rs --- .../src/generated/btf_internal_bindings.rs | 2 +- .../src/generated/linux_bindings_aarch64.rs | 80 +++++++++-- aya-obj/src/generated/linux_bindings_armv7.rs | 80 +++++++++-- .../src/generated/linux_bindings_riscv64.rs | 80 +++++++++-- .../src/generated/linux_bindings_x86_64.rs | 80 +++++++++-- bpf/aya-bpf-bindings/src/aarch64/bindings.rs | 97 +++++++++++-- bpf/aya-bpf-bindings/src/armv7/bindings.rs | 97 +++++++++++-- bpf/aya-bpf-bindings/src/riscv64/bindings.rs | 133 ++++++++++++++++-- bpf/aya-bpf-bindings/src/x86_64/bindings.rs | 97 +++++++++++-- 9 files changed, 629 insertions(+), 117 deletions(-) diff --git a/aya-obj/src/generated/btf_internal_bindings.rs b/aya-obj/src/generated/btf_internal_bindings.rs index b4a231e5..4b254c02 100644 --- a/aya-obj/src/generated/btf_internal_bindings.rs +++ b/aya-obj/src/generated/btf_internal_bindings.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.64.0 */ +/* automatically generated by rust-bindgen 0.65.1 */ pub type __u8 = ::core::ffi::c_uchar; pub type __u16 = ::core::ffi::c_ushort; diff --git a/aya-obj/src/generated/linux_bindings_aarch64.rs b/aya-obj/src/generated/linux_bindings_aarch64.rs index c2b201e5..9bca533b 100644 --- a/aya-obj/src/generated/linux_bindings_aarch64.rs +++ b/aya-obj/src/generated/linux_bindings_aarch64.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.64.0 */ +/* automatically generated by rust-bindgen 0.65.1 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -352,6 +352,7 @@ pub enum bpf_prog_type { BPF_PROG_TYPE_LSM = 29, BPF_PROG_TYPE_SK_LOOKUP = 30, BPF_PROG_TYPE_SYSCALL = 31, + BPF_PROG_TYPE_NETFILTER = 32, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -400,7 +401,8 @@ pub enum bpf_attach_type { BPF_PERF_EVENT = 41, BPF_TRACE_KPROBE_MULTI = 42, BPF_LSM_CGROUP = 43, - __MAX_BPF_ATTACH_TYPE = 44, + BPF_STRUCT_OPS = 44, + __MAX_BPF_ATTACH_TYPE = 45, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -415,7 +417,8 @@ pub enum bpf_link_type { BPF_LINK_TYPE_PERF_EVENT = 7, BPF_LINK_TYPE_KPROBE_MULTI = 8, BPF_LINK_TYPE_STRUCT_OPS = 9, - MAX_BPF_LINK_TYPE = 10, + BPF_LINK_TYPE_NETFILTER = 10, + MAX_BPF_LINK_TYPE = 11, } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -435,6 +438,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::core::ffi::c_uint; #[repr(C)] #[derive(Copy, Clone)] @@ -531,6 +536,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -544,6 +550,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -621,6 +628,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -638,41 +646,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -681,17 +696,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -915,6 +950,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -984,6 +1021,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct bpf_func_info { pub insn_off: __u32, pub type_id: __u32, diff --git a/aya-obj/src/generated/linux_bindings_armv7.rs b/aya-obj/src/generated/linux_bindings_armv7.rs index 1cc59396..b81b8ecc 100644 --- a/aya-obj/src/generated/linux_bindings_armv7.rs +++ b/aya-obj/src/generated/linux_bindings_armv7.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.64.0 */ +/* automatically generated by rust-bindgen 0.65.1 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -352,6 +352,7 @@ pub enum bpf_prog_type { BPF_PROG_TYPE_LSM = 29, BPF_PROG_TYPE_SK_LOOKUP = 30, BPF_PROG_TYPE_SYSCALL = 31, + BPF_PROG_TYPE_NETFILTER = 32, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -400,7 +401,8 @@ pub enum bpf_attach_type { BPF_PERF_EVENT = 41, BPF_TRACE_KPROBE_MULTI = 42, BPF_LSM_CGROUP = 43, - __MAX_BPF_ATTACH_TYPE = 44, + BPF_STRUCT_OPS = 44, + __MAX_BPF_ATTACH_TYPE = 45, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -415,7 +417,8 @@ pub enum bpf_link_type { BPF_LINK_TYPE_PERF_EVENT = 7, BPF_LINK_TYPE_KPROBE_MULTI = 8, BPF_LINK_TYPE_STRUCT_OPS = 9, - MAX_BPF_LINK_TYPE = 10, + BPF_LINK_TYPE_NETFILTER = 10, + MAX_BPF_LINK_TYPE = 11, } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -435,6 +438,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::core::ffi::c_uint; #[repr(C)] #[derive(Copy, Clone)] @@ -531,6 +536,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -544,6 +550,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -621,6 +628,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -638,41 +646,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -681,17 +696,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -915,6 +950,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -984,6 +1021,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct bpf_func_info { pub insn_off: __u32, pub type_id: __u32, diff --git a/aya-obj/src/generated/linux_bindings_riscv64.rs b/aya-obj/src/generated/linux_bindings_riscv64.rs index c2b201e5..9bca533b 100644 --- a/aya-obj/src/generated/linux_bindings_riscv64.rs +++ b/aya-obj/src/generated/linux_bindings_riscv64.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.64.0 */ +/* automatically generated by rust-bindgen 0.65.1 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -352,6 +352,7 @@ pub enum bpf_prog_type { BPF_PROG_TYPE_LSM = 29, BPF_PROG_TYPE_SK_LOOKUP = 30, BPF_PROG_TYPE_SYSCALL = 31, + BPF_PROG_TYPE_NETFILTER = 32, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -400,7 +401,8 @@ pub enum bpf_attach_type { BPF_PERF_EVENT = 41, BPF_TRACE_KPROBE_MULTI = 42, BPF_LSM_CGROUP = 43, - __MAX_BPF_ATTACH_TYPE = 44, + BPF_STRUCT_OPS = 44, + __MAX_BPF_ATTACH_TYPE = 45, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -415,7 +417,8 @@ pub enum bpf_link_type { BPF_LINK_TYPE_PERF_EVENT = 7, BPF_LINK_TYPE_KPROBE_MULTI = 8, BPF_LINK_TYPE_STRUCT_OPS = 9, - MAX_BPF_LINK_TYPE = 10, + BPF_LINK_TYPE_NETFILTER = 10, + MAX_BPF_LINK_TYPE = 11, } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -435,6 +438,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::core::ffi::c_uint; #[repr(C)] #[derive(Copy, Clone)] @@ -531,6 +536,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -544,6 +550,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -621,6 +628,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -638,41 +646,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -681,17 +696,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -915,6 +950,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -984,6 +1021,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct bpf_func_info { pub insn_off: __u32, pub type_id: __u32, diff --git a/aya-obj/src/generated/linux_bindings_x86_64.rs b/aya-obj/src/generated/linux_bindings_x86_64.rs index c2b201e5..9bca533b 100644 --- a/aya-obj/src/generated/linux_bindings_x86_64.rs +++ b/aya-obj/src/generated/linux_bindings_x86_64.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.64.0 */ +/* automatically generated by rust-bindgen 0.65.1 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -352,6 +352,7 @@ pub enum bpf_prog_type { BPF_PROG_TYPE_LSM = 29, BPF_PROG_TYPE_SK_LOOKUP = 30, BPF_PROG_TYPE_SYSCALL = 31, + BPF_PROG_TYPE_NETFILTER = 32, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -400,7 +401,8 @@ pub enum bpf_attach_type { BPF_PERF_EVENT = 41, BPF_TRACE_KPROBE_MULTI = 42, BPF_LSM_CGROUP = 43, - __MAX_BPF_ATTACH_TYPE = 44, + BPF_STRUCT_OPS = 44, + __MAX_BPF_ATTACH_TYPE = 45, } #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -415,7 +417,8 @@ pub enum bpf_link_type { BPF_LINK_TYPE_PERF_EVENT = 7, BPF_LINK_TYPE_KPROBE_MULTI = 8, BPF_LINK_TYPE_STRUCT_OPS = 9, - MAX_BPF_LINK_TYPE = 10, + BPF_LINK_TYPE_NETFILTER = 10, + MAX_BPF_LINK_TYPE = 11, } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -435,6 +438,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::core::ffi::c_uint; #[repr(C)] #[derive(Copy, Clone)] @@ -531,6 +536,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -544,6 +550,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -621,6 +628,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -638,41 +646,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -681,17 +696,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -915,6 +950,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -984,6 +1021,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct bpf_func_info { pub insn_off: __u32, pub type_id: __u32, diff --git a/bpf/aya-bpf-bindings/src/aarch64/bindings.rs b/bpf/aya-bpf-bindings/src/aarch64/bindings.rs index 8d963f69..34ebff65 100644 --- a/bpf/aya-bpf-bindings/src/aarch64/bindings.rs +++ b/bpf/aya-bpf-bindings/src/aarch64/bindings.rs @@ -505,6 +505,7 @@ pub mod bpf_prog_type { pub const BPF_PROG_TYPE_LSM: Type = 29; pub const BPF_PROG_TYPE_SK_LOOKUP: Type = 30; pub const BPF_PROG_TYPE_SYSCALL: Type = 31; + pub const BPF_PROG_TYPE_NETFILTER: Type = 32; } pub mod bpf_attach_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -552,7 +553,8 @@ pub mod bpf_attach_type { pub const BPF_PERF_EVENT: Type = 41; pub const BPF_TRACE_KPROBE_MULTI: Type = 42; pub const BPF_LSM_CGROUP: Type = 43; - pub const __MAX_BPF_ATTACH_TYPE: Type = 44; + pub const BPF_STRUCT_OPS: Type = 44; + pub const __MAX_BPF_ATTACH_TYPE: Type = 45; } pub mod bpf_link_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -566,7 +568,8 @@ pub mod bpf_link_type { pub const BPF_LINK_TYPE_PERF_EVENT: Type = 7; pub const BPF_LINK_TYPE_KPROBE_MULTI: Type = 8; pub const BPF_LINK_TYPE_STRUCT_OPS: Type = 9; - pub const MAX_BPF_LINK_TYPE: Type = 10; + pub const BPF_LINK_TYPE_NETFILTER: Type = 10; + pub const MAX_BPF_LINK_TYPE: Type = 11; } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -586,6 +589,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::aya_bpf_cty::c_uint; pub mod bpf_stats_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -705,6 +710,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -718,6 +724,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -795,6 +802,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -812,41 +820,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -855,17 +870,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1713,6 +1748,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1781,6 +1818,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { pub ifindex: __u32, } #[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] #[derive(Copy, Clone)] pub struct bpf_sock_addr { pub user_family: __u32, @@ -2207,6 +2257,20 @@ impl bpf_rb_node { } } #[repr(C)] +#[repr(align(4))] +#[derive(Debug, Copy, Clone)] +pub struct bpf_refcount { + pub _bitfield_align_1: [u8; 0], + pub _bitfield_1: __BindgenBitfieldUnit<[u8; 4usize]>, +} +impl bpf_refcount { + #[inline] + pub fn new_bitfield_1() -> __BindgenBitfieldUnit<[u8; 4usize]> { + let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 4usize]> = Default::default(); + __bindgen_bitfield_unit + } +} +#[repr(C)] #[derive(Debug, Copy, Clone)] pub struct bpf_sysctl { pub write: __u32, @@ -2349,6 +2413,11 @@ pub const BPF_F_TIMER_ABS: _bindgen_ty_39 = 1; pub type _bindgen_ty_39 = ::aya_bpf_cty::c_uint; #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_iter_num { + pub __opaque: [__u64; 1usize], +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct user_pt_regs { pub regs: [__u64; 31usize], pub sp: __u64, diff --git a/bpf/aya-bpf-bindings/src/armv7/bindings.rs b/bpf/aya-bpf-bindings/src/armv7/bindings.rs index 101843a7..7c8644d4 100644 --- a/bpf/aya-bpf-bindings/src/armv7/bindings.rs +++ b/bpf/aya-bpf-bindings/src/armv7/bindings.rs @@ -500,6 +500,7 @@ pub mod bpf_prog_type { pub const BPF_PROG_TYPE_LSM: Type = 29; pub const BPF_PROG_TYPE_SK_LOOKUP: Type = 30; pub const BPF_PROG_TYPE_SYSCALL: Type = 31; + pub const BPF_PROG_TYPE_NETFILTER: Type = 32; } pub mod bpf_attach_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -547,7 +548,8 @@ pub mod bpf_attach_type { pub const BPF_PERF_EVENT: Type = 41; pub const BPF_TRACE_KPROBE_MULTI: Type = 42; pub const BPF_LSM_CGROUP: Type = 43; - pub const __MAX_BPF_ATTACH_TYPE: Type = 44; + pub const BPF_STRUCT_OPS: Type = 44; + pub const __MAX_BPF_ATTACH_TYPE: Type = 45; } pub mod bpf_link_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -561,7 +563,8 @@ pub mod bpf_link_type { pub const BPF_LINK_TYPE_PERF_EVENT: Type = 7; pub const BPF_LINK_TYPE_KPROBE_MULTI: Type = 8; pub const BPF_LINK_TYPE_STRUCT_OPS: Type = 9; - pub const MAX_BPF_LINK_TYPE: Type = 10; + pub const BPF_LINK_TYPE_NETFILTER: Type = 10; + pub const MAX_BPF_LINK_TYPE: Type = 11; } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -581,6 +584,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::aya_bpf_cty::c_uint; pub mod bpf_stats_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -700,6 +705,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -713,6 +719,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -790,6 +797,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -807,41 +815,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -850,17 +865,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1717,6 +1752,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1785,6 +1822,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { pub ifindex: __u32, } #[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] #[derive(Copy, Clone)] pub struct bpf_sock_addr { pub user_family: __u32, @@ -2215,6 +2265,20 @@ impl bpf_rb_node { } } #[repr(C)] +#[repr(align(4))] +#[derive(Debug, Copy, Clone)] +pub struct bpf_refcount { + pub _bitfield_align_1: [u8; 0], + pub _bitfield_1: __BindgenBitfieldUnit<[u8; 4usize]>, +} +impl bpf_refcount { + #[inline] + pub fn new_bitfield_1() -> __BindgenBitfieldUnit<[u8; 4usize]> { + let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 4usize]> = Default::default(); + __bindgen_bitfield_unit + } +} +#[repr(C)] #[derive(Debug, Copy, Clone)] pub struct bpf_sysctl { pub write: __u32, @@ -2361,6 +2425,11 @@ pub const BPF_F_TIMER_ABS: _bindgen_ty_39 = 1; pub type _bindgen_ty_39 = ::aya_bpf_cty::c_uint; #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_iter_num { + pub __opaque: [__u64; 1usize], +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct pt_regs { pub uregs: [::aya_bpf_cty::c_long; 18usize], } diff --git a/bpf/aya-bpf-bindings/src/riscv64/bindings.rs b/bpf/aya-bpf-bindings/src/riscv64/bindings.rs index 956818b7..f11a348d 100644 --- a/bpf/aya-bpf-bindings/src/riscv64/bindings.rs +++ b/bpf/aya-bpf-bindings/src/riscv64/bindings.rs @@ -505,6 +505,7 @@ pub mod bpf_prog_type { pub const BPF_PROG_TYPE_LSM: Type = 29; pub const BPF_PROG_TYPE_SK_LOOKUP: Type = 30; pub const BPF_PROG_TYPE_SYSCALL: Type = 31; + pub const BPF_PROG_TYPE_NETFILTER: Type = 32; } pub mod bpf_attach_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -552,7 +553,8 @@ pub mod bpf_attach_type { pub const BPF_PERF_EVENT: Type = 41; pub const BPF_TRACE_KPROBE_MULTI: Type = 42; pub const BPF_LSM_CGROUP: Type = 43; - pub const __MAX_BPF_ATTACH_TYPE: Type = 44; + pub const BPF_STRUCT_OPS: Type = 44; + pub const __MAX_BPF_ATTACH_TYPE: Type = 45; } pub mod bpf_link_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -566,7 +568,8 @@ pub mod bpf_link_type { pub const BPF_LINK_TYPE_PERF_EVENT: Type = 7; pub const BPF_LINK_TYPE_KPROBE_MULTI: Type = 8; pub const BPF_LINK_TYPE_STRUCT_OPS: Type = 9; - pub const MAX_BPF_LINK_TYPE: Type = 10; + pub const BPF_LINK_TYPE_NETFILTER: Type = 10; + pub const MAX_BPF_LINK_TYPE: Type = 11; } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -586,6 +589,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::aya_bpf_cty::c_uint; pub mod bpf_stats_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -705,6 +710,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -718,6 +724,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -795,6 +802,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -812,41 +820,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -855,17 +870,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1713,6 +1748,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1781,6 +1818,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { pub ifindex: __u32, } #[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] #[derive(Copy, Clone)] pub struct bpf_sock_addr { pub user_family: __u32, @@ -2207,6 +2257,20 @@ impl bpf_rb_node { } } #[repr(C)] +#[repr(align(4))] +#[derive(Debug, Copy, Clone)] +pub struct bpf_refcount { + pub _bitfield_align_1: [u8; 0], + pub _bitfield_1: __BindgenBitfieldUnit<[u8; 4usize]>, +} +impl bpf_refcount { + #[inline] + pub fn new_bitfield_1() -> __BindgenBitfieldUnit<[u8; 4usize]> { + let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 4usize]> = Default::default(); + __bindgen_bitfield_unit + } +} +#[repr(C)] #[derive(Debug, Copy, Clone)] pub struct bpf_sysctl { pub write: __u32, @@ -2347,6 +2411,47 @@ pub struct bpf_core_relo { } pub const BPF_F_TIMER_ABS: _bindgen_ty_39 = 1; pub type _bindgen_ty_39 = ::aya_bpf_cty::c_uint; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_iter_num { + pub __opaque: [__u64; 1usize], +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct user_regs_struct { + pub pc: ::aya_bpf_cty::c_ulong, + pub ra: ::aya_bpf_cty::c_ulong, + pub sp: ::aya_bpf_cty::c_ulong, + pub gp: ::aya_bpf_cty::c_ulong, + pub tp: ::aya_bpf_cty::c_ulong, + pub t0: ::aya_bpf_cty::c_ulong, + pub t1: ::aya_bpf_cty::c_ulong, + pub t2: ::aya_bpf_cty::c_ulong, + pub s0: ::aya_bpf_cty::c_ulong, + pub s1: ::aya_bpf_cty::c_ulong, + pub a0: ::aya_bpf_cty::c_ulong, + pub a1: ::aya_bpf_cty::c_ulong, + pub a2: ::aya_bpf_cty::c_ulong, + pub a3: ::aya_bpf_cty::c_ulong, + pub a4: ::aya_bpf_cty::c_ulong, + pub a5: ::aya_bpf_cty::c_ulong, + pub a6: ::aya_bpf_cty::c_ulong, + pub a7: ::aya_bpf_cty::c_ulong, + pub s2: ::aya_bpf_cty::c_ulong, + pub s3: ::aya_bpf_cty::c_ulong, + pub s4: ::aya_bpf_cty::c_ulong, + pub s5: ::aya_bpf_cty::c_ulong, + pub s6: ::aya_bpf_cty::c_ulong, + pub s7: ::aya_bpf_cty::c_ulong, + pub s8: ::aya_bpf_cty::c_ulong, + pub s9: ::aya_bpf_cty::c_ulong, + pub s10: ::aya_bpf_cty::c_ulong, + pub s11: ::aya_bpf_cty::c_ulong, + pub t3: ::aya_bpf_cty::c_ulong, + pub t4: ::aya_bpf_cty::c_ulong, + pub t5: ::aya_bpf_cty::c_ulong, + pub t6: ::aya_bpf_cty::c_ulong, +} pub type sa_family_t = ::aya_bpf_cty::c_ushort; #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/bpf/aya-bpf-bindings/src/x86_64/bindings.rs b/bpf/aya-bpf-bindings/src/x86_64/bindings.rs index 3b79d228..6899f2ae 100644 --- a/bpf/aya-bpf-bindings/src/x86_64/bindings.rs +++ b/bpf/aya-bpf-bindings/src/x86_64/bindings.rs @@ -505,6 +505,7 @@ pub mod bpf_prog_type { pub const BPF_PROG_TYPE_LSM: Type = 29; pub const BPF_PROG_TYPE_SK_LOOKUP: Type = 30; pub const BPF_PROG_TYPE_SYSCALL: Type = 31; + pub const BPF_PROG_TYPE_NETFILTER: Type = 32; } pub mod bpf_attach_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -552,7 +553,8 @@ pub mod bpf_attach_type { pub const BPF_PERF_EVENT: Type = 41; pub const BPF_TRACE_KPROBE_MULTI: Type = 42; pub const BPF_LSM_CGROUP: Type = 43; - pub const __MAX_BPF_ATTACH_TYPE: Type = 44; + pub const BPF_STRUCT_OPS: Type = 44; + pub const __MAX_BPF_ATTACH_TYPE: Type = 45; } pub mod bpf_link_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -566,7 +568,8 @@ pub mod bpf_link_type { pub const BPF_LINK_TYPE_PERF_EVENT: Type = 7; pub const BPF_LINK_TYPE_KPROBE_MULTI: Type = 8; pub const BPF_LINK_TYPE_STRUCT_OPS: Type = 9; - pub const MAX_BPF_LINK_TYPE: Type = 10; + pub const BPF_LINK_TYPE_NETFILTER: Type = 10; + pub const MAX_BPF_LINK_TYPE: Type = 11; } pub const BPF_ANY: _bindgen_ty_2 = 0; pub const BPF_NOEXIST: _bindgen_ty_2 = 1; @@ -586,6 +589,8 @@ pub const BPF_F_CLONE: _bindgen_ty_3 = 512; pub const BPF_F_MMAPABLE: _bindgen_ty_3 = 1024; pub const BPF_F_PRESERVE_ELEMS: _bindgen_ty_3 = 2048; pub const BPF_F_INNER_MAP: _bindgen_ty_3 = 4096; +pub const BPF_F_LINK: _bindgen_ty_3 = 8192; +pub const BPF_F_PATH_FD: _bindgen_ty_3 = 16384; pub type _bindgen_ty_3 = ::aya_bpf_cty::c_uint; pub mod bpf_stats_type { pub type Type = ::aya_bpf_cty::c_uint; @@ -705,6 +710,7 @@ pub struct bpf_attr__bindgen_ty_4 { pub fd_array: __u64, pub core_relos: __u64, pub core_relo_rec_size: __u32, + pub log_true_size: __u32, } #[repr(C)] #[derive(Copy, Clone)] @@ -718,6 +724,7 @@ pub struct bpf_attr__bindgen_ty_5 { pub pathname: __u64, pub bpf_fd: __u32, pub file_flags: __u32, + pub path_fd: __s32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -795,6 +802,7 @@ pub struct bpf_attr__bindgen_ty_12 { pub btf_size: __u32, pub btf_log_size: __u32, pub btf_log_level: __u32, + pub btf_log_true_size: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -812,41 +820,48 @@ pub struct bpf_attr__bindgen_ty_13 { #[repr(C)] #[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_14 { - pub prog_fd: __u32, pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_1, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, pub attach_type: __u32, pub flags: __u32, - pub __bindgen_anon_2: bpf_attr__bindgen_ty_14__bindgen_ty_2, + pub __bindgen_anon_3: bpf_attr__bindgen_ty_14__bindgen_ty_3, } #[repr(C)] #[derive(Copy, Clone)] pub union bpf_attr__bindgen_ty_14__bindgen_ty_1 { + pub prog_fd: __u32, + pub map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { pub target_fd: __u32, pub target_ifindex: __u32, } #[repr(C)] #[derive(Copy, Clone)] -pub union bpf_attr__bindgen_ty_14__bindgen_ty_2 { +pub union bpf_attr__bindgen_ty_14__bindgen_ty_3 { pub target_btf_id: __u32, - pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1, - pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2, - pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3, - pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1, + pub perf_event: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2, + pub kprobe_multi: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3, + pub tracing: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4, + pub netfilter: bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_1 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_1 { pub iter_info: __u64, pub iter_info_len: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_2 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_2 { pub bpf_cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_3 { pub flags: __u32, pub cnt: __u32, pub syms: __u64, @@ -855,17 +870,37 @@ pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_3 { } #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct bpf_attr__bindgen_ty_14__bindgen_ty_2__bindgen_ty_4 { +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_4 { pub target_btf_id: __u32, pub cookie: __u64, } #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_attr__bindgen_ty_14__bindgen_ty_3__bindgen_ty_5 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] pub struct bpf_attr__bindgen_ty_15 { pub link_fd: __u32, - pub new_prog_fd: __u32, + pub __bindgen_anon_1: bpf_attr__bindgen_ty_15__bindgen_ty_1, pub flags: __u32, + pub __bindgen_anon_2: bpf_attr__bindgen_ty_15__bindgen_ty_2, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_1 { + pub new_prog_fd: __u32, + pub new_map_fd: __u32, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union bpf_attr__bindgen_ty_15__bindgen_ty_2 { pub old_prog_fd: __u32, + pub old_map_fd: __u32, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1713,6 +1748,8 @@ pub union bpf_link_info__bindgen_ty_1 { pub iter: bpf_link_info__bindgen_ty_1__bindgen_ty_4, pub netns: bpf_link_info__bindgen_ty_1__bindgen_ty_5, pub xdp: bpf_link_info__bindgen_ty_1__bindgen_ty_6, + pub struct_ops: bpf_link_info__bindgen_ty_1__bindgen_ty_7, + pub netfilter: bpf_link_info__bindgen_ty_1__bindgen_ty_8, } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -1781,6 +1818,19 @@ pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_6 { pub ifindex: __u32, } #[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_7 { + pub map_id: __u32, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct bpf_link_info__bindgen_ty_1__bindgen_ty_8 { + pub pf: __u32, + pub hooknum: __u32, + pub priority: __s32, + pub flags: __u32, +} +#[repr(C)] #[derive(Copy, Clone)] pub struct bpf_sock_addr { pub user_family: __u32, @@ -2207,6 +2257,20 @@ impl bpf_rb_node { } } #[repr(C)] +#[repr(align(4))] +#[derive(Debug, Copy, Clone)] +pub struct bpf_refcount { + pub _bitfield_align_1: [u8; 0], + pub _bitfield_1: __BindgenBitfieldUnit<[u8; 4usize]>, +} +impl bpf_refcount { + #[inline] + pub fn new_bitfield_1() -> __BindgenBitfieldUnit<[u8; 4usize]> { + let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 4usize]> = Default::default(); + __bindgen_bitfield_unit + } +} +#[repr(C)] #[derive(Debug, Copy, Clone)] pub struct bpf_sysctl { pub write: __u32, @@ -2349,6 +2413,11 @@ pub const BPF_F_TIMER_ABS: _bindgen_ty_39 = 1; pub type _bindgen_ty_39 = ::aya_bpf_cty::c_uint; #[repr(C)] #[derive(Debug, Copy, Clone)] +pub struct bpf_iter_num { + pub __opaque: [__u64; 1usize], +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] pub struct pt_regs { pub r15: ::aya_bpf_cty::c_ulong, pub r14: ::aya_bpf_cty::c_ulong,