diff --git a/Cargo.toml b/Cargo.toml index 02d31299..4c9492f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ "aya-log-ebpf-macros", # ebpf crates - "ebpf/aya-bpf", + "ebpf/aya-ebpf", "ebpf/aya-ebpf-bindings", "ebpf/aya-log-ebpf", "test/integration-ebpf", diff --git a/aya-bpf-macros/Cargo.toml b/aya-bpf-macros/Cargo.toml index 8135c1df..db92baae 100644 --- a/aya-bpf-macros/Cargo.toml +++ b/aya-bpf-macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aya-bpf-macros" version = "0.1.0" -description = "Proc macros used by aya-bpf" +description = "Proc macros used by aya-ebpf" authors.workspace = true license.workspace = true repository.workspace = true @@ -18,4 +18,4 @@ quote = { workspace = true } syn = { workspace = true, default-features = true, features = ["full"] } [dev-dependencies] -aya-bpf = { path = "../ebpf/aya-bpf", version = "0.1.0", default-features = false } +aya-ebpf = { path = "../ebpf/aya-ebpf", version = "0.1.0", default-features = false } diff --git a/aya-bpf-macros/src/btf_tracepoint.rs b/aya-bpf-macros/src/btf_tracepoint.rs index 1e9faa8f..f9e23e0a 100644 --- a/aya-bpf-macros/src/btf_tracepoint.rs +++ b/aya-bpf-macros/src/btf_tracepoint.rs @@ -34,7 +34,7 @@ impl BtfTracePoint { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = #fn_name(::aya_bpf::programs::BtfTracePointContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::BtfTracePointContext::new(ctx)); return 0; #item @@ -65,7 +65,7 @@ mod tests { #[no_mangle] #[link_section = "tp_btf"] fn foo(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = foo(::aya_bpf::programs::BtfTracePointContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::BtfTracePointContext::new(ctx)); return 0; fn foo(ctx: BtfTracePointContext) -> i32 { @@ -92,7 +92,7 @@ mod tests { #[no_mangle] #[link_section = "tp_btf/some_func"] fn foo(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = foo(::aya_bpf::programs::BtfTracePointContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::BtfTracePointContext::new(ctx)); return 0; fn foo(ctx: BtfTracePointContext) -> i32 { diff --git a/aya-bpf-macros/src/cgroup_device.rs b/aya-bpf-macros/src/cgroup_device.rs index 88311cbc..28800cce 100644 --- a/aya-bpf-macros/src/cgroup_device.rs +++ b/aya-bpf-macros/src/cgroup_device.rs @@ -23,8 +23,8 @@ impl CgroupDevice { Ok(quote! { #[no_mangle] #[link_section = "cgroup/dev"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_cgroup_dev_ctx) -> i32 { - return #fn_name(::aya_bpf::programs::DeviceContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_cgroup_dev_ctx) -> i32 { + return #fn_name(::aya_ebpf::programs::DeviceContext::new(ctx)); #item } @@ -53,8 +53,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/dev"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_cgroup_dev_ctx) -> i32 { - return foo(::aya_bpf::programs::DeviceContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_cgroup_dev_ctx) -> i32 { + return foo(::aya_ebpf::programs::DeviceContext::new(ctx)); fn foo(ctx: DeviceContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/cgroup_skb.rs b/aya-bpf-macros/src/cgroup_skb.rs index 1c984d13..39f60be1 100644 --- a/aya-bpf-macros/src/cgroup_skb.rs +++ b/aya-bpf-macros/src/cgroup_skb.rs @@ -37,8 +37,8 @@ impl CgroupSkb { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return #fn_name(::aya_bpf::programs::SkBuffContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return #fn_name(::aya_ebpf::programs::SkBuffContext::new(ctx)); #item } @@ -67,8 +67,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/skb"] - fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); fn foo(ctx: SkBuffContext) -> i32 { 0 @@ -93,8 +93,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup_skb/egress"] - fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); fn foo(ctx: SkBuffContext) -> i32 { 0 @@ -119,8 +119,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup_skb/ingress"] - fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); fn foo(ctx: SkBuffContext) -> i32 { 0 @@ -145,8 +145,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup_skb/egress"] - fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); fn foo(ctx: SkBuffContext) -> i32 { 0 @@ -171,8 +171,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup_skb/egress"] - pub fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + pub fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); pub fn foo(ctx: SkBuffContext) -> i32 { 0 @@ -197,8 +197,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup_skb/egress"] - pub(crate) fn foo(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return foo(::aya_bpf::programs::SkBuffContext::new(ctx)); + pub(crate) fn foo(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return foo(::aya_ebpf::programs::SkBuffContext::new(ctx)); pub(crate) fn foo(ctx: SkBuffContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/cgroup_sock.rs b/aya-bpf-macros/src/cgroup_sock.rs index 015df836..d8950500 100644 --- a/aya-bpf-macros/src/cgroup_sock.rs +++ b/aya-bpf-macros/src/cgroup_sock.rs @@ -35,8 +35,8 @@ impl CgroupSock { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sock) -> i32 { - return #fn_name(::aya_bpf::programs::SockContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sock) -> i32 { + return #fn_name(::aya_ebpf::programs::SockContext::new(ctx)); #item } @@ -65,8 +65,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/post_bind4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock) -> i32 { - return foo(::aya_bpf::programs::SockContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock) -> i32 { + return foo(::aya_ebpf::programs::SockContext::new(ctx)); fn foo(ctx: SockContext) -> i32 { 0 @@ -91,8 +91,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/post_bind6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock) -> i32 { - return foo(::aya_bpf::programs::SockContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock) -> i32 { + return foo(::aya_ebpf::programs::SockContext::new(ctx)); fn foo(ctx: SockContext) -> i32 { 0 @@ -116,8 +116,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/sock_create"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock) -> i32 { - return foo(::aya_bpf::programs::SockContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock) -> i32 { + return foo(::aya_ebpf::programs::SockContext::new(ctx)); fn foo(ctx: SockContext) -> i32 { 0 @@ -141,8 +141,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/sock_release"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock) -> i32 { - return foo(::aya_bpf::programs::SockContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock) -> i32 { + return foo(::aya_ebpf::programs::SockContext::new(ctx)); fn foo(ctx: SockContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/cgroup_sock_addr.rs b/aya-bpf-macros/src/cgroup_sock_addr.rs index bc5d2477..17d0de39 100644 --- a/aya-bpf-macros/src/cgroup_sock_addr.rs +++ b/aya-bpf-macros/src/cgroup_sock_addr.rs @@ -37,8 +37,8 @@ impl CgroupSockAddr { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return #fn_name(::aya_bpf::programs::SockAddrContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return #fn_name(::aya_ebpf::programs::SockAddrContext::new(ctx)); #item } @@ -67,8 +67,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/connect4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -93,8 +93,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/connect6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -119,8 +119,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/bind4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -145,8 +145,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/bind6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -171,8 +171,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/getpeername4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -197,8 +197,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/getpeername6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -223,8 +223,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/getsockname4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -249,8 +249,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/getsockname6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -275,8 +275,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/sendmsg4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -301,8 +301,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/sendmsg6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -327,8 +327,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/recvmsg4"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 @@ -353,8 +353,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/recvmsg6"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sock_addr) -> i32 { - return foo(::aya_bpf::programs::SockAddrContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sock_addr) -> i32 { + return foo(::aya_ebpf::programs::SockAddrContext::new(ctx)); fn foo(ctx: CgroupSockAddrContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/cgroup_sockopt.rs b/aya-bpf-macros/src/cgroup_sockopt.rs index f26c6417..ae4c7752 100644 --- a/aya-bpf-macros/src/cgroup_sockopt.rs +++ b/aya-bpf-macros/src/cgroup_sockopt.rs @@ -35,8 +35,8 @@ impl CgroupSockopt { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sockopt) -> i32 { - return #fn_name(::aya_bpf::programs::SockoptContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sockopt) -> i32 { + return #fn_name(::aya_ebpf::programs::SockoptContext::new(ctx)); #item } @@ -65,8 +65,8 @@ mod tests { let expected = quote!( #[no_mangle] #[link_section = "cgroup/getsockopt"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sockopt) -> i32 { - return foo(::aya_bpf::programs::SockoptContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sockopt) -> i32 { + return foo(::aya_ebpf::programs::SockoptContext::new(ctx)); fn foo(ctx: SockoptContext) -> i32 { 0 @@ -91,8 +91,8 @@ mod tests { let expected = quote!( #[no_mangle] #[link_section = "cgroup/setsockopt"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sockopt) -> i32 { - return foo(::aya_bpf::programs::SockoptContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sockopt) -> i32 { + return foo(::aya_ebpf::programs::SockoptContext::new(ctx)); fn foo(ctx: SockoptContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/cgroup_sysctl.rs b/aya-bpf-macros/src/cgroup_sysctl.rs index 7542d1ea..451d3f76 100644 --- a/aya-bpf-macros/src/cgroup_sysctl.rs +++ b/aya-bpf-macros/src/cgroup_sysctl.rs @@ -23,8 +23,8 @@ impl CgroupSysctl { Ok(quote! { #[no_mangle] #[link_section = "cgroup/sysctl"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sysctl) -> i32 { - return #fn_name(::aya_bpf::programs::SysctlContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sysctl) -> i32 { + return #fn_name(::aya_ebpf::programs::SysctlContext::new(ctx)); #item } @@ -53,8 +53,8 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "cgroup/sysctl"] - fn foo(ctx: *mut ::aya_bpf::bindings::bpf_sysctl) -> i32 { - return foo(::aya_bpf::programs::SysctlContext::new(ctx)); + fn foo(ctx: *mut ::aya_ebpf::bindings::bpf_sysctl) -> i32 { + return foo(::aya_ebpf::programs::SysctlContext::new(ctx)); fn foo(ctx: SysctlContext) -> i32 { 0 diff --git a/aya-bpf-macros/src/fentry.rs b/aya-bpf-macros/src/fentry.rs index d15094dc..0856e23f 100644 --- a/aya-bpf-macros/src/fentry.rs +++ b/aya-bpf-macros/src/fentry.rs @@ -40,7 +40,7 @@ impl FEntry { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = #fn_name(::aya_bpf::programs::FEntryContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::FEntryContext::new(ctx)); return 0; #item @@ -60,7 +60,7 @@ mod tests { let prog = FEntry::parse( parse_quote! {}, parse_quote! { - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } }, @@ -71,10 +71,10 @@ mod tests { #[no_mangle] #[link_section = "fentry"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FEntryContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FEntryContext::new(ctx)); return 0; - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } } @@ -89,7 +89,7 @@ mod tests { function = "sys_clone" }, parse_quote! { - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } }, @@ -100,10 +100,10 @@ mod tests { #[no_mangle] #[link_section = "fentry/sys_clone"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FEntryContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FEntryContext::new(ctx)); return 0; - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } } @@ -118,7 +118,7 @@ mod tests { sleepable }, parse_quote! { - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } }, @@ -129,10 +129,10 @@ mod tests { #[no_mangle] #[link_section = "fentry.s"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FEntryContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FEntryContext::new(ctx)); return 0; - fn sys_clone(ctx: &mut aya_bpf::programs::FEntryContext) -> i32 { + fn sys_clone(ctx: &mut aya_ebpf::programs::FEntryContext) -> i32 { 0 } } diff --git a/aya-bpf-macros/src/fexit.rs b/aya-bpf-macros/src/fexit.rs index 4c345b0f..dd4eb2d5 100644 --- a/aya-bpf-macros/src/fexit.rs +++ b/aya-bpf-macros/src/fexit.rs @@ -40,7 +40,7 @@ impl FExit { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = #fn_name(::aya_bpf::programs::FExitContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::FExitContext::new(ctx)); return 0; #item @@ -71,7 +71,7 @@ mod tests { #[no_mangle] #[link_section = "fexit"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FExitContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FExitContext::new(ctx)); return 0; fn sys_clone(ctx: &mut FExitContext) -> i32 { @@ -100,7 +100,7 @@ mod tests { #[no_mangle] #[link_section = "fexit/sys_clone"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FExitContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FExitContext::new(ctx)); return 0; fn sys_clone(ctx: &mut FExitContext) -> i32 { @@ -129,7 +129,7 @@ mod tests { #[no_mangle] #[link_section = "fexit.s/sys_clone"] fn sys_clone(ctx: *mut ::core::ffi::c_void) -> i32 { - let _ = sys_clone(::aya_bpf::programs::FExitContext::new(ctx)); + let _ = sys_clone(::aya_ebpf::programs::FExitContext::new(ctx)); return 0; fn sys_clone(ctx: &mut FExitContext) -> i32 { diff --git a/aya-bpf-macros/src/kprobe.rs b/aya-bpf-macros/src/kprobe.rs index a8c38d70..01633917 100644 --- a/aya-bpf-macros/src/kprobe.rs +++ b/aya-bpf-macros/src/kprobe.rs @@ -67,7 +67,7 @@ impl KProbe { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = #fn_name(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; #item @@ -100,7 +100,7 @@ mod tests { #[no_mangle] #[link_section = "kprobe"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -132,7 +132,7 @@ mod tests { #[no_mangle] #[link_section = "kprobe/fib_lookup"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -165,7 +165,7 @@ mod tests { #[no_mangle] #[link_section = "kprobe/fib_lookup+10"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -195,7 +195,7 @@ mod tests { #[no_mangle] #[link_section = "kretprobe"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { diff --git a/aya-bpf-macros/src/lib.rs b/aya-bpf-macros/src/lib.rs index 4393ab95..8364b683 100644 --- a/aya-bpf-macros/src/lib.rs +++ b/aya-bpf-macros/src/lib.rs @@ -142,7 +142,7 @@ pub fn sk_msg(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{bindings::xdp_action::XDP_PASS, macros::xdp, programs::XdpContext}; +/// use aya_ebpf::{bindings::xdp_action::XDP_PASS, macros::xdp, programs::XdpContext}; /// /// #[xdp(frags)] /// pub fn xdp(ctx: XdpContext) -> u32 { @@ -222,7 +222,7 @@ pub fn cgroup_skb(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::cgroup_sock_addr, programs::SockAddrContext}; +/// use aya_ebpf::{macros::cgroup_sock_addr, programs::SockAddrContext}; /// /// #[cgroup_sock_addr(connect4)] /// pub fn connect4(ctx: SockAddrContext) -> i32 { @@ -300,7 +300,7 @@ pub fn perf_event(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::raw_tracepoint, programs::RawTracePointContext}; +/// use aya_ebpf::{macros::raw_tracepoint, programs::RawTracePointContext}; /// /// #[raw_tracepoint(tracepoint = "sys_enter")] /// pub fn sys_enter(ctx: RawTracePointContext) -> i32 { @@ -347,7 +347,7 @@ pub fn raw_tracepoint(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::lsm, programs::LsmContext}; +/// use aya_ebpf::{macros::lsm, programs::LsmContext}; /// /// #[lsm(hook = "file_open")] /// pub fn file_open(ctx: LsmContext) -> i32 { @@ -387,7 +387,7 @@ pub fn lsm(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::btf_tracepoint, programs::BtfTracePointContext}; +/// use aya_ebpf::{macros::btf_tracepoint, programs::BtfTracePointContext}; /// /// #[btf_tracepoint(function = "sched_process_fork")] /// pub fn sched_process_fork(ctx: BtfTracePointContext) -> u32 { @@ -425,7 +425,7 @@ pub fn btf_tracepoint(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::stream_parser, programs::SkBuffContext}; +/// use aya_ebpf::{macros::stream_parser, programs::SkBuffContext}; /// /// ///#[stream_parser] @@ -456,7 +456,7 @@ pub fn stream_parser(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::stream_verdict, programs::SkBuffContext, bindings::sk_action}; +/// use aya_ebpf::{macros::stream_verdict, programs::SkBuffContext, bindings::sk_action}; /// /// ///#[stream_verdict] @@ -497,7 +497,7 @@ fn sk_skb(kind: SkSkbKind, attrs: TokenStream, item: TokenStream) -> TokenStream /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::socket_filter, programs::SkBuffContext}; +/// use aya_ebpf::{macros::socket_filter, programs::SkBuffContext}; /// /// #[socket_filter] /// pub fn accept_all(_ctx: SkBuffContext) -> i64 { @@ -529,7 +529,7 @@ pub fn socket_filter(attrs: TokenStream, item: TokenStream) -> TokenStream { /// /// ```no_run /// # #![allow(non_camel_case_types)] -/// use aya_bpf::{macros::fentry, programs::FEntryContext}; +/// use aya_ebpf::{macros::fentry, programs::FEntryContext}; /// # type filename = u32; /// # type path = u32; /// @@ -574,7 +574,7 @@ pub fn fentry(attrs: TokenStream, item: TokenStream) -> TokenStream { /// /// ```no_run /// # #![allow(non_camel_case_types)] -/// use aya_bpf::{macros::fexit, programs::FExitContext}; +/// use aya_ebpf::{macros::fexit, programs::FExitContext}; /// # type filename = u32; /// # type path = u32; /// @@ -615,7 +615,7 @@ pub fn fexit(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{macros::sk_lookup, programs::SkLookupContext}; +/// use aya_ebpf::{macros::sk_lookup, programs::SkLookupContext}; /// /// #[sk_lookup] /// pub fn accept_all(_ctx: SkLookupContext) -> u32 { @@ -645,7 +645,7 @@ pub fn sk_lookup(attrs: TokenStream, item: TokenStream) -> TokenStream { /// # Examples /// /// ```no_run -/// use aya_bpf::{ +/// use aya_ebpf::{ /// macros::cgroup_device, /// programs::DeviceContext, /// }; diff --git a/aya-bpf-macros/src/lsm.rs b/aya-bpf-macros/src/lsm.rs index 430795eb..f32705db 100644 --- a/aya-bpf-macros/src/lsm.rs +++ b/aya-bpf-macros/src/lsm.rs @@ -43,7 +43,7 @@ impl Lsm { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> i32 { - return #fn_name(::aya_bpf::programs::LsmContext::new(ctx)); + return #fn_name(::aya_ebpf::programs::LsmContext::new(ctx)); #item } @@ -65,7 +65,7 @@ mod tests { hook = "bprm_committed_creds" }, parse_quote! { - fn bprm_committed_creds(ctx: &mut ::aya_bpf::programs::LsmContext) -> i32 { + fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { 0 } }, @@ -76,9 +76,9 @@ mod tests { #[no_mangle] #[link_section = "lsm.s/bprm_committed_creds"] fn bprm_committed_creds(ctx: *mut ::core::ffi::c_void) -> i32 { - return bprm_committed_creds(::aya_bpf::programs::LsmContext::new(ctx)); + return bprm_committed_creds(::aya_ebpf::programs::LsmContext::new(ctx)); - fn bprm_committed_creds(ctx: &mut ::aya_bpf::programs::LsmContext) -> i32 { + fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { 0 } } @@ -93,7 +93,7 @@ mod tests { hook = "bprm_committed_creds" }, parse_quote! { - fn bprm_committed_creds(ctx: &mut ::aya_bpf::programs::LsmContext) -> i32 { + fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { 0 } }, @@ -104,9 +104,9 @@ mod tests { #[no_mangle] #[link_section = "lsm/bprm_committed_creds"] fn bprm_committed_creds(ctx: *mut ::core::ffi::c_void) -> i32 { - return bprm_committed_creds(::aya_bpf::programs::LsmContext::new(ctx)); + return bprm_committed_creds(::aya_ebpf::programs::LsmContext::new(ctx)); - fn bprm_committed_creds(ctx: &mut ::aya_bpf::programs::LsmContext) -> i32 { + fn bprm_committed_creds(ctx: &mut ::aya_ebpf::programs::LsmContext) -> i32 { 0 } } diff --git a/aya-bpf-macros/src/perf_event.rs b/aya-bpf-macros/src/perf_event.rs index 8022d8b2..eb582167 100644 --- a/aya-bpf-macros/src/perf_event.rs +++ b/aya-bpf-macros/src/perf_event.rs @@ -24,7 +24,7 @@ impl PerfEvent { #[no_mangle] #[link_section = "perf_event"] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = #fn_name(::aya_bpf::programs::PerfEventContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::PerfEventContext::new(ctx)); return 0; #item @@ -55,7 +55,7 @@ mod tests { #[no_mangle] #[link_section = "perf_event"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::PerfEventContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::PerfEventContext::new(ctx)); return 0; fn foo(ctx: PerfEventContext) -> i32 { diff --git a/aya-bpf-macros/src/raw_tracepoint.rs b/aya-bpf-macros/src/raw_tracepoint.rs index 87f97988..d2780dce 100644 --- a/aya-bpf-macros/src/raw_tracepoint.rs +++ b/aya-bpf-macros/src/raw_tracepoint.rs @@ -33,7 +33,7 @@ impl RawTracePoint { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = #fn_name(::aya_bpf::programs::RawTracePointContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::RawTracePointContext::new(ctx)); return 0; #item @@ -53,7 +53,7 @@ mod tests { let prog = RawTracePoint::parse( parse_quote! { tracepoint = "sys_enter" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::RawTracePointContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::RawTracePointContext) -> i32 { 0 } }, @@ -64,10 +64,10 @@ mod tests { #[no_mangle] #[link_section = "raw_tp/sys_enter"] fn prog(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = prog(::aya_bpf::programs::RawTracePointContext::new(ctx)); + let _ = prog(::aya_ebpf::programs::RawTracePointContext::new(ctx)); return 0; - fn prog(ctx: &mut ::aya_bpf::programs::RawTracePointContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::RawTracePointContext) -> i32 { 0 } } diff --git a/aya-bpf-macros/src/sk_lookup.rs b/aya-bpf-macros/src/sk_lookup.rs index e1d6fc92..e32890de 100644 --- a/aya-bpf-macros/src/sk_lookup.rs +++ b/aya-bpf-macros/src/sk_lookup.rs @@ -23,8 +23,8 @@ impl SkLookup { Ok(quote! { #[no_mangle] #[link_section = "sk_lookup"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sk_lookup) -> u32 { - return #fn_name(::aya_bpf::programs::SkLookupContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sk_lookup) -> u32 { + return #fn_name(::aya_ebpf::programs::SkLookupContext::new(ctx)); #item } @@ -43,7 +43,7 @@ mod tests { let prog = SkLookup::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SkLookupContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkLookupContext) -> u32 { 0 } }, @@ -53,10 +53,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "sk_lookup"] - fn prog(ctx: *mut ::aya_bpf::bindings::bpf_sk_lookup) -> u32 { - return prog(::aya_bpf::programs::SkLookupContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::bpf_sk_lookup) -> u32 { + return prog(::aya_ebpf::programs::SkLookupContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SkLookupContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkLookupContext) -> u32 { 0 } } diff --git a/aya-bpf-macros/src/sk_msg.rs b/aya-bpf-macros/src/sk_msg.rs index b0e2cc4c..6586f8da 100644 --- a/aya-bpf-macros/src/sk_msg.rs +++ b/aya-bpf-macros/src/sk_msg.rs @@ -23,8 +23,8 @@ impl SkMsg { Ok(quote! { #[no_mangle] #[link_section = "sk_msg"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::sk_msg_md) -> u32 { - return #fn_name(::aya_bpf::programs::SkMsgContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::sk_msg_md) -> u32 { + return #fn_name(::aya_ebpf::programs::SkMsgContext::new(ctx)); #item } @@ -43,7 +43,7 @@ mod tests { let prog = SkMsg::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SkMsgContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkMsgContext) -> u32 { 0 } }, @@ -53,10 +53,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "sk_msg"] - fn prog(ctx: *mut ::aya_bpf::bindings:: sk_msg_md) -> u32 { - return prog(::aya_bpf::programs::SkMsgContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings:: sk_msg_md) -> u32 { + return prog(::aya_ebpf::programs::SkMsgContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SkMsgContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkMsgContext) -> u32 { 0 } } diff --git a/aya-bpf-macros/src/sk_skb.rs b/aya-bpf-macros/src/sk_skb.rs index 5056ced6..c626602f 100644 --- a/aya-bpf-macros/src/sk_skb.rs +++ b/aya-bpf-macros/src/sk_skb.rs @@ -45,8 +45,8 @@ impl SkSkb { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> u32 { - return #fn_name(::aya_bpf::programs::SkBuffContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> u32 { + return #fn_name(::aya_ebpf::programs::SkBuffContext::new(ctx)); #item } @@ -66,7 +66,7 @@ mod tests { SkSkbKind::StreamParser, parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> u32 { 0 } }, @@ -76,10 +76,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "sk_skb/stream_parser"] - fn prog(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> u32 { - return prog(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> u32 { + return prog(::aya_ebpf::programs::SkBuffContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> u32 { 0 } } @@ -93,7 +93,7 @@ mod tests { SkSkbKind::StreamVerdict, parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> u32 { 0 } }, @@ -103,10 +103,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "sk_skb/stream_verdict"] - fn prog(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> u32 { - return prog(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> u32 { + return prog(::aya_ebpf::programs::SkBuffContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> u32 { 0 } } diff --git a/aya-bpf-macros/src/sock_ops.rs b/aya-bpf-macros/src/sock_ops.rs index 62e2b739..91b9c5c4 100644 --- a/aya-bpf-macros/src/sock_ops.rs +++ b/aya-bpf-macros/src/sock_ops.rs @@ -23,8 +23,8 @@ impl SockOps { Ok(quote! { #[no_mangle] #[link_section = "sockops"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::bpf_sock_ops) -> u32 { - return #fn_name(::aya_bpf::programs::SockOpsContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::bpf_sock_ops) -> u32 { + return #fn_name(::aya_ebpf::programs::SockOpsContext::new(ctx)); #item } @@ -43,7 +43,7 @@ mod tests { let prog = SockOps::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SockOpsContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SockOpsContext) -> u32 { 0 } }, @@ -53,10 +53,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "sockops"] - fn prog(ctx: *mut ::aya_bpf::bindings::bpf_sock_ops) -> u32 { - return prog(::aya_bpf::programs::SockOpsContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::bpf_sock_ops) -> u32 { + return prog(::aya_ebpf::programs::SockOpsContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SockOpsContext) -> u32 { + fn prog(ctx: &mut ::aya_ebpf::programs::SockOpsContext) -> u32 { 0 } } diff --git a/aya-bpf-macros/src/socket_filter.rs b/aya-bpf-macros/src/socket_filter.rs index 2ebc3edf..27c0b7c7 100644 --- a/aya-bpf-macros/src/socket_filter.rs +++ b/aya-bpf-macros/src/socket_filter.rs @@ -23,8 +23,8 @@ impl SocketFilter { Ok(quote! { #[no_mangle] #[link_section = "socket"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i64 { - return #fn_name(::aya_bpf::programs::SkBuffContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i64 { + return #fn_name(::aya_ebpf::programs::SkBuffContext::new(ctx)); #item } @@ -43,7 +43,7 @@ mod tests { let prog = SocketFilter::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> i64 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> i64 { 0 } }, @@ -53,10 +53,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "socket"] - fn prog(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i64 { - return prog(::aya_bpf::programs::SkBuffContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i64 { + return prog(::aya_ebpf::programs::SkBuffContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::SkBuffContext) -> i64 { + fn prog(ctx: &mut ::aya_ebpf::programs::SkBuffContext) -> i64 { 0 } } diff --git a/aya-bpf-macros/src/tc.rs b/aya-bpf-macros/src/tc.rs index 56d3940a..0b816674 100644 --- a/aya-bpf-macros/src/tc.rs +++ b/aya-bpf-macros/src/tc.rs @@ -23,8 +23,8 @@ impl SchedClassifier { Ok(quote! { #[no_mangle] #[link_section = "classifier"] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return #fn_name(::aya_bpf::programs::TcContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return #fn_name(::aya_ebpf::programs::TcContext::new(ctx)); #item } @@ -43,7 +43,7 @@ mod tests { let prog = SchedClassifier::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::TcContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::TcContext) -> i32 { 0 } }, @@ -53,10 +53,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "classifier"] - fn prog(ctx: *mut ::aya_bpf::bindings::__sk_buff) -> i32 { - return prog(::aya_bpf::programs::TcContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::__sk_buff) -> i32 { + return prog(::aya_ebpf::programs::TcContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::TcContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::TcContext) -> i32 { 0 } } diff --git a/aya-bpf-macros/src/tracepoint.rs b/aya-bpf-macros/src/tracepoint.rs index e7675b33..7377346f 100644 --- a/aya-bpf-macros/src/tracepoint.rs +++ b/aya-bpf-macros/src/tracepoint.rs @@ -41,7 +41,7 @@ impl TracePoint { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = #fn_name(::aya_bpf::programs::TracePointContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::TracePointContext::new(ctx)); return 0; #item @@ -61,7 +61,7 @@ mod tests { let prog = TracePoint::parse( parse_quote! { name = "sys_enter_bind", category = "syscalls" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::TracePointContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::TracePointContext) -> i32 { 0 } }, @@ -72,10 +72,10 @@ mod tests { #[no_mangle] #[link_section = "tracepoint/syscalls/sys_enter_bind"] fn prog(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = prog(::aya_bpf::programs::TracePointContext::new(ctx)); + let _ = prog(::aya_ebpf::programs::TracePointContext::new(ctx)); return 0; - fn prog(ctx: &mut ::aya_bpf::programs::TracePointContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::TracePointContext) -> i32 { 0 } } diff --git a/aya-bpf-macros/src/uprobe.rs b/aya-bpf-macros/src/uprobe.rs index 1684cd6d..812279ee 100644 --- a/aya-bpf-macros/src/uprobe.rs +++ b/aya-bpf-macros/src/uprobe.rs @@ -93,7 +93,7 @@ impl UProbe { #[no_mangle] #[link_section = #section_name] #fn_vis fn #fn_name(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = #fn_name(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = #fn_name(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; #item @@ -126,7 +126,7 @@ mod tests { #[no_mangle] #[link_section = "uprobe"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -156,7 +156,7 @@ mod tests { #[no_mangle] #[link_section = "uprobe.s"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -189,7 +189,7 @@ mod tests { #[no_mangle] #[link_section = "uprobe/self/proc/exe:trigger_uprobe"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -221,7 +221,7 @@ mod tests { #[no_mangle] #[link_section = "uprobe/self/proc/exe:foo+123"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { @@ -251,7 +251,7 @@ mod tests { #[no_mangle] #[link_section = "uretprobe"] fn foo(ctx: *mut ::core::ffi::c_void) -> u32 { - let _ = foo(::aya_bpf::programs::ProbeContext::new(ctx)); + let _ = foo(::aya_ebpf::programs::ProbeContext::new(ctx)); return 0; fn foo(ctx: ProbeContext) -> u32 { diff --git a/aya-bpf-macros/src/xdp.rs b/aya-bpf-macros/src/xdp.rs index 9e0f1a5a..3944fb19 100644 --- a/aya-bpf-macros/src/xdp.rs +++ b/aya-bpf-macros/src/xdp.rs @@ -53,8 +53,8 @@ impl Xdp { Ok(quote! { #[no_mangle] #[link_section = #section_name] - #fn_vis fn #fn_name(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return #fn_name(::aya_bpf::programs::XdpContext::new(ctx)); + #fn_vis fn #fn_name(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return #fn_name(::aya_ebpf::programs::XdpContext::new(ctx)); #item } @@ -73,7 +73,7 @@ mod tests { let prog = Xdp::parse( parse_quote! {}, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -83,10 +83,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } @@ -99,7 +99,7 @@ mod tests { let prog = Xdp::parse( parse_quote! { frags }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -109,10 +109,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp.frags"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } @@ -125,7 +125,7 @@ mod tests { let prog = Xdp::parse( parse_quote! { map = "cpumap" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -135,10 +135,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp/cpumap"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } @@ -151,7 +151,7 @@ mod tests { let prog = Xdp::parse( parse_quote! { map = "devmap" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -161,10 +161,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp/devmap"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } @@ -178,7 +178,7 @@ mod tests { Xdp::parse( parse_quote! { map = "badmap" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -191,7 +191,7 @@ mod tests { let prog = Xdp::parse( parse_quote! { frags, map = "cpumap" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -201,10 +201,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp.frags/cpumap"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } @@ -217,7 +217,7 @@ mod tests { let prog = Xdp::parse( parse_quote! { frags, map = "devmap" }, parse_quote! { - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } }, @@ -227,10 +227,10 @@ mod tests { let expected = quote! { #[no_mangle] #[link_section = "xdp.frags/devmap"] - fn prog(ctx: *mut ::aya_bpf::bindings::xdp_md) -> u32 { - return prog(::aya_bpf::programs::XdpContext::new(ctx)); + fn prog(ctx: *mut ::aya_ebpf::bindings::xdp_md) -> u32 { + return prog(::aya_ebpf::programs::XdpContext::new(ctx)); - fn prog(ctx: &mut ::aya_bpf::programs::XdpContext) -> i32 { + fn prog(ctx: &mut ::aya_ebpf::programs::XdpContext) -> i32 { 0 } } diff --git a/aya-log/CHANGELOG.md b/aya-log/CHANGELOG.md index 033dfd5a..f0792c74 100644 --- a/aya-log/CHANGELOG.md +++ b/aya-log/CHANGELOG.md @@ -21,111 +21,116 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Chore - - Don't use path deps in workspace - This moves the path dependencies back into the per-crate Cargo.toml. - It is required such that the release tooling can correctly calculate - which version constraints require changing when we perform a release. - - Use the cargo workspace package table - This allows for inheritance of common fields from the workspace root. - The following fields have been made common: - - - authors - - license - - repository - - homepage - - edition +- Don't use path deps in workspace + This moves the path dependencies back into the per-crate Cargo.toml. + It is required such that the release tooling can correctly calculate + which version constraints require changing when we perform a release. +- Use the cargo workspace package table + This allows for inheritance of common fields from the workspace root. + The following fields have been made common: + + - authors + - license + - repository + - homepage + - edition ### Documentation - - Add CHANGELOG +- Add CHANGELOG ### New Features - - check format and value type in proc macro +- check format and value type in proc macro ### Bug Fixes - - remove some useless code +- remove some useless code ### Other - - group_imports = "StdExternalCrate" - High time we stop debating this; let the robots do the work. - - s/Result/Option/ - `Option` is guaranteed to have the same size as `usize`, - which is not guarnateed for `Result`. This is a minor optimization, but - also results in simpler code. - - Define dependencies on the workspace level - This way we will avoid version mismatches and make differences in - features across our crates clearer. - - add formatter and check in CI - - Unify IP format hints into one, repsesent it by `:i` token - Having separate format hints and tokens per IP address family is - unnecessary, since they are represented by different types and we handle - format hints for each type separately. So we can just have one format - hint. - - Also, we should be consistent with the format strings grammar in - Rust[0]. The `type` token, which is mapped to formatting traits, usually - consists of one letter[1] (and optional `?` for `Debug` trait, but that - doesn't matter for us). It shouldn't consist of multiple letters. Our - `:ipv4` and `:ipv6` tokens were clearly breaking that convention, so we - should rather switch to something with one letter - hence `:i`. - - [0] https://doc.rust-lang.org/std/fmt/#syntax - [1] https://doc.rust-lang.org/std/fmt/#formatting-traits - - support logging byte slices - These only support LowerHex and UpperHex hints for now. - - check errors in tests - - Move the `Pod` implementations from aya-log-common to aya-log - Keeping the `Pod` implementations and optional dependency on aya in - aya-log-common breaks the clippy checks (which are made on the entire - workspace). - - The reason is that when different crates inside the workspace have the - same dependency with different features, that dependency is built only - once with the sum of features needed by all crates. It's **not** being - built separately with different feature sets. - - That's why, before this change, aya-log-common was built once for the - entire workspace with `userspace` feature enabled. That made importing - aya-log-ebpf inside integration-ebpf impossible. The aya-log-common - build, with `userspace` feature enabled, was pulling std as a - dependency. Therefore, importing aya-log-ebpf inside integration-ebpf - resulted in including std and errors like: - - ``` - error[E0152]: found duplicate lang item `panic_impl` - --> test/integration-ebpf/src/log.rs:23:1 - | - 23 | fn panic(_info: &core::panic::PanicInfo) -> ! { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: the lang item is first defined in crate `std` (which `aya` depends on) - ``` - - This change fixes the problem by removing the `userspace` feature from - aya-log-common and moving the `Pod` implementations to aya-log. - - update env_logger requirement from 0.9 to 0.10 - Updates the requirements on [env_logger](https://github.com/rust-cli/env_logger) to permit the latest version. - - [Release notes](https://github.com/rust-cli/env_logger/releases) - - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - - [Commits](https://github.com/rust-cli/env_logger/compare/v0.9.0...v0.10.0) - - --- - updated-dependencies: - - dependency-name: env_logger - dependency-type: direct:production - ... +- group_imports = "StdExternalCrate" + High time we stop debating this; let the robots do the work. +- s/Result/Option/ + `Option` is guaranteed to have the same size as `usize`, + which is not guarnateed for `Result`. This is a minor optimization, but + also results in simpler code. +- Define dependencies on the workspace level + This way we will avoid version mismatches and make differences in + features across our crates clearer. +- add formatter and check in CI +- Unify IP format hints into one, repsesent it by `:i` token + Having separate format hints and tokens per IP address family is + unnecessary, since they are represented by different types and we handle + format hints for each type separately. So we can just have one format + hint. + + Also, we should be consistent with the format strings grammar in + Rust[0]. The `type` token, which is mapped to formatting traits, usually + consists of one letter[1] (and optional `?` for `Debug` trait, but that + doesn't matter for us). It shouldn't consist of multiple letters. Our + `:ipv4` and `:ipv6` tokens were clearly breaking that convention, so we + should rather switch to something with one letter - hence `:i`. + + [0] https://doc.rust-lang.org/std/fmt/#syntax + [1] https://doc.rust-lang.org/std/fmt/#formatting-traits + +- support logging byte slices + These only support LowerHex and UpperHex hints for now. +- check errors in tests +- Move the `Pod` implementations from aya-log-common to aya-log + Keeping the `Pod` implementations and optional dependency on aya in + aya-log-common breaks the clippy checks (which are made on the entire + workspace). + + The reason is that when different crates inside the workspace have the + same dependency with different features, that dependency is built only + once with the sum of features needed by all crates. It's **not** being + built separately with different feature sets. + + That's why, before this change, aya-log-common was built once for the + entire workspace with `userspace` feature enabled. That made importing + aya-log-ebpf inside integration-ebpf impossible. The aya-log-common + build, with `userspace` feature enabled, was pulling std as a + dependency. Therefore, importing aya-log-ebpf inside integration-ebpf + resulted in including std and errors like: + + ``` + error[E0152]: found duplicate lang item `panic_impl` + --> test/integration-ebpf/src/log.rs:23:1 + | + 23 | fn panic(_info: &core::panic::PanicInfo) -> ! { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = note: the lang item is first defined in crate `std` (which `aya` depends on) + ``` + + This change fixes the problem by removing the `userspace` feature from + aya-log-common and moving the `Pod` implementations to aya-log. + +- update env_logger requirement from 0.9 to 0.10 + Updates the requirements on [env_logger](https://github.com/rust-cli/env_logger) to permit the latest version. + + - [Release notes](https://github.com/rust-cli/env_logger/releases) + - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) + - [Commits](https://github.com/rust-cli/env_logger/compare/v0.9.0...v0.10.0) + + *** + + updated-dependencies: + + - dependency-name: env_logger + dependency-type: direct:production + ... ### Commit Statistics - - 37 commits contributed to the release over the course of 469 calendar days. - - 469 days passed between releases. - - 14 commits were understood as [conventional](https://www.conventionalcommits.org). - - 0 issues like '(#ID)' were seen in commit messages +- 37 commits contributed to the release over the course of 469 calendar days. +- 469 days passed between releases. +- 14 commits were understood as [conventional](https://www.conventionalcommits.org). +- 0 issues like '(#ID)' were seen in commit messages ### Commit Details @@ -133,44 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
view details - * **Uncategorized** - - Add CHANGELOG ([`9abb716`](https://github.com/aya-rs/aya/commit/9abb7160e51dd18c509049b1371acd96515d8f04)) - - Release aya-log-common v0.1.14, aya-log v0.2.0 ([`c22a696`](https://github.com/aya-rs/aya/commit/c22a6963d44befb5591d4b21c09767c43935cb54)) - - Release aya-obj v0.1.0, aya v0.12.0, safety bump aya-log v0.2.0 ([`0e99fa0`](https://github.com/aya-rs/aya/commit/0e99fa0f340b2fb2e0da3b330aa6555322a77eec)) - - Don't use path deps in workspace ([`13b1fc6`](https://github.com/aya-rs/aya/commit/13b1fc63ef2ae083ba03ce9de24cb4f31f989d21)) - - Merge pull request #882 from dave-tucker/metadata ([`0fadd69`](https://github.com/aya-rs/aya/commit/0fadd695377b8a3f0d9a3af3bc8140f0f1bed8d2)) - - Use the cargo workspace package table ([`b3e7ef7`](https://github.com/aya-rs/aya/commit/b3e7ef741c5b8d09fc7dc8302576f8174be75ff4)) - - Appease rustc dead_code lint ([`963dd13`](https://github.com/aya-rs/aya/commit/963dd1321925c95f80c8a2bf656b88a39497ca01)) - - Merge pull request #797 from aya-rs/rustfmt-group-imports ([`373fb7b`](https://github.com/aya-rs/aya/commit/373fb7bf06ba80ee4c120d8c112f5e810204c472)) - - Group_imports = "StdExternalCrate" ([`d16e607`](https://github.com/aya-rs/aya/commit/d16e607fd4b6258b516913071fdacafeb2bbbff9)) - - Merge pull request #736 from aya-rs/logging-better ([`45df251`](https://github.com/aya-rs/aya/commit/45df2519b60613310e8827fbb4076f60c393c3bb)) - - Merge pull request #735 from aya-rs/log-option-not-result ([`ecf0dd9`](https://github.com/aya-rs/aya/commit/ecf0dd973985bd442978b202d0fd6f75647cdda3)) - - S/Result/Option/ ([`ca3f70b`](https://github.com/aya-rs/aya/commit/ca3f70b16a705bf26d2ccc7ce754de403be36223)) - - Remove pointless DefaultLogger ([`00d265c`](https://github.com/aya-rs/aya/commit/00d265c51b69e672457502593fbc63d0ac953e27)) - - Merge pull request #667 from vadorovsky/workspace-dependencies ([`f554d42`](https://github.com/aya-rs/aya/commit/f554d421053bc34266afbf8e00b28705ab4b41d2)) - - Define dependencies on the workspace level ([`96fa08b`](https://github.com/aya-rs/aya/commit/96fa08bd82233268154edf30b106876f5a4f0e30)) - - Merge pull request #666 from aya-rs/toml-fmt ([`dc3b0b8`](https://github.com/aya-rs/aya/commit/dc3b0b87308fdac5ff8f472de9a5e849b52d9fee)) - - Add formatter and check in CI ([`c8bf646`](https://github.com/aya-rs/aya/commit/c8bf646ef098a00bc5c6e1cb5ae35ffa6fb5eac5)) - - Merge pull request #650 from aya-rs/test-cleanup ([`61608e6`](https://github.com/aya-rs/aya/commit/61608e64583f9dc599eef9b8db098f38a765b285)) - - Remove "async" feature ([`fa91fb4`](https://github.com/aya-rs/aya/commit/fa91fb4f59be3505664f8088b6e3e8da2c372253)) - - Unify IP format hints into one, repsesent it by `:i` token ([`84e5e28`](https://github.com/aya-rs/aya/commit/84e5e2894f226f4b2c7cb637a6f44d5773b927e6)) - - Remove some useless code ([`d999a95`](https://github.com/aya-rs/aya/commit/d999a95b410df79e1d9f6c27462e19a2cede06c2)) - - Check format and value type in proc macro ([`0970300`](https://github.com/aya-rs/aya/commit/0970300d1f5659622fa55a18dd7681c608d75b0f)) - - Merge pull request #585 from probulate/tag-len-value ([`5165bf2`](https://github.com/aya-rs/aya/commit/5165bf2f99cdc228122bdab505c2059723e95a9f)) - - Support logging byte slices ([`d9f966e`](https://github.com/aya-rs/aya/commit/d9f966ec9e49f4439710559cac852bde62810975)) - - Aya-log, aya-log-common: economize bytes ([`a4a69a6`](https://github.com/aya-rs/aya/commit/a4a69a6bcfe87d3c066f2cc341b74039f53dcc9e)) - - Check errors in tests ([`e4537e3`](https://github.com/aya-rs/aya/commit/e4537e389ad7ac6f09fc89349444e37fe01e4af4)) - - Aya-log, aya-log-common: Remove duplicate struct ([`490d7d5`](https://github.com/aya-rs/aya/commit/490d7d587ad90b899aff2a30d65db8641ceb32df)) - - Merge pull request #591 from vadorovsky/aya-log-impl-pod ([`3d3ce8b`](https://github.com/aya-rs/aya/commit/3d3ce8bfa2eff19706cc3d8e5f0ce9e81a520a78)) - - Move the `Pod` implementations from aya-log-common to aya-log ([`5603d72`](https://github.com/aya-rs/aya/commit/5603d7248a51a16233c249b645e30ea3f6804744)) - - Merge pull request #484 from vadorovsky/update-tokio ([`bea0e83`](https://github.com/aya-rs/aya/commit/bea0e83512cc6d45b3e4fb5c3f62432c434139b7)) - - Update Tokio and inventory ([`dad75f4`](https://github.com/aya-rs/aya/commit/dad75f45ac357e86eebc92c4f95f6dd4e43d8496)) - - Don't panic in init when bpf programs don't log ([`12927cf`](https://github.com/aya-rs/aya/commit/12927cf6992bc0f8b1e4221d48b34f4c0098b93d)) - - Merge pull request #456 from dmitris/uninlined_format_args ([`16b029e`](https://github.com/aya-rs/aya/commit/16b029ed3708470afd2a6d67615b30c8d30b5059)) - - Fix uninlined_format_args clippy issues ([`055d94f`](https://github.com/aya-rs/aya/commit/055d94f58be4f80ada416b99278a22f600c71285)) - - Merge pull request #449 from aya-rs/dependabot/cargo/env_logger-0.10 ([`f9bef9f`](https://github.com/aya-rs/aya/commit/f9bef9f8c0d2c5b21809e037b8e9782f3c761df3)) - - Update env_logger requirement from 0.9 to 0.10 ([`1c8088b`](https://github.com/aya-rs/aya/commit/1c8088b16cc255fc188b0b9a84b550a5c50a9003)) - - Revert "aya-log, aya-log-common: temporarily revert to old map API so we can release" ([`0b41018`](https://github.com/aya-rs/aya/commit/0b41018ee27bfda9b1ea7dc422b34d3a08fc3fc6)) +- **Uncategorized** - Add CHANGELOG ([`9abb716`](https://github.com/aya-rs/aya/commit/9abb7160e51dd18c509049b1371acd96515d8f04)) - Release aya-log-common v0.1.14, aya-log v0.2.0 ([`c22a696`](https://github.com/aya-rs/aya/commit/c22a6963d44befb5591d4b21c09767c43935cb54)) - Release aya-obj v0.1.0, aya v0.12.0, safety bump aya-log v0.2.0 ([`0e99fa0`](https://github.com/aya-rs/aya/commit/0e99fa0f340b2fb2e0da3b330aa6555322a77eec)) - Don't use path deps in workspace ([`13b1fc6`](https://github.com/aya-rs/aya/commit/13b1fc63ef2ae083ba03ce9de24cb4f31f989d21)) - Merge pull request #882 from dave-tucker/metadata ([`0fadd69`](https://github.com/aya-rs/aya/commit/0fadd695377b8a3f0d9a3af3bc8140f0f1bed8d2)) - Use the cargo workspace package table ([`b3e7ef7`](https://github.com/aya-rs/aya/commit/b3e7ef741c5b8d09fc7dc8302576f8174be75ff4)) - Appease rustc dead_code lint ([`963dd13`](https://github.com/aya-rs/aya/commit/963dd1321925c95f80c8a2bf656b88a39497ca01)) - Merge pull request #797 from aya-rs/rustfmt-group-imports ([`373fb7b`](https://github.com/aya-rs/aya/commit/373fb7bf06ba80ee4c120d8c112f5e810204c472)) - Group_imports = "StdExternalCrate" ([`d16e607`](https://github.com/aya-rs/aya/commit/d16e607fd4b6258b516913071fdacafeb2bbbff9)) - Merge pull request #736 from aya-rs/logging-better ([`45df251`](https://github.com/aya-rs/aya/commit/45df2519b60613310e8827fbb4076f60c393c3bb)) - Merge pull request #735 from aya-rs/log-option-not-result ([`ecf0dd9`](https://github.com/aya-rs/aya/commit/ecf0dd973985bd442978b202d0fd6f75647cdda3)) - S/Result/Option/ ([`ca3f70b`](https://github.com/aya-rs/aya/commit/ca3f70b16a705bf26d2ccc7ce754de403be36223)) - Remove pointless DefaultLogger ([`00d265c`](https://github.com/aya-rs/aya/commit/00d265c51b69e672457502593fbc63d0ac953e27)) - Merge pull request #667 from vadorovsky/workspace-dependencies ([`f554d42`](https://github.com/aya-rs/aya/commit/f554d421053bc34266afbf8e00b28705ab4b41d2)) - Define dependencies on the workspace level ([`96fa08b`](https://github.com/aya-rs/aya/commit/96fa08bd82233268154edf30b106876f5a4f0e30)) - Merge pull request #666 from aya-rs/toml-fmt ([`dc3b0b8`](https://github.com/aya-rs/aya/commit/dc3b0b87308fdac5ff8f472de9a5e849b52d9fee)) - Add formatter and check in CI ([`c8bf646`](https://github.com/aya-rs/aya/commit/c8bf646ef098a00bc5c6e1cb5ae35ffa6fb5eac5)) - Merge pull request #650 from aya-rs/test-cleanup ([`61608e6`](https://github.com/aya-rs/aya/commit/61608e64583f9dc599eef9b8db098f38a765b285)) - Remove "async" feature ([`fa91fb4`](https://github.com/aya-rs/aya/commit/fa91fb4f59be3505664f8088b6e3e8da2c372253)) - Unify IP format hints into one, repsesent it by `:i` token ([`84e5e28`](https://github.com/aya-rs/aya/commit/84e5e2894f226f4b2c7cb637a6f44d5773b927e6)) - Remove some useless code ([`d999a95`](https://github.com/aya-rs/aya/commit/d999a95b410df79e1d9f6c27462e19a2cede06c2)) - Check format and value type in proc macro ([`0970300`](https://github.com/aya-rs/aya/commit/0970300d1f5659622fa55a18dd7681c608d75b0f)) - Merge pull request #585 from probulate/tag-len-value ([`5165bf2`](https://github.com/aya-rs/aya/commit/5165bf2f99cdc228122bdab505c2059723e95a9f)) - Support logging byte slices ([`d9f966e`](https://github.com/aya-rs/aya/commit/d9f966ec9e49f4439710559cac852bde62810975)) - Aya-log, aya-log-common: economize bytes ([`a4a69a6`](https://github.com/aya-rs/aya/commit/a4a69a6bcfe87d3c066f2cc341b74039f53dcc9e)) - Check errors in tests ([`e4537e3`](https://github.com/aya-rs/aya/commit/e4537e389ad7ac6f09fc89349444e37fe01e4af4)) - Aya-log, aya-log-common: Remove duplicate struct ([`490d7d5`](https://github.com/aya-rs/aya/commit/490d7d587ad90b899aff2a30d65db8641ceb32df)) - Merge pull request #591 from vadorovsky/aya-log-impl-pod ([`3d3ce8b`](https://github.com/aya-rs/aya/commit/3d3ce8bfa2eff19706cc3d8e5f0ce9e81a520a78)) - Move the `Pod` implementations from aya-log-common to aya-log ([`5603d72`](https://github.com/aya-rs/aya/commit/5603d7248a51a16233c249b645e30ea3f6804744)) - Merge pull request #484 from vadorovsky/update-tokio ([`bea0e83`](https://github.com/aya-rs/aya/commit/bea0e83512cc6d45b3e4fb5c3f62432c434139b7)) - Update Tokio and inventory ([`dad75f4`](https://github.com/aya-rs/aya/commit/dad75f45ac357e86eebc92c4f95f6dd4e43d8496)) - Don't panic in init when bpf programs don't log ([`12927cf`](https://github.com/aya-rs/aya/commit/12927cf6992bc0f8b1e4221d48b34f4c0098b93d)) - Merge pull request #456 from dmitris/uninlined_format_args ([`16b029e`](https://github.com/aya-rs/aya/commit/16b029ed3708470afd2a6d67615b30c8d30b5059)) - Fix uninlined_format_args clippy issues ([`055d94f`](https://github.com/aya-rs/aya/commit/055d94f58be4f80ada416b99278a22f600c71285)) - Merge pull request #449 from aya-rs/dependabot/cargo/env_logger-0.10 ([`f9bef9f`](https://github.com/aya-rs/aya/commit/f9bef9f8c0d2c5b21809e037b8e9782f3c761df3)) - Update env_logger requirement from 0.9 to 0.10 ([`1c8088b`](https://github.com/aya-rs/aya/commit/1c8088b16cc255fc188b0b9a84b550a5c50a9003)) - Revert "aya-log, aya-log-common: temporarily revert to old map API so we can release" ([`0b41018`](https://github.com/aya-rs/aya/commit/0b41018ee27bfda9b1ea7dc422b34d3a08fc3fc6))
## v0.1.13 (2022-11-16) @@ -192,64 +160,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Other - - release version 0.1.13 - - Add format hints for MAC addresses - Add `{:mac}` (for lower-case hex representation) and `{:MAC}` (for - upper-case hex representation) format hints for the `[u8; 6]` type, - which is the standard one in Linux to store physical addresses in. - - Tested with: https://github.com/vadorovsky/aya-examples/tree/main/xdp-mac - - Make miri happy - Miri took issue about using slice::from_raw_parts without checking for - alignment. Instead, we can simply convert to a [u8;16] into a [u16;8] by - iterating in chunks of 2 and bitshifting (remembering that these arrays - are in network-endian order). - - Add display hints - This change adds optional display hints: - - * `{:x}`, `{:X}` - for hex representation of numbers - * `{:ipv4}`, `{:IPv4}` - for IPv4 addresses - * `{:ipv6}`, `{:IPv6}` - for IPv6 addresses - - It also gets rid of dyn-fmt and instead comes with our own parser - implementation. - - Tested on: https://github.com/vadorovsky/aya-examples/tree/main/tc - - Fix links to aya-log repo - The aya-log repo ([0]) has been archived, use the link to - aya repo instead. - - Remove i128 and u128 types - They are not supported by eBPF VM and we are going to use arrays for - IPv6. - - use new PerCpuArray::get_ptr_mut API - - Add example - This ensures that macro expansion works properly and that expanded code - compiles - - Ensure the bounds of log buffer - eBPF verifier rejects programs which are not checking the bounds of the - log buffer before writing any arguments. This change ensures that - written log arguments. - - In practice, it means that doing this kind of checks is not going to be - needed in eBPF program code anymore: - - Bump the buffer size - 1024 is too small for many kernel string limits (i.e. PATH_MAX, which is - 4096). - - do not release - - use stricter version for the aya-log-common dep - - inline write_record_header - This seems to help the verifier keep track of where we're writing into - LOG_BUF - - initialize AYA_LOGS with max_entries=0 - This way aya will create one perf buffer for each cpu +- release version 0.1.13 +- Add format hints for MAC addresses + Add `{:mac}` (for lower-case hex representation) and `{:MAC}` (for + upper-case hex representation) format hints for the `[u8; 6]` type, + which is the standard one in Linux to store physical addresses in. + + Tested with: https://github.com/vadorovsky/aya-examples/tree/main/xdp-mac + +- Make miri happy + Miri took issue about using slice::from_raw_parts without checking for + alignment. Instead, we can simply convert to a [u8;16] into a [u16;8] by + iterating in chunks of 2 and bitshifting (remembering that these arrays + are in network-endian order). +- Add display hints + This change adds optional display hints: + + - `{:x}`, `{:X}` - for hex representation of numbers + - `{:ipv4}`, `{:IPv4}` - for IPv4 addresses + - `{:ipv6}`, `{:IPv6}` - for IPv6 addresses + + It also gets rid of dyn-fmt and instead comes with our own parser + implementation. + + Tested on: https://github.com/vadorovsky/aya-examples/tree/main/tc + +- Fix links to aya-log repo + The aya-log repo ([0]) has been archived, use the link to + aya repo instead. +- Remove i128 and u128 types + They are not supported by eBPF VM and we are going to use arrays for + IPv6. +- use new PerCpuArray::get_ptr_mut API +- Add example + This ensures that macro expansion works properly and that expanded code + compiles +- Ensure the bounds of log buffer + eBPF verifier rejects programs which are not checking the bounds of the + log buffer before writing any arguments. This change ensures that + written log arguments. + + In practice, it means that doing this kind of checks is not going to be + needed in eBPF program code anymore: + +- Bump the buffer size + 1024 is too small for many kernel string limits (i.e. PATH_MAX, which is + 4096). +- do not release +- use stricter version for the aya-log-common dep +- inline write_record_header + This seems to help the verifier keep track of where we're writing into + LOG_BUF +- initialize AYA_LOGS with max_entries=0 + This way aya will create one perf buffer for each cpu ### Commit Statistics - - 59 commits contributed to the release over the course of 110 calendar days. - - 14 commits were understood as [conventional](https://www.conventionalcommits.org). - - 0 issues like '(#ID)' were seen in commit messages +- 59 commits contributed to the release over the course of 110 calendar days. +- 14 commits were understood as [conventional](https://www.conventionalcommits.org). +- 0 issues like '(#ID)' were seen in commit messages ### Commit Details @@ -257,65 +228,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
view details - * **Uncategorized** - - Release version 0.1.13 ([`832bdd2`](https://github.com/aya-rs/aya/commit/832bdd280c19095d79ba2d27281c17f0b09adc15)) - - Aya-log, aya-log-common: temporarily revert to old map API so we can release ([`0d040d2`](https://github.com/aya-rs/aya/commit/0d040d2290cc1513c979c95538210abd7ee59ebb)) - - Merge pull request #436 from vadorovsky/aya-log-mac-addr ([`3adb9b0`](https://github.com/aya-rs/aya/commit/3adb9b049f493ec9b80fcf868a8eac3363d17844)) - - Add format hints for MAC addresses ([`2223ab8`](https://github.com/aya-rs/aya/commit/2223ab828d6db40a85cff4737f6164ed8ee9e42d)) - - Merge pull request #397 from astoycos/refactor-map-api2 ([`d6cb1a1`](https://github.com/aya-rs/aya/commit/d6cb1a16ad0f8df483e2234fb01ab55bdbeaa8b8)) - - Make map APIs return an option ([`f3262e8`](https://github.com/aya-rs/aya/commit/f3262e87bd6ff895537df47fcf5d17c598e564cc)) - - Core refactor of Map API ([`1aefa2e`](https://github.com/aya-rs/aya/commit/1aefa2e5e6d22a600cc7339d289d64ab06f842e3)) - - Merge pull request #390 from dave-tucker/clippy-up ([`367ab20`](https://github.com/aya-rs/aya/commit/367ab203057329ea32eea34ddc97452e0c03fda6)) - - Make miri happy ([`b2924a3`](https://github.com/aya-rs/aya/commit/b2924a3a264732e6de6898a1f03d7cb22d1d0dc5)) - - Aya-log, aya-log-common: start next development iteration 0.1.12-dev.0 ([`6f0637a`](https://github.com/aya-rs/aya/commit/6f0637a6c8f3696b226558dc47b2dc2f6680e347)) - - Aya-log, aya-log-common: release version 0.1.11 ([`ba927ac`](https://github.com/aya-rs/aya/commit/ba927ac20497fdfd0033fb48f4bfda3fc8dedf42)) - - Add display hints ([`83ec27f`](https://github.com/aya-rs/aya/commit/83ec27f06b6859f455f2b2baf985b8fd3fb4adc5)) - - Change from Rust edition 2018 to 2021 ([`944d6b8`](https://github.com/aya-rs/aya/commit/944d6b8a1647df36c17cd060b15c37ac9615f4a7)) - - Merge pull request #361 from chenhengqi/fix-aya-log-links ([`632ea30`](https://github.com/aya-rs/aya/commit/632ea300ed8dcb3a277447a57b528b8d89b0c10a)) - - Fix links to aya-log repo ([`b8b291c`](https://github.com/aya-rs/aya/commit/b8b291c51ba1b43ff27c6aab6b55d6af77334aae)) - - Merge pull request #357 from vadorovsky/env_logger ([`3d5ab0b`](https://github.com/aya-rs/aya/commit/3d5ab0b17de0e4f1453a88ed00823d04db0845a6)) - - Aya-log, test: Switch from simplelog to env_logger ([`3664e1e`](https://github.com/aya-rs/aya/commit/3664e1ea0d42985bd88129cfd338bacff2456398)) - - Merge pull request #353 from vadorovsky/log-remove-u128 ([`d968094`](https://github.com/aya-rs/aya/commit/d968094b662be3449624420b76ea2dd239ef657b)) - - Remove i128 and u128 types ([`611f967`](https://github.com/aya-rs/aya/commit/611f967cd14b90e187ca86735f2131fb87e89856)) - - Merge pull request #350 from dave-tucker/monorepo ([`f37a514`](https://github.com/aya-rs/aya/commit/f37a51433ff5283205ba5d1e74cdc75fbdeea160)) - - Re-organize into a single workspace ([`dc31e11`](https://github.com/aya-rs/aya/commit/dc31e11691bbb8ae916da9da873fdc37ff261c27)) - - Fix the log buffer bounds ([`28abaec`](https://github.com/aya-rs/aya/commit/28abaece2af732cf2b2b2f8b12aeb02439e76d4c)) - - Ensure log buffer bounds ([`2e07028`](https://github.com/aya-rs/aya/commit/2e0702854b0e2428f6b5b32678f5f79ca341c619)) - - Use new PerCpuArray::get_ptr_mut API ([`6aea880`](https://github.com/aya-rs/aya/commit/6aea88089087194c831b259a61eef5ccebcb45bc)) - - Aya-log, aya-log-common: start next development iteration 0.1.11-dev.0 ([`526493b`](https://github.com/aya-rs/aya/commit/526493b444ed91f1c315ace494b41b8f4178fe65)) - - Aya-log, aya-log-common: release version 0.1.10 ([`3abd973`](https://github.com/aya-rs/aya/commit/3abd97307ef32bfbd384f38f7a0de40cc7afa0b1)) - - Update aya requirement from 0.10.7 to 0.11.0 ([`060ba45`](https://github.com/aya-rs/aya/commit/060ba451535b1a90c2faaf2dcd634fa36e784efb)) - - Add CI ([`0038b43`](https://github.com/aya-rs/aya/commit/0038b43627e6564b03d9837f535ec64ada6d70f2)) - - Add vim/vscode rust-analyzer settings ([`c1bb790`](https://github.com/aya-rs/aya/commit/c1bb790c0d8d467ac41603b15b56823c7ba0f663)) - - Add rustfmt.toml ([`3f00851`](https://github.com/aya-rs/aya/commit/3f0085195f178fdba6c214b4129f8321e612d4e7)) - - Add example ([`5789585`](https://github.com/aya-rs/aya/commit/5789585994776d18afa58f3bb816cfcb1367298e)) - - Add Tests ([`5d82d9a`](https://github.com/aya-rs/aya/commit/5d82d9a73e77d386c8be3dc3764b3dd361fcac71)) - - Ensure the bounds of log buffer ([`628b473`](https://github.com/aya-rs/aya/commit/628b473e0937eef94b0b337608a5d6c51ad2fd2a)) - - Bump the buffer size ([`70b4e68`](https://github.com/aya-rs/aya/commit/70b4e681301eb23ca776cd703e11f19cc879ac69)) - - Aya-log, aya-log-common: start next development iteration 0.1.10-dev.0 ([`bd9a5c8`](https://github.com/aya-rs/aya/commit/bd9a5c8fdff9c20952137908388b1d833ab60fcc)) - - Aya-log, aya-log-common: release version 0.1.9 ([`8bc1bbb`](https://github.com/aya-rs/aya/commit/8bc1bbb3abe588e89161e67ad013c34f1ec3ab6d)) - - Add cargo-release config ([`a8d133f`](https://github.com/aya-rs/aya/commit/a8d133f6b0919bb7d8e821f1309ee264d8b03a71)) - - Do not release ([`d1a0ce5`](https://github.com/aya-rs/aya/commit/d1a0ce51ee4e67cf9b03b695940f356ee950f8c2)) - - Use stricter version for the aya-log-common dep ([`c4d89fa`](https://github.com/aya-rs/aya/commit/c4d89fa13cb4e96a62ccd5cae7cf1834c3c582f6)) - - Inline write_record_header ([`bdb2750`](https://github.com/aya-rs/aya/commit/bdb2750e66f922ebfbcba7250add38e2c932c293)) - - Update aya to 0.10.7 ([`81befa0`](https://github.com/aya-rs/aya/commit/81befa06610b9e771523bceee4871a704851b1f0)) - - Format arguments in userspace ([`ca1fe7e`](https://github.com/aya-rs/aya/commit/ca1fe7e05f7b52c5e864680abeda29e640617d40)) - - Don't recompute the record length ([`9b229d0`](https://github.com/aya-rs/aya/commit/9b229d00e110a5b3b610ad567f8d15682c0b78e1)) - - Initialize AYA_LOGS with max_entries=0 ([`7f8d705`](https://github.com/aya-rs/aya/commit/7f8d7057df11f41d0869f7f713d121785934adca)) - - Fix clippy warning ([`2800454`](https://github.com/aya-rs/aya/commit/2800454763f5f0250c46c87f9cfb2e3d1f5f0a7e)) - - Add copy of README.md inside aya-log/ ([`8bde15d`](https://github.com/aya-rs/aya/commit/8bde15dad70016f6fb72a77906da341768d59720)) - - Add missing manifest fields ([`5e18a71`](https://github.com/aya-rs/aya/commit/5e18a715b2d1cf153de96d9775dfea762c684258)) - - (cargo-release) version 0.1.1 ([`31e71f8`](https://github.com/aya-rs/aya/commit/31e71f8db53454ce673bd9891be06fc002af5721)) - - (cargo-release) version 0.1.1 ([`29955b2`](https://github.com/aya-rs/aya/commit/29955b22875b865f567079c76aeba70630fa42dd)) - - Git add .cargo and xtask ([`6d14a16`](https://github.com/aya-rs/aya/commit/6d14a16d8ed54d90e9dfdbdca1fb2caf0a15c017)) - - Update to aya 0.10.5 ([`cced3da`](https://github.com/aya-rs/aya/commit/cced3da5c8ff45df0596e25123071a4a761286d6)) - - Simplify BpfLogger::init ([`9ab9c80`](https://github.com/aya-rs/aya/commit/9ab9c80183edcb23297a644d0e63f7c1f28cd968)) - - Minor tweaks to make the verifier's job easier ([`2ac4334`](https://github.com/aya-rs/aya/commit/2ac433449cdea32f10c8fc88218799995946032d)) - - Switch to aya-ufmt ([`b14d4ba`](https://github.com/aya-rs/aya/commit/b14d4bab2fac894d4e47838d7de8a9b63a5ac4c2)) - - Use aya_bpf::maps::PerfEventByteArray to output logs ([`22d8f86`](https://github.com/aya-rs/aya/commit/22d8f86fbb10ec5e71bca750119f93eb5ba171e5)) - - Use aya_log_ebpf::ufmt instead of ::ufmt ([`741957f`](https://github.com/aya-rs/aya/commit/741957f94598d149960a5296b2010a07ffac02e5)) - - Add ufmt to readme ([`0d7ac3e`](https://github.com/aya-rs/aya/commit/0d7ac3eb3ee58bd4ba10af9c49f7c9ef80e09143)) - - Update readme ([`5df853c`](https://github.com/aya-rs/aya/commit/5df853cfb030c3a37a066b892623546a77c97db2)) - - Initial commit ([`b29a061`](https://github.com/aya-rs/aya/commit/b29a061bce99d06971dc977ddc075cbf653971d4)) +- **Uncategorized** - Release version 0.1.13 ([`832bdd2`](https://github.com/aya-rs/aya/commit/832bdd280c19095d79ba2d27281c17f0b09adc15)) - Aya-log, aya-log-common: temporarily revert to old map API so we can release ([`0d040d2`](https://github.com/aya-rs/aya/commit/0d040d2290cc1513c979c95538210abd7ee59ebb)) - Merge pull request #436 from vadorovsky/aya-log-mac-addr ([`3adb9b0`](https://github.com/aya-rs/aya/commit/3adb9b049f493ec9b80fcf868a8eac3363d17844)) - Add format hints for MAC addresses ([`2223ab8`](https://github.com/aya-rs/aya/commit/2223ab828d6db40a85cff4737f6164ed8ee9e42d)) - Merge pull request #397 from astoycos/refactor-map-api2 ([`d6cb1a1`](https://github.com/aya-rs/aya/commit/d6cb1a16ad0f8df483e2234fb01ab55bdbeaa8b8)) - Make map APIs return an option ([`f3262e8`](https://github.com/aya-rs/aya/commit/f3262e87bd6ff895537df47fcf5d17c598e564cc)) - Core refactor of Map API ([`1aefa2e`](https://github.com/aya-rs/aya/commit/1aefa2e5e6d22a600cc7339d289d64ab06f842e3)) - Merge pull request #390 from dave-tucker/clippy-up ([`367ab20`](https://github.com/aya-rs/aya/commit/367ab203057329ea32eea34ddc97452e0c03fda6)) - Make miri happy ([`b2924a3`](https://github.com/aya-rs/aya/commit/b2924a3a264732e6de6898a1f03d7cb22d1d0dc5)) - Aya-log, aya-log-common: start next development iteration 0.1.12-dev.0 ([`6f0637a`](https://github.com/aya-rs/aya/commit/6f0637a6c8f3696b226558dc47b2dc2f6680e347)) - Aya-log, aya-log-common: release version 0.1.11 ([`ba927ac`](https://github.com/aya-rs/aya/commit/ba927ac20497fdfd0033fb48f4bfda3fc8dedf42)) - Add display hints ([`83ec27f`](https://github.com/aya-rs/aya/commit/83ec27f06b6859f455f2b2baf985b8fd3fb4adc5)) - Change from Rust edition 2018 to 2021 ([`944d6b8`](https://github.com/aya-rs/aya/commit/944d6b8a1647df36c17cd060b15c37ac9615f4a7)) - Merge pull request #361 from chenhengqi/fix-aya-log-links ([`632ea30`](https://github.com/aya-rs/aya/commit/632ea300ed8dcb3a277447a57b528b8d89b0c10a)) - Fix links to aya-log repo ([`b8b291c`](https://github.com/aya-rs/aya/commit/b8b291c51ba1b43ff27c6aab6b55d6af77334aae)) - Merge pull request #357 from vadorovsky/env_logger ([`3d5ab0b`](https://github.com/aya-rs/aya/commit/3d5ab0b17de0e4f1453a88ed00823d04db0845a6)) - Aya-log, test: Switch from simplelog to env_logger ([`3664e1e`](https://github.com/aya-rs/aya/commit/3664e1ea0d42985bd88129cfd338bacff2456398)) - Merge pull request #353 from vadorovsky/log-remove-u128 ([`d968094`](https://github.com/aya-rs/aya/commit/d968094b662be3449624420b76ea2dd239ef657b)) - Remove i128 and u128 types ([`611f967`](https://github.com/aya-rs/aya/commit/611f967cd14b90e187ca86735f2131fb87e89856)) - Merge pull request #350 from dave-tucker/monorepo ([`f37a514`](https://github.com/aya-rs/aya/commit/f37a51433ff5283205ba5d1e74cdc75fbdeea160)) - Re-organize into a single workspace ([`dc31e11`](https://github.com/aya-rs/aya/commit/dc31e11691bbb8ae916da9da873fdc37ff261c27)) - Fix the log buffer bounds ([`28abaec`](https://github.com/aya-rs/aya/commit/28abaece2af732cf2b2b2f8b12aeb02439e76d4c)) - Ensure log buffer bounds ([`2e07028`](https://github.com/aya-rs/aya/commit/2e0702854b0e2428f6b5b32678f5f79ca341c619)) - Use new PerCpuArray::get_ptr_mut API ([`6aea880`](https://github.com/aya-rs/aya/commit/6aea88089087194c831b259a61eef5ccebcb45bc)) - Aya-log, aya-log-common: start next development iteration 0.1.11-dev.0 ([`526493b`](https://github.com/aya-rs/aya/commit/526493b444ed91f1c315ace494b41b8f4178fe65)) - Aya-log, aya-log-common: release version 0.1.10 ([`3abd973`](https://github.com/aya-rs/aya/commit/3abd97307ef32bfbd384f38f7a0de40cc7afa0b1)) - Update aya requirement from 0.10.7 to 0.11.0 ([`060ba45`](https://github.com/aya-rs/aya/commit/060ba451535b1a90c2faaf2dcd634fa36e784efb)) - Add CI ([`0038b43`](https://github.com/aya-rs/aya/commit/0038b43627e6564b03d9837f535ec64ada6d70f2)) - Add vim/vscode rust-analyzer settings ([`c1bb790`](https://github.com/aya-rs/aya/commit/c1bb790c0d8d467ac41603b15b56823c7ba0f663)) - Add rustfmt.toml ([`3f00851`](https://github.com/aya-rs/aya/commit/3f0085195f178fdba6c214b4129f8321e612d4e7)) - Add example ([`5789585`](https://github.com/aya-rs/aya/commit/5789585994776d18afa58f3bb816cfcb1367298e)) - Add Tests ([`5d82d9a`](https://github.com/aya-rs/aya/commit/5d82d9a73e77d386c8be3dc3764b3dd361fcac71)) - Ensure the bounds of log buffer ([`628b473`](https://github.com/aya-rs/aya/commit/628b473e0937eef94b0b337608a5d6c51ad2fd2a)) - Bump the buffer size ([`70b4e68`](https://github.com/aya-rs/aya/commit/70b4e681301eb23ca776cd703e11f19cc879ac69)) - Aya-log, aya-log-common: start next development iteration 0.1.10-dev.0 ([`bd9a5c8`](https://github.com/aya-rs/aya/commit/bd9a5c8fdff9c20952137908388b1d833ab60fcc)) - Aya-log, aya-log-common: release version 0.1.9 ([`8bc1bbb`](https://github.com/aya-rs/aya/commit/8bc1bbb3abe588e89161e67ad013c34f1ec3ab6d)) - Add cargo-release config ([`a8d133f`](https://github.com/aya-rs/aya/commit/a8d133f6b0919bb7d8e821f1309ee264d8b03a71)) - Do not release ([`d1a0ce5`](https://github.com/aya-rs/aya/commit/d1a0ce51ee4e67cf9b03b695940f356ee950f8c2)) - Use stricter version for the aya-log-common dep ([`c4d89fa`](https://github.com/aya-rs/aya/commit/c4d89fa13cb4e96a62ccd5cae7cf1834c3c582f6)) - Inline write_record_header ([`bdb2750`](https://github.com/aya-rs/aya/commit/bdb2750e66f922ebfbcba7250add38e2c932c293)) - Update aya to 0.10.7 ([`81befa0`](https://github.com/aya-rs/aya/commit/81befa06610b9e771523bceee4871a704851b1f0)) - Format arguments in userspace ([`ca1fe7e`](https://github.com/aya-rs/aya/commit/ca1fe7e05f7b52c5e864680abeda29e640617d40)) - Don't recompute the record length ([`9b229d0`](https://github.com/aya-rs/aya/commit/9b229d00e110a5b3b610ad567f8d15682c0b78e1)) - Initialize AYA_LOGS with max_entries=0 ([`7f8d705`](https://github.com/aya-rs/aya/commit/7f8d7057df11f41d0869f7f713d121785934adca)) - Fix clippy warning ([`2800454`](https://github.com/aya-rs/aya/commit/2800454763f5f0250c46c87f9cfb2e3d1f5f0a7e)) - Add copy of README.md inside aya-log/ ([`8bde15d`](https://github.com/aya-rs/aya/commit/8bde15dad70016f6fb72a77906da341768d59720)) - Add missing manifest fields ([`5e18a71`](https://github.com/aya-rs/aya/commit/5e18a715b2d1cf153de96d9775dfea762c684258)) - (cargo-release) version 0.1.1 ([`31e71f8`](https://github.com/aya-rs/aya/commit/31e71f8db53454ce673bd9891be06fc002af5721)) - (cargo-release) version 0.1.1 ([`29955b2`](https://github.com/aya-rs/aya/commit/29955b22875b865f567079c76aeba70630fa42dd)) - Git add .cargo and xtask ([`6d14a16`](https://github.com/aya-rs/aya/commit/6d14a16d8ed54d90e9dfdbdca1fb2caf0a15c017)) - Update to aya 0.10.5 ([`cced3da`](https://github.com/aya-rs/aya/commit/cced3da5c8ff45df0596e25123071a4a761286d6)) - Simplify BpfLogger::init ([`9ab9c80`](https://github.com/aya-rs/aya/commit/9ab9c80183edcb23297a644d0e63f7c1f28cd968)) - Minor tweaks to make the verifier's job easier ([`2ac4334`](https://github.com/aya-rs/aya/commit/2ac433449cdea32f10c8fc88218799995946032d)) - Switch to aya-ufmt ([`b14d4ba`](https://github.com/aya-rs/aya/commit/b14d4bab2fac894d4e47838d7de8a9b63a5ac4c2)) - Use aya_ebpf::maps::PerfEventByteArray to output logs ([`22d8f86`](https://github.com/aya-rs/aya/commit/22d8f86fbb10ec5e71bca750119f93eb5ba171e5)) - Use aya_log_ebpf::ufmt instead of ::ufmt ([`741957f`](https://github.com/aya-rs/aya/commit/741957f94598d149960a5296b2010a07ffac02e5)) - Add ufmt to readme ([`0d7ac3e`](https://github.com/aya-rs/aya/commit/0d7ac3eb3ee58bd4ba10af9c49f7c9ef80e09143)) - Update readme ([`5df853c`](https://github.com/aya-rs/aya/commit/5df853cfb030c3a37a066b892623546a77c97db2)) - Initial commit ([`b29a061`](https://github.com/aya-rs/aya/commit/b29a061bce99d06971dc977ddc075cbf653971d4))
- diff --git a/aya-tool/src/bindgen.rs b/aya-tool/src/bindgen.rs index 2f04e6fc..87f73102 100644 --- a/aya-tool/src/bindgen.rs +++ b/aya-tool/src/bindgen.rs @@ -14,7 +14,7 @@ pub fn user_builder() -> Builder { pub fn bpf_builder() -> Builder { bindgen::builder() .use_core() - .ctypes_prefix("::aya_bpf::cty") + .ctypes_prefix("::aya_ebpf::cty") .layout_tests(false) .generate_comments(false) .clang_arg("-Wno-unknown-attributes") diff --git a/ebpf/aya-bpf/Cargo.toml b/ebpf/aya-ebpf/Cargo.toml similarity index 97% rename from ebpf/aya-bpf/Cargo.toml rename to ebpf/aya-ebpf/Cargo.toml index 44059ef3..c4506e6c 100644 --- a/ebpf/aya-bpf/Cargo.toml +++ b/ebpf/aya-ebpf/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "aya-bpf" +name = "aya-ebpf" version = "0.1.0" description = "A library for writing eBPF programs" authors.workspace = true diff --git a/ebpf/aya-bpf/build.rs b/ebpf/aya-ebpf/build.rs similarity index 100% rename from ebpf/aya-bpf/build.rs rename to ebpf/aya-ebpf/build.rs diff --git a/ebpf/aya-bpf/src/args.rs b/ebpf/aya-ebpf/src/args.rs similarity index 100% rename from ebpf/aya-bpf/src/args.rs rename to ebpf/aya-ebpf/src/args.rs diff --git a/ebpf/aya-bpf/src/helpers.rs b/ebpf/aya-ebpf/src/helpers.rs similarity index 94% rename from ebpf/aya-bpf/src/helpers.rs rename to ebpf/aya-ebpf/src/helpers.rs index 0a26e48c..88d0a812 100644 --- a/ebpf/aya-bpf/src/helpers.rs +++ b/ebpf/aya-ebpf/src/helpers.rs @@ -30,7 +30,7 @@ use crate::{ /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const c_int = 0 as _; /// let my_int: c_int = unsafe { bpf_probe_read(kernel_ptr)? }; @@ -67,7 +67,7 @@ pub unsafe fn bpf_probe_read(src: *const T) -> Result { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_buf}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_buf}; /// # fn try_test() -> Result<(), c_long> { /// # let ptr: *const u8 = 0 as _; /// let mut buf = [0u8; 16]; @@ -103,7 +103,7 @@ pub unsafe fn bpf_probe_read_buf(src: *const u8, dst: &mut [u8]) -> Result<(), c /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_user}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_user}; /// # fn try_test() -> Result<(), c_long> { /// # let user_ptr: *const c_int = 0 as _; /// let my_int: c_int = unsafe { bpf_probe_read_user(user_ptr)? }; @@ -138,7 +138,7 @@ pub unsafe fn bpf_probe_read_user(src: *const T) -> Result { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_user_buf}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_user_buf}; /// # fn try_test() -> Result<(), c_long> { /// # let user_ptr: *const u8 = 0 as _; /// let mut buf = [0u8; 16]; @@ -174,7 +174,7 @@ pub unsafe fn bpf_probe_read_user_buf(src: *const u8, dst: &mut [u8]) -> Result< /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_kernel}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_kernel}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const c_int = 0 as _; /// let my_int: c_int = unsafe { bpf_probe_read_kernel(kernel_ptr)? }; @@ -209,7 +209,7 @@ pub unsafe fn bpf_probe_read_kernel(src: *const T) -> Result { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_kernel_buf}; +/// # use aya_ebpf::{cty::{c_int, c_long}, helpers::bpf_probe_read_kernel_buf}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const u8 = 0 as _; /// let mut buf = [0u8; 16]; @@ -248,7 +248,7 @@ pub unsafe fn bpf_probe_read_kernel_buf(src: *const u8, dst: &mut [u8]) -> Resul /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_str}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_str}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const u8 = 0 as _; /// let mut my_str = [0u8; 16]; @@ -286,7 +286,7 @@ pub unsafe fn bpf_probe_read_str(src: *const u8, dest: &mut [u8]) -> Result Result<(), c_long> { /// # let user_ptr: *const u8 = 0 as _; /// let mut my_str = [0u8; 16]; @@ -327,7 +327,7 @@ pub unsafe fn bpf_probe_read_user_str(src: *const u8, dest: &mut [u8]) -> Result /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; /// # fn try_test() -> Result<(), c_long> { /// # let user_ptr: *const u8 = 0 as _; /// let mut buf = [0u8; 16]; @@ -341,8 +341,8 @@ pub unsafe fn bpf_probe_read_user_str(src: *const u8, dest: &mut [u8]) -> Result /// With a `PerCpuArray` (with size defined by us): /// /// ```no_run -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; -/// use aya_bpf::{macros::map, maps::PerCpuArray}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; +/// use aya_ebpf::{macros::map, maps::PerCpuArray}; /// /// #[repr(C)] /// pub struct Buf { @@ -370,8 +370,8 @@ pub unsafe fn bpf_probe_read_user_str(src: *const u8, dest: &mut [u8]) -> Result /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; -/// # use aya_bpf::{macros::map, maps::PerCpuArray}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_user_str_bytes}; +/// # use aya_ebpf::{macros::map, maps::PerCpuArray}; /// # #[repr(C)] /// # pub struct Buf { /// # pub buf: [u8; 4096], @@ -436,7 +436,7 @@ fn read_str_bytes(len: i64, dest: &[u8]) -> Result<&[u8], c_long> { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_kernel_str}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_kernel_str}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const u8 = 0 as _; /// let mut my_str = [0u8; 16]; @@ -477,7 +477,7 @@ pub unsafe fn bpf_probe_read_kernel_str(src: *const u8, dest: &mut [u8]) -> Resu /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; /// # fn try_test() -> Result<(), c_long> { /// # let kernel_ptr: *const u8 = 0 as _; /// let mut buf = [0u8; 16]; @@ -492,8 +492,8 @@ pub unsafe fn bpf_probe_read_kernel_str(src: *const u8, dest: &mut [u8]) -> Resu /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; -/// use aya_bpf::{macros::map, maps::PerCpuArray}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; +/// use aya_ebpf::{macros::map, maps::PerCpuArray}; /// /// #[repr(C)] /// pub struct Buf { @@ -521,8 +521,8 @@ pub unsafe fn bpf_probe_read_kernel_str(src: *const u8, dest: &mut [u8]) -> Resu /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; -/// # use aya_bpf::{macros::map, maps::PerCpuArray}; +/// # use aya_ebpf::{cty::c_long, helpers::bpf_probe_read_kernel_str_bytes}; +/// # use aya_ebpf::{macros::map, maps::PerCpuArray}; /// # #[repr(C)] /// # pub struct Buf { /// # pub buf: [u8; 4096], @@ -567,7 +567,7 @@ pub unsafe fn bpf_probe_read_kernel_str_bytes( /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::{ +/// # use aya_ebpf::{ /// # cty::{c_int, c_long}, /// # helpers::bpf_probe_write_user, /// # programs::ProbeContext, @@ -606,7 +606,7 @@ pub unsafe fn bpf_probe_write_user(dst: *mut T, src: *const T) -> Result<(), /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::helpers::bpf_get_current_comm; +/// # use aya_ebpf::helpers::bpf_get_current_comm; /// let comm = bpf_get_current_comm(); /// /// // Do something with comm @@ -643,7 +643,7 @@ pub fn bpf_get_current_comm() -> Result<[u8; 16], c_long> { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::helpers::bpf_get_current_pid_tgid; +/// # use aya_ebpf::helpers::bpf_get_current_pid_tgid; /// let tgid = (bpf_get_current_pid_tgid() >> 32) as u32; /// let pid = bpf_get_current_pid_tgid() as u32; /// @@ -666,7 +666,7 @@ pub fn bpf_get_current_pid_tgid() -> u64 { /// /// ```no_run /// # #![allow(dead_code)] -/// # use aya_bpf::helpers::bpf_get_current_uid_gid; +/// # use aya_ebpf::helpers::bpf_get_current_uid_gid; /// let gid = (bpf_get_current_uid_gid() >> 32) as u32; /// let uid = bpf_get_current_uid_gid() as u32; /// @@ -709,7 +709,7 @@ pub fn bpf_get_current_uid_gid() -> u64 { /// # Example /// /// ```no_run -/// # use aya_bpf::helpers::bpf_printk; +/// # use aya_ebpf::helpers::bpf_printk; /// unsafe { /// bpf_printk!(b"hi there! dec: %d, hex: 0x%08X", 42, 0x1234); /// } diff --git a/ebpf/aya-bpf/src/lib.rs b/ebpf/aya-ebpf/src/lib.rs similarity index 100% rename from ebpf/aya-bpf/src/lib.rs rename to ebpf/aya-ebpf/src/lib.rs diff --git a/ebpf/aya-bpf/src/maps/array.rs b/ebpf/aya-ebpf/src/maps/array.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/array.rs rename to ebpf/aya-ebpf/src/maps/array.rs diff --git a/ebpf/aya-bpf/src/maps/bloom_filter.rs b/ebpf/aya-ebpf/src/maps/bloom_filter.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/bloom_filter.rs rename to ebpf/aya-ebpf/src/maps/bloom_filter.rs diff --git a/ebpf/aya-bpf/src/maps/hash_map.rs b/ebpf/aya-ebpf/src/maps/hash_map.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/hash_map.rs rename to ebpf/aya-ebpf/src/maps/hash_map.rs diff --git a/ebpf/aya-bpf/src/maps/lpm_trie.rs b/ebpf/aya-ebpf/src/maps/lpm_trie.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/lpm_trie.rs rename to ebpf/aya-ebpf/src/maps/lpm_trie.rs diff --git a/ebpf/aya-bpf/src/maps/mod.rs b/ebpf/aya-ebpf/src/maps/mod.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/mod.rs rename to ebpf/aya-ebpf/src/maps/mod.rs diff --git a/ebpf/aya-bpf/src/maps/per_cpu_array.rs b/ebpf/aya-ebpf/src/maps/per_cpu_array.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/per_cpu_array.rs rename to ebpf/aya-ebpf/src/maps/per_cpu_array.rs diff --git a/ebpf/aya-bpf/src/maps/perf/mod.rs b/ebpf/aya-ebpf/src/maps/perf/mod.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/perf/mod.rs rename to ebpf/aya-ebpf/src/maps/perf/mod.rs diff --git a/ebpf/aya-bpf/src/maps/perf/perf_event_array.rs b/ebpf/aya-ebpf/src/maps/perf/perf_event_array.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/perf/perf_event_array.rs rename to ebpf/aya-ebpf/src/maps/perf/perf_event_array.rs diff --git a/ebpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs b/ebpf/aya-ebpf/src/maps/perf/perf_event_byte_array.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs rename to ebpf/aya-ebpf/src/maps/perf/perf_event_byte_array.rs diff --git a/ebpf/aya-bpf/src/maps/program_array.rs b/ebpf/aya-ebpf/src/maps/program_array.rs similarity index 97% rename from ebpf/aya-bpf/src/maps/program_array.rs rename to ebpf/aya-ebpf/src/maps/program_array.rs index 02063e81..05e1949d 100644 --- a/ebpf/aya-bpf/src/maps/program_array.rs +++ b/ebpf/aya-ebpf/src/maps/program_array.rs @@ -15,8 +15,8 @@ use crate::{ /// /// ```no_run /// # #![allow(dead_code)] -/// use aya_bpf::{macros::map, maps::ProgramArray, cty::c_long}; -/// # use aya_bpf::{programs::LsmContext}; +/// use aya_ebpf::{macros::map, maps::ProgramArray, cty::c_long}; +/// # use aya_ebpf::{programs::LsmContext}; /// /// #[map] /// static JUMP_TABLE: ProgramArray = ProgramArray::with_max_entries(16, 0); diff --git a/ebpf/aya-bpf/src/maps/queue.rs b/ebpf/aya-ebpf/src/maps/queue.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/queue.rs rename to ebpf/aya-ebpf/src/maps/queue.rs diff --git a/ebpf/aya-bpf/src/maps/ring_buf.rs b/ebpf/aya-ebpf/src/maps/ring_buf.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/ring_buf.rs rename to ebpf/aya-ebpf/src/maps/ring_buf.rs diff --git a/ebpf/aya-bpf/src/maps/sock_hash.rs b/ebpf/aya-ebpf/src/maps/sock_hash.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/sock_hash.rs rename to ebpf/aya-ebpf/src/maps/sock_hash.rs diff --git a/ebpf/aya-bpf/src/maps/sock_map.rs b/ebpf/aya-ebpf/src/maps/sock_map.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/sock_map.rs rename to ebpf/aya-ebpf/src/maps/sock_map.rs diff --git a/ebpf/aya-bpf/src/maps/stack.rs b/ebpf/aya-ebpf/src/maps/stack.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/stack.rs rename to ebpf/aya-ebpf/src/maps/stack.rs diff --git a/ebpf/aya-bpf/src/maps/stack_trace.rs b/ebpf/aya-ebpf/src/maps/stack_trace.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/stack_trace.rs rename to ebpf/aya-ebpf/src/maps/stack_trace.rs diff --git a/ebpf/aya-bpf/src/maps/xdp/cpu_map.rs b/ebpf/aya-ebpf/src/maps/xdp/cpu_map.rs similarity index 91% rename from ebpf/aya-bpf/src/maps/xdp/cpu_map.rs rename to ebpf/aya-ebpf/src/maps/xdp/cpu_map.rs index 5f89f67a..665526ba 100644 --- a/ebpf/aya-bpf/src/maps/xdp/cpu_map.rs +++ b/ebpf/aya-ebpf/src/maps/xdp/cpu_map.rs @@ -19,7 +19,7 @@ use crate::{ /// # Examples /// /// ```rust,no_run -/// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::CpuMap, programs::XdpContext}; +/// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::CpuMap, programs::XdpContext}; /// /// #[map] /// static MAP: CpuMap = CpuMap::with_max_entries(8, 0); @@ -47,7 +47,7 @@ impl CpuMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::CpuMap}; + /// use aya_ebpf::{macros::map, maps::CpuMap}; /// /// #[map] /// static MAP: CpuMap = CpuMap::with_max_entries(8, 0); @@ -74,7 +74,7 @@ impl CpuMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::CpuMap}; + /// use aya_ebpf::{macros::map, maps::CpuMap}; /// /// #[map] /// static MAP: CpuMap = CpuMap::pinned(8, 0); @@ -101,7 +101,7 @@ impl CpuMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::CpuMap, programs::XdpContext}; + /// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::CpuMap, programs::XdpContext}; /// /// #[map] /// static MAP: CpuMap = CpuMap::with_max_entries(8, 0); diff --git a/ebpf/aya-bpf/src/maps/xdp/dev_map.rs b/ebpf/aya-ebpf/src/maps/xdp/dev_map.rs similarity index 92% rename from ebpf/aya-bpf/src/maps/xdp/dev_map.rs rename to ebpf/aya-ebpf/src/maps/xdp/dev_map.rs index 98828df6..209349bb 100644 --- a/ebpf/aya-bpf/src/maps/xdp/dev_map.rs +++ b/ebpf/aya-ebpf/src/maps/xdp/dev_map.rs @@ -21,7 +21,7 @@ use crate::{ /// # Examples /// /// ```rust,no_run -/// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMap, programs::XdpContext}; +/// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMap, programs::XdpContext}; /// /// #[map] /// static MAP: DevMap = DevMap::with_max_entries(1, 0); @@ -44,7 +44,7 @@ impl DevMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMap}; + /// use aya_ebpf::{macros::map, maps::DevMap}; /// /// #[map] /// static MAP: DevMap = DevMap::with_max_entries(8, 0); @@ -69,7 +69,7 @@ impl DevMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMap}; + /// use aya_ebpf::{macros::map, maps::DevMap}; /// /// #[map] /// static MAP: DevMap = DevMap::pinned(8, 0); @@ -95,7 +95,7 @@ impl DevMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMap}; + /// use aya_ebpf::{macros::map, maps::DevMap}; /// /// #[map] /// static MAP: DevMap = DevMap::with_max_entries(1, 0); @@ -128,7 +128,7 @@ impl DevMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMap, programs::XdpContext}; + /// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMap, programs::XdpContext}; /// /// #[map] /// static MAP: DevMap = DevMap::with_max_entries(8, 0); diff --git a/ebpf/aya-bpf/src/maps/xdp/dev_map_hash.rs b/ebpf/aya-ebpf/src/maps/xdp/dev_map_hash.rs similarity index 92% rename from ebpf/aya-bpf/src/maps/xdp/dev_map_hash.rs rename to ebpf/aya-ebpf/src/maps/xdp/dev_map_hash.rs index 85cb8622..64dfb545 100644 --- a/ebpf/aya-bpf/src/maps/xdp/dev_map_hash.rs +++ b/ebpf/aya-ebpf/src/maps/xdp/dev_map_hash.rs @@ -23,7 +23,7 @@ use crate::{ /// # Examples /// /// ```rust,no_run -/// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMapHash, programs::XdpContext}; +/// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMapHash, programs::XdpContext}; /// /// #[map] /// static MAP: DevMapHash = DevMapHash::with_max_entries(1, 0); @@ -46,7 +46,7 @@ impl DevMapHash { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMapHash}; + /// use aya_ebpf::{macros::map, maps::DevMapHash}; /// /// #[map] /// static MAP: DevMapHash = DevMapHash::with_max_entries(8, 0); @@ -71,7 +71,7 @@ impl DevMapHash { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMapHash}; + /// use aya_ebpf::{macros::map, maps::DevMapHash}; /// /// #[map] /// static MAP: DevMapHash = DevMapHash::pinned(8, 0); @@ -97,7 +97,7 @@ impl DevMapHash { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::DevMapHash}; + /// use aya_ebpf::{macros::map, maps::DevMapHash}; /// /// #[map] /// static MAP: DevMapHash = DevMapHash::with_max_entries(1, 0); @@ -128,7 +128,7 @@ impl DevMapHash { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMapHash, programs::XdpContext}; + /// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::DevMapHash, programs::XdpContext}; /// /// #[map] /// static MAP: DevMapHash = DevMapHash::with_max_entries(8, 0); diff --git a/ebpf/aya-bpf/src/maps/xdp/mod.rs b/ebpf/aya-ebpf/src/maps/xdp/mod.rs similarity index 100% rename from ebpf/aya-bpf/src/maps/xdp/mod.rs rename to ebpf/aya-ebpf/src/maps/xdp/mod.rs diff --git a/ebpf/aya-bpf/src/maps/xdp/xsk_map.rs b/ebpf/aya-ebpf/src/maps/xdp/xsk_map.rs similarity index 93% rename from ebpf/aya-bpf/src/maps/xdp/xsk_map.rs rename to ebpf/aya-ebpf/src/maps/xdp/xsk_map.rs index 830b0307..4ce352ec 100644 --- a/ebpf/aya-bpf/src/maps/xdp/xsk_map.rs +++ b/ebpf/aya-ebpf/src/maps/xdp/xsk_map.rs @@ -22,7 +22,7 @@ use crate::{ /// # Examples /// /// ```rust,no_run -/// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::XskMap, programs::XdpContext}; +/// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::XskMap, programs::XdpContext}; /// /// #[map] /// static SOCKS: XskMap = XskMap::with_max_entries(8, 0); @@ -65,7 +65,7 @@ impl XskMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::XskMap}; + /// use aya_ebpf::{macros::map, maps::XskMap}; /// /// #[map] /// static SOCKS: XskMap = XskMap::with_max_entries(8, 0); @@ -90,7 +90,7 @@ impl XskMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::XskMap}; + /// use aya_ebpf::{macros::map, maps::XskMap}; /// /// #[map] /// static SOCKS: XskMap = XskMap::pinned(8, 0); @@ -116,7 +116,7 @@ impl XskMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{macros::map, maps::XskMap}; + /// use aya_ebpf::{macros::map, maps::XskMap}; /// /// #[map] /// static SOCKS: XskMap = XskMap::with_max_entries(8, 0); @@ -145,7 +145,7 @@ impl XskMap { /// # Examples /// /// ```rust,no_run - /// use aya_bpf::{bindings::xdp_action, macros::{map, xdp}, maps::XskMap, programs::XdpContext}; + /// use aya_ebpf::{bindings::xdp_action, macros::{map, xdp}, maps::XskMap, programs::XdpContext}; /// /// #[map] /// static SOCKS: XskMap = XskMap::with_max_entries(8, 0); diff --git a/ebpf/aya-bpf/src/programs/device.rs b/ebpf/aya-ebpf/src/programs/device.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/device.rs rename to ebpf/aya-ebpf/src/programs/device.rs diff --git a/ebpf/aya-bpf/src/programs/fentry.rs b/ebpf/aya-ebpf/src/programs/fentry.rs similarity index 94% rename from ebpf/aya-bpf/src/programs/fentry.rs rename to ebpf/aya-ebpf/src/programs/fentry.rs index 56687539..769c9859 100644 --- a/ebpf/aya-bpf/src/programs/fentry.rs +++ b/ebpf/aya-ebpf/src/programs/fentry.rs @@ -18,7 +18,7 @@ impl FEntryContext { /// ```no_run /// # #![allow(non_camel_case_types)] /// # #![allow(dead_code)] - /// # use aya_bpf::{cty::c_int, programs::FEntryContext}; + /// # use aya_ebpf::{cty::c_int, programs::FEntryContext}; /// # type pid_t = c_int; /// # struct task_struct { /// # pid: pid_t, diff --git a/ebpf/aya-bpf/src/programs/fexit.rs b/ebpf/aya-ebpf/src/programs/fexit.rs similarity index 94% rename from ebpf/aya-bpf/src/programs/fexit.rs rename to ebpf/aya-ebpf/src/programs/fexit.rs index 1e52d733..d5b7ea25 100644 --- a/ebpf/aya-bpf/src/programs/fexit.rs +++ b/ebpf/aya-ebpf/src/programs/fexit.rs @@ -18,7 +18,7 @@ impl FExitContext { /// ```no_run /// # #![allow(non_camel_case_types)] /// # #![allow(dead_code)] - /// # use aya_bpf::{cty::c_int, programs::FExitContext}; + /// # use aya_ebpf::{cty::c_int, programs::FExitContext}; /// # type pid_t = c_int; /// # struct task_struct { /// # pid: pid_t, diff --git a/ebpf/aya-bpf/src/programs/lsm.rs b/ebpf/aya-ebpf/src/programs/lsm.rs similarity index 96% rename from ebpf/aya-bpf/src/programs/lsm.rs rename to ebpf/aya-ebpf/src/programs/lsm.rs index 4cb76cf4..fd67a7d5 100644 --- a/ebpf/aya-bpf/src/programs/lsm.rs +++ b/ebpf/aya-ebpf/src/programs/lsm.rs @@ -30,7 +30,7 @@ impl LsmContext { /// /// ```no_run /// # #![allow(dead_code)] - /// # use aya_bpf::{programs::LsmContext, cty::{c_int, c_ulong}}; + /// # use aya_ebpf::{programs::LsmContext, cty::{c_int, c_ulong}}; /// unsafe fn try_lsm_mmap_addr(ctx: LsmContext) -> Result { /// // In the kernel, this hook is defined as: /// // LSM_HOOK(int, 0, mmap_addr, unsigned long addr) diff --git a/ebpf/aya-bpf/src/programs/mod.rs b/ebpf/aya-ebpf/src/programs/mod.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/mod.rs rename to ebpf/aya-ebpf/src/programs/mod.rs diff --git a/ebpf/aya-bpf/src/programs/perf_event.rs b/ebpf/aya-ebpf/src/programs/perf_event.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/perf_event.rs rename to ebpf/aya-ebpf/src/programs/perf_event.rs diff --git a/ebpf/aya-bpf/src/programs/probe.rs b/ebpf/aya-ebpf/src/programs/probe.rs similarity index 92% rename from ebpf/aya-bpf/src/programs/probe.rs rename to ebpf/aya-ebpf/src/programs/probe.rs index 9566c814..4c7c507f 100644 --- a/ebpf/aya-bpf/src/programs/probe.rs +++ b/ebpf/aya-ebpf/src/programs/probe.rs @@ -26,7 +26,7 @@ impl ProbeContext { /// ```no_run /// # #![allow(non_camel_case_types)] /// # #![allow(dead_code)] - /// # use aya_bpf::{programs::ProbeContext, cty::c_int, helpers::bpf_probe_read}; + /// # use aya_ebpf::{programs::ProbeContext, cty::c_int, helpers::bpf_probe_read}; /// # type pid_t = c_int; /// # struct task_struct { /// # pid: pid_t, @@ -50,7 +50,7 @@ impl ProbeContext { /// /// ```no_run /// # #![allow(dead_code)] - /// # use aya_bpf::{programs::ProbeContext, cty::c_int}; + /// # use aya_ebpf::{programs::ProbeContext, cty::c_int}; /// unsafe fn try_kretprobe_try_to_wake_up(ctx: ProbeContext) -> Result { /// let retval: c_int = ctx.ret().ok_or(1u32)?; /// diff --git a/ebpf/aya-bpf/src/programs/raw_tracepoint.rs b/ebpf/aya-ebpf/src/programs/raw_tracepoint.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/raw_tracepoint.rs rename to ebpf/aya-ebpf/src/programs/raw_tracepoint.rs diff --git a/ebpf/aya-bpf/src/programs/sk_buff.rs b/ebpf/aya-ebpf/src/programs/sk_buff.rs similarity index 98% rename from ebpf/aya-bpf/src/programs/sk_buff.rs rename to ebpf/aya-ebpf/src/programs/sk_buff.rs index 7602417f..517b9a18 100644 --- a/ebpf/aya-bpf/src/programs/sk_buff.rs +++ b/ebpf/aya-ebpf/src/programs/sk_buff.rs @@ -315,7 +315,7 @@ impl SkBuffContext { /// ```no_run /// use core::mem; /// - /// use aya_bpf::{bindings::TC_ACT_PIPE, macros::map, maps::PerCpuArray, programs::SkBuffContext}; + /// use aya_ebpf::{bindings::TC_ACT_PIPE, macros::map, maps::PerCpuArray, programs::SkBuffContext}; /// # #[allow(non_camel_case_types)] /// # struct ethhdr {}; /// # #[allow(non_camel_case_types)] @@ -404,7 +404,7 @@ impl SkBuffContext { /// # Examples /// /// ```no_run - /// use aya_bpf::programs::SkBuffContext; + /// use aya_ebpf::programs::SkBuffContext; /// # #[allow(non_camel_case_types)] /// # struct ethhdr {}; /// # #[allow(non_camel_case_types)] diff --git a/ebpf/aya-bpf/src/programs/sk_lookup.rs b/ebpf/aya-ebpf/src/programs/sk_lookup.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sk_lookup.rs rename to ebpf/aya-ebpf/src/programs/sk_lookup.rs diff --git a/ebpf/aya-bpf/src/programs/sk_msg.rs b/ebpf/aya-ebpf/src/programs/sk_msg.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sk_msg.rs rename to ebpf/aya-ebpf/src/programs/sk_msg.rs diff --git a/ebpf/aya-bpf/src/programs/sock.rs b/ebpf/aya-ebpf/src/programs/sock.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sock.rs rename to ebpf/aya-ebpf/src/programs/sock.rs diff --git a/ebpf/aya-bpf/src/programs/sock_addr.rs b/ebpf/aya-ebpf/src/programs/sock_addr.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sock_addr.rs rename to ebpf/aya-ebpf/src/programs/sock_addr.rs diff --git a/ebpf/aya-bpf/src/programs/sock_ops.rs b/ebpf/aya-ebpf/src/programs/sock_ops.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sock_ops.rs rename to ebpf/aya-ebpf/src/programs/sock_ops.rs diff --git a/ebpf/aya-bpf/src/programs/sockopt.rs b/ebpf/aya-ebpf/src/programs/sockopt.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sockopt.rs rename to ebpf/aya-ebpf/src/programs/sockopt.rs diff --git a/ebpf/aya-bpf/src/programs/sysctl.rs b/ebpf/aya-ebpf/src/programs/sysctl.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/sysctl.rs rename to ebpf/aya-ebpf/src/programs/sysctl.rs diff --git a/ebpf/aya-bpf/src/programs/tc.rs b/ebpf/aya-ebpf/src/programs/tc.rs similarity index 97% rename from ebpf/aya-bpf/src/programs/tc.rs rename to ebpf/aya-ebpf/src/programs/tc.rs index cea62f71..60dd0f2f 100644 --- a/ebpf/aya-bpf/src/programs/tc.rs +++ b/ebpf/aya-ebpf/src/programs/tc.rs @@ -67,7 +67,7 @@ impl TcContext { /// ```no_run /// use core::mem; /// - /// use aya_bpf::{bindings::TC_ACT_PIPE, macros::map, maps::PerCpuArray, programs::TcContext}; + /// use aya_ebpf::{bindings::TC_ACT_PIPE, macros::map, maps::PerCpuArray, programs::TcContext}; /// # #[allow(non_camel_case_types)] /// # struct ethhdr {}; /// # #[allow(non_camel_case_types)] @@ -161,7 +161,7 @@ impl TcContext { /// # Examples /// /// ```no_run - /// use aya_bpf::programs::TcContext; + /// use aya_ebpf::programs::TcContext; /// # #[allow(non_camel_case_types)] /// # struct ethhdr {}; /// # #[allow(non_camel_case_types)] diff --git a/ebpf/aya-bpf/src/programs/tp_btf.rs b/ebpf/aya-ebpf/src/programs/tp_btf.rs similarity index 95% rename from ebpf/aya-bpf/src/programs/tp_btf.rs rename to ebpf/aya-ebpf/src/programs/tp_btf.rs index f8a1b989..ccefdbf1 100644 --- a/ebpf/aya-bpf/src/programs/tp_btf.rs +++ b/ebpf/aya-ebpf/src/programs/tp_btf.rs @@ -24,7 +24,7 @@ impl BtfTracePointContext { /// /// ```no_run /// # #![allow(dead_code)] - /// # use aya_bpf::{programs::BtfTracePointContext, cty::{c_int, c_ulong, c_char}}; + /// # use aya_ebpf::{programs::BtfTracePointContext, cty::{c_int, c_ulong, c_char}}; /// unsafe fn try_tp_btf_sched_process_fork(ctx: BtfTracePointContext) -> Result { /// // Grab arguments /// let parent_comm: *const c_char = ctx.arg(0); diff --git a/ebpf/aya-bpf/src/programs/tracepoint.rs b/ebpf/aya-ebpf/src/programs/tracepoint.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/tracepoint.rs rename to ebpf/aya-ebpf/src/programs/tracepoint.rs diff --git a/ebpf/aya-bpf/src/programs/xdp.rs b/ebpf/aya-ebpf/src/programs/xdp.rs similarity index 100% rename from ebpf/aya-bpf/src/programs/xdp.rs rename to ebpf/aya-ebpf/src/programs/xdp.rs diff --git a/ebpf/aya-log-ebpf/Cargo.toml b/ebpf/aya-log-ebpf/Cargo.toml index da28b2a1..a69c73f6 100644 --- a/ebpf/aya-log-ebpf/Cargo.toml +++ b/ebpf/aya-log-ebpf/Cargo.toml @@ -9,7 +9,7 @@ homepage.workspace = true edition.workspace = true [dependencies] -aya-bpf = { path = "../aya-bpf" } +aya-ebpf = { path = "../aya-ebpf" } aya-log-common = { path = "../../aya-log-common" } aya-log-ebpf-macros = { path = "../../aya-log-ebpf-macros" } diff --git a/ebpf/aya-log-ebpf/src/lib.rs b/ebpf/aya-log-ebpf/src/lib.rs index 5962c239..d546a406 100644 --- a/ebpf/aya-log-ebpf/src/lib.rs +++ b/ebpf/aya-log-ebpf/src/lib.rs @@ -2,8 +2,8 @@ #![warn(clippy::cast_lossless, clippy::cast_sign_loss)] #[cfg(target_arch = "bpf")] -use aya_bpf::macros::map; -use aya_bpf::maps::{PerCpuArray, PerfEventByteArray}; +use aya_ebpf::macros::map; +use aya_ebpf::maps::{PerCpuArray, PerfEventByteArray}; pub use aya_log_common::{write_record_header, Level, WriteToBuf, LOG_BUF_CAPACITY}; pub use aya_log_ebpf_macros::{debug, error, info, log, trace, warn}; diff --git a/test/integration-ebpf/Cargo.toml b/test/integration-ebpf/Cargo.toml index 785a3466..b4146daa 100644 --- a/test/integration-ebpf/Cargo.toml +++ b/test/integration-ebpf/Cargo.toml @@ -9,7 +9,7 @@ homepage.workspace = true edition.workspace = true [dependencies] -aya-bpf = { path = "../../ebpf/aya-bpf" } +aya-ebpf = { path = "../../ebpf/aya-ebpf" } aya-log-ebpf = { path = "../../ebpf/aya-log-ebpf" } [build-dependencies] diff --git a/test/integration-ebpf/src/bpf_probe_read.rs b/test/integration-ebpf/src/bpf_probe_read.rs index d86a6bba..87118198 100644 --- a/test/integration-ebpf/src/bpf_probe_read.rs +++ b/test/integration-ebpf/src/bpf_probe_read.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{ +use aya_ebpf::{ helpers::{bpf_probe_read_kernel_str_bytes, bpf_probe_read_user_str_bytes}, macros::{map, uprobe}, maps::Array, diff --git a/test/integration-ebpf/src/log.rs b/test/integration-ebpf/src/log.rs index 8b82f657..b4f71341 100644 --- a/test/integration-ebpf/src/log.rs +++ b/test/integration-ebpf/src/log.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{macros::uprobe, programs::ProbeContext}; +use aya_ebpf::{macros::uprobe, programs::ProbeContext}; use aya_log_ebpf::{debug, error, info, trace, warn}; #[uprobe] diff --git a/test/integration-ebpf/src/map_test.rs b/test/integration-ebpf/src/map_test.rs index b8a66fce..242207b8 100644 --- a/test/integration-ebpf/src/map_test.rs +++ b/test/integration-ebpf/src/map_test.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{ +use aya_ebpf::{ bindings::xdp_action, macros::{map, xdp}, maps::Array, diff --git a/test/integration-ebpf/src/name_test.rs b/test/integration-ebpf/src/name_test.rs index a9208e95..d1b48950 100644 --- a/test/integration-ebpf/src/name_test.rs +++ b/test/integration-ebpf/src/name_test.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; +use aya_ebpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; #[xdp] pub fn ihaveaverylongname(ctx: XdpContext) -> u32 { diff --git a/test/integration-ebpf/src/pass.rs b/test/integration-ebpf/src/pass.rs index 8de36333..795d82b0 100644 --- a/test/integration-ebpf/src/pass.rs +++ b/test/integration-ebpf/src/pass.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; +use aya_ebpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; // Note: the `frags` attribute causes this probe to be incompatible with kernel versions < 5.18.0. // See https://github.com/torvalds/linux/commit/c2f2cdb. diff --git a/test/integration-ebpf/src/redirect.rs b/test/integration-ebpf/src/redirect.rs index 41812cd0..83a44423 100644 --- a/test/integration-ebpf/src/redirect.rs +++ b/test/integration-ebpf/src/redirect.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{ +use aya_ebpf::{ bindings::xdp_action, macros::{map, xdp}, maps::{Array, CpuMap, DevMap, DevMapHash, XskMap}, diff --git a/test/integration-ebpf/src/relocations.rs b/test/integration-ebpf/src/relocations.rs index bfbcd1cd..de5bb0f9 100644 --- a/test/integration-ebpf/src/relocations.rs +++ b/test/integration-ebpf/src/relocations.rs @@ -3,7 +3,7 @@ use core::hint; -use aya_bpf::{ +use aya_ebpf::{ macros::{map, uprobe}, maps::Array, programs::ProbeContext, diff --git a/test/integration-ebpf/src/ring_buf.rs b/test/integration-ebpf/src/ring_buf.rs index ff9a21a0..66af6cef 100644 --- a/test/integration-ebpf/src/ring_buf.rs +++ b/test/integration-ebpf/src/ring_buf.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{ +use aya_ebpf::{ macros::{map, uprobe}, maps::{PerCpuArray, RingBuf}, programs::ProbeContext, diff --git a/test/integration-ebpf/src/test.rs b/test/integration-ebpf/src/test.rs index 8b0f5d79..40b0de87 100644 --- a/test/integration-ebpf/src/test.rs +++ b/test/integration-ebpf/src/test.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{ +use aya_ebpf::{ bindings::xdp_action, macros::{kprobe, tracepoint, uprobe, xdp}, programs::{ProbeContext, TracePointContext, XdpContext}, diff --git a/test/integration-ebpf/src/two_progs.rs b/test/integration-ebpf/src/two_progs.rs index 0e4b1f9a..17d08168 100644 --- a/test/integration-ebpf/src/two_progs.rs +++ b/test/integration-ebpf/src/two_progs.rs @@ -3,7 +3,7 @@ #![no_std] #![no_main] -use aya_bpf::{macros::tracepoint, programs::TracePointContext}; +use aya_ebpf::{macros::tracepoint, programs::TracePointContext}; #[tracepoint] pub fn test_tracepoint_one(_ctx: TracePointContext) -> u32 { diff --git a/test/integration-ebpf/src/xdp_sec.rs b/test/integration-ebpf/src/xdp_sec.rs index 5e64f56a..c9eed920 100644 --- a/test/integration-ebpf/src/xdp_sec.rs +++ b/test/integration-ebpf/src/xdp_sec.rs @@ -1,7 +1,7 @@ #![no_std] #![no_main] -use aya_bpf::{bindings::xdp_action::XDP_PASS, macros::xdp, programs::XdpContext}; +use aya_ebpf::{bindings::xdp_action::XDP_PASS, macros::xdp, programs::XdpContext}; macro_rules! probe { ($name:ident, ($($arg:ident $(= $value:literal)?),*) ) => { diff --git a/xtask/src/codegen/aya_ebpf_bindings.rs b/xtask/src/codegen/aya_ebpf_bindings.rs index 23189466..09f0d931 100644 --- a/xtask/src/codegen/aya_ebpf_bindings.rs +++ b/xtask/src/codegen/aya_ebpf_bindings.rs @@ -24,7 +24,7 @@ pub fn codegen(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyhow::E let builder = || { let mut bindgen = bindgen::bpf_builder() .header(&*dir.join("include/bindings.h").to_string_lossy()) - // aya-tool uses aya_bpf::cty. We can't use that here since aya-bpf + // aya-tool uses aya_ebpf::cty. We can't use that here since aya-bpf // depends on aya-ebpf-bindings so it would create a circular dep. .ctypes_prefix("::aya_ebpf_cty") .clang_args(&["-I", &*libbpf_dir.join("include/uapi").to_string_lossy()]) diff --git a/xtask/src/docs.rs b/xtask/src/docs.rs index 4acc6df1..df4f7170 100644 --- a/xtask/src/docs.rs +++ b/xtask/src/docs.rs @@ -8,7 +8,10 @@ use xtask::exec; pub fn docs(metadata: Metadata) -> Result<()> { const PACKAGE_TO_DESCRIPTION: &[(&str, &str)] = &[ ("aya", "User-space BPF program loading and manipulation"), - ("aya-bpf", "Kernel-space BPF program implementation toolkit"), + ( + "aya-ebpf", + "Kernel-space BPF program implementation toolkit", + ), ("aya-log-ebpf", "Kernel-space logging from BPF programs"), ( "aya-log",