Skip to content

Commit

Permalink
chore(aya-ebpf): Rename bpf -> ebpf
Browse files Browse the repository at this point in the history 
Signed-off-by: Dave Tucker <[email protected]>
  • Loading branch information
@dave-tucker
dave-tucker committed Mar 5, 2024
1 parent 70ac91d commit 41c6156
Show file tree
Hide file tree
Showing 89 changed files with 419 additions and 505 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions aya-bpf-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
6 changes: 3 additions & 3 deletions aya-bpf-macros/src/btf_tracepoint.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions aya-bpf-macros/src/cgroup_device.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions aya-bpf-macros/src/cgroup_skb.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions aya-bpf-macros/src/cgroup_sock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
52 changes: 26 additions & 26 deletions aya-bpf-macros/src/cgroup_sock_addr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions aya-bpf-macros/src/cgroup_sockopt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit 41c6156

Please sign in to comment.