Merge pull request #528 from dave-tucker/rename-all-the-things

Rename Bpf -> Ebpf across all crates for consistency

Author: dave-tucker

.github/workflows/ci.yml

@@ -55,8 +55,8 @@ jobs:
         run: |
           set -euxo pipefail
           cargo hack miri test --all-targets --feature-powerset \
-            --exclude aya-bpf \
-            --exclude aya-bpf-bindings \
+            --exclude aya-ebpf \
+            --exclude aya-ebpf-bindings \
             --exclude aya-log-ebpf \
             --exclude integration-ebpf \
             --exclude integration-test \
@@ -92,8 +92,8 @@ jobs:
         run: |
           set -euxo pipefail
           cargo hack build --all-targets --feature-powerset \
-            --exclude aya-bpf \
-            --exclude aya-bpf-bindings \
+            --exclude aya-ebpf \
+            --exclude aya-ebpf-bindings \
             --exclude aya-log-ebpf \
             --exclude integration-ebpf \
             --workspace
@@ -104,8 +104,8 @@ jobs:
         run: |
           set -euxo pipefail
           cargo hack test --all-targets --feature-powerset \
-            --exclude aya-bpf \
-            --exclude aya-bpf-bindings \
+            --exclude aya-ebpf \
+            --exclude aya-ebpf-bindings \
             --exclude aya-log-ebpf \
             --exclude integration-ebpf \
             --exclude integration-test \
@@ -117,15 +117,15 @@ jobs:
         run: |
           set -euxo pipefail
           cargo hack test --doc --feature-powerset \
-            --exclude aya-bpf \
-            --exclude aya-bpf-bindings \
+            --exclude aya-ebpf \
+            --exclude aya-ebpf-bindings \
             --exclude aya-log-ebpf \
             --exclude init \
             --exclude integration-ebpf \
             --exclude integration-test \
             --workspace
 
-  build-test-aya-bpf:
+  build-test-aya-ebpf:
     strategy:
       fail-fast: false
       matrix:
@@ -158,7 +158,7 @@ jobs:
           CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.arch }}
         run: |
           set -euxo pipefail
-          cargo hack build --package aya-bpf --package aya-log-ebpf \
+          cargo hack build --package aya-ebpf --package aya-log-ebpf \
             --feature-powerset \
             --target ${{ matrix.target }} \
             -Z build-std=core
@@ -170,7 +170,7 @@ jobs:
         run: |
           set -euxo pipefail
           cargo hack test --doc \
-            --package aya-bpf \
+            --package aya-ebpf \
             --package aya-log-ebpf \
             --feature-powerset
 
@@ -305,7 +305,7 @@ jobs:
     needs:
       - lint
       - build-test-aya
-      - build-test-aya-bpf
+      - build-test-aya-ebpf
       - run-integration-test
     runs-on: ubuntu-latest
     steps:

.mergify.yml

@@ -52,7 +52,7 @@ pull_request_rules:
 
   - name: add labels for aya-bpf PRs
     conditions:
-      - files~=^(aya-bpf-macros|bpf/aya-bpf(-(cty|bindings))?)/
+      - files~=^(aya-ebpf-macros|ebpf/aya-ebpf(-(cty|bindings))?)/
     actions:
       label:
         add:
@@ -68,7 +68,7 @@ pull_request_rules:
 
   - name: add labels for aya-log-ebpf PRs
     conditions:
-      - files~=^(aya-log-common|bpf/aya-log-ebpf)/
+      - files~=^(aya-log-common|ebpf/aya-log-ebpf)/
     actions:
       label:
         add:

Cargo.toml

@@ -11,13 +11,13 @@ members = [
     "xtask",
 
     # macros
-    "aya-bpf-macros",
+    "aya-ebpf-macros",
     "aya-log-ebpf-macros",
 
     # ebpf crates
-    "bpf/aya-bpf",
-    "bpf/aya-bpf-bindings",
-    "bpf/aya-log-ebpf",
+    "ebpf/aya-ebpf",
+    "ebpf/aya-ebpf-bindings",
+    "ebpf/aya-log-ebpf",
     "test/integration-ebpf",
 ]
 
@@ -35,7 +35,7 @@ default-members = [
     # tests, and that doesn't work unless they've been built with `cargo xtask`.
     "xtask",
 
-    "aya-bpf-macros",
+    "aya-ebpf-macros",
     "aya-log-ebpf-macros",
 
     # ebpf crates are omitted; they must be built with:

README.md

@@ -74,14 +74,14 @@ use a `BPF_PROG_TYPE_CGROUP_SKB` program with aya:
 
 ```rust
 use std::fs::File;
-use aya::Bpf;
+use aya::Ebpf;
 use aya::programs::{CgroupSkb, CgroupSkbAttachType};
 
 // load the BPF code
-let mut bpf = Bpf::load_file("bpf.o")?;
+let mut ebpf = Ebpf::load_file("ebpf.o")?;
 
-// get the `ingress_filter` program compiled into `bpf.o`.
-let ingress: &mut CgroupSkb = bpf.program_mut("ingress_filter")?.try_into()?;
+// get the `ingress_filter` program compiled into `ebpf.o`.
+let ingress: &mut CgroupSkb = ebpf.program_mut("ingress_filter")?.try_into()?;
 
 // load the program into the kernel
 ingress.load()?;

aya-bpf-macros/Cargo.toml renamed to aya-ebpf-macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "aya-bpf-macros"
+name = "aya-ebpf-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 = "../bpf/aya-bpf", version = "0.1.0", default-features = false }
+aya-ebpf = { path = "../ebpf/aya-ebpf", version = "0.1.0", default-features = false }

aya-bpf-macros/src/args.rs renamed to aya-ebpf-macros/src/args.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 {

aya-bpf-macros/src/btf_tracepoint.rs renamed to aya-ebpf-macros/src/btf_tracepoint.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

aya-bpf-macros/src/cgroup_device.rs renamed to aya-ebpf-macros/src/cgroup_device.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

aya-bpf-macros/src/cgroup_skb.rs renamed to aya-ebpf-macros/src/cgroup_skb.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