diff --git a/Cargo.toml b/Cargo.toml index 9a260331..9812e45b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,9 @@ members = [ "aya-log-ebpf-macros", # ebpf crates - "bpf/aya-bpf", - "bpf/aya-bpf-bindings", - "bpf/aya-log-ebpf", + "ebpf/aya-bpf", + "ebpf/aya-bpf-bindings", + "ebpf/aya-log-ebpf", "test/integration-ebpf", ] diff --git a/aya-bpf-macros/Cargo.toml b/aya-bpf-macros/Cargo.toml index bf53a8a8..8135c1df 100644 --- a/aya-bpf-macros/Cargo.toml +++ b/aya-bpf-macros/Cargo.toml @@ -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-bpf = { path = "../ebpf/aya-bpf", version = "0.1.0", default-features = false } diff --git a/bpf/.cargo/config.toml b/ebpf/.cargo/config.toml similarity index 100% rename from bpf/.cargo/config.toml rename to ebpf/.cargo/config.toml diff --git a/bpf/aya-bpf-bindings/Cargo.toml b/ebpf/aya-bpf-bindings/Cargo.toml similarity index 100% rename from bpf/aya-bpf-bindings/Cargo.toml rename to ebpf/aya-bpf-bindings/Cargo.toml diff --git a/bpf/aya-bpf-bindings/build.rs b/ebpf/aya-bpf-bindings/build.rs similarity index 100% rename from bpf/aya-bpf-bindings/build.rs rename to ebpf/aya-bpf-bindings/build.rs diff --git a/bpf/aya-bpf-bindings/include/bindings.h b/ebpf/aya-bpf-bindings/include/bindings.h similarity index 100% rename from bpf/aya-bpf-bindings/include/bindings.h rename to ebpf/aya-bpf-bindings/include/bindings.h diff --git a/bpf/aya-bpf-bindings/src/aarch64/bindings.rs b/ebpf/aya-bpf-bindings/src/aarch64/bindings.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/aarch64/bindings.rs rename to ebpf/aya-bpf-bindings/src/aarch64/bindings.rs diff --git a/bpf/aya-bpf-bindings/src/aarch64/helpers.rs b/ebpf/aya-bpf-bindings/src/aarch64/helpers.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/aarch64/helpers.rs rename to ebpf/aya-bpf-bindings/src/aarch64/helpers.rs diff --git a/bpf/aya-bpf-bindings/src/aarch64/mod.rs b/ebpf/aya-bpf-bindings/src/aarch64/mod.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/aarch64/mod.rs rename to ebpf/aya-bpf-bindings/src/aarch64/mod.rs diff --git a/bpf/aya-bpf-bindings/src/armv7/bindings.rs b/ebpf/aya-bpf-bindings/src/armv7/bindings.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/armv7/bindings.rs rename to ebpf/aya-bpf-bindings/src/armv7/bindings.rs diff --git a/bpf/aya-bpf-bindings/src/armv7/helpers.rs b/ebpf/aya-bpf-bindings/src/armv7/helpers.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/armv7/helpers.rs rename to ebpf/aya-bpf-bindings/src/armv7/helpers.rs diff --git a/bpf/aya-bpf-bindings/src/armv7/mod.rs b/ebpf/aya-bpf-bindings/src/armv7/mod.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/armv7/mod.rs rename to ebpf/aya-bpf-bindings/src/armv7/mod.rs diff --git a/bpf/aya-bpf-bindings/src/lib.rs b/ebpf/aya-bpf-bindings/src/lib.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/lib.rs rename to ebpf/aya-bpf-bindings/src/lib.rs diff --git a/bpf/aya-bpf-bindings/src/riscv64/bindings.rs b/ebpf/aya-bpf-bindings/src/riscv64/bindings.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/riscv64/bindings.rs rename to ebpf/aya-bpf-bindings/src/riscv64/bindings.rs diff --git a/bpf/aya-bpf-bindings/src/riscv64/helpers.rs b/ebpf/aya-bpf-bindings/src/riscv64/helpers.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/riscv64/helpers.rs rename to ebpf/aya-bpf-bindings/src/riscv64/helpers.rs diff --git a/bpf/aya-bpf-bindings/src/riscv64/mod.rs b/ebpf/aya-bpf-bindings/src/riscv64/mod.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/riscv64/mod.rs rename to ebpf/aya-bpf-bindings/src/riscv64/mod.rs diff --git a/bpf/aya-bpf-bindings/src/x86_64/bindings.rs b/ebpf/aya-bpf-bindings/src/x86_64/bindings.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/x86_64/bindings.rs rename to ebpf/aya-bpf-bindings/src/x86_64/bindings.rs diff --git a/bpf/aya-bpf-bindings/src/x86_64/helpers.rs b/ebpf/aya-bpf-bindings/src/x86_64/helpers.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/x86_64/helpers.rs rename to ebpf/aya-bpf-bindings/src/x86_64/helpers.rs diff --git a/bpf/aya-bpf-bindings/src/x86_64/mod.rs b/ebpf/aya-bpf-bindings/src/x86_64/mod.rs similarity index 100% rename from bpf/aya-bpf-bindings/src/x86_64/mod.rs rename to ebpf/aya-bpf-bindings/src/x86_64/mod.rs diff --git a/bpf/aya-bpf-cty/.travis.yml b/ebpf/aya-bpf-cty/.travis.yml similarity index 100% rename from bpf/aya-bpf-cty/.travis.yml rename to ebpf/aya-bpf-cty/.travis.yml diff --git a/bpf/aya-bpf-cty/CHANGELOG.md b/ebpf/aya-bpf-cty/CHANGELOG.md similarity index 100% rename from bpf/aya-bpf-cty/CHANGELOG.md rename to ebpf/aya-bpf-cty/CHANGELOG.md diff --git a/bpf/aya-bpf-cty/Cargo.toml b/ebpf/aya-bpf-cty/Cargo.toml similarity index 100% rename from bpf/aya-bpf-cty/Cargo.toml rename to ebpf/aya-bpf-cty/Cargo.toml diff --git a/bpf/aya-bpf-cty/LICENSE-APACHE b/ebpf/aya-bpf-cty/LICENSE-APACHE similarity index 100% rename from bpf/aya-bpf-cty/LICENSE-APACHE rename to ebpf/aya-bpf-cty/LICENSE-APACHE diff --git a/bpf/aya-bpf-cty/LICENSE-MIT b/ebpf/aya-bpf-cty/LICENSE-MIT similarity index 100% rename from bpf/aya-bpf-cty/LICENSE-MIT rename to ebpf/aya-bpf-cty/LICENSE-MIT diff --git a/bpf/aya-bpf-cty/README.md b/ebpf/aya-bpf-cty/README.md similarity index 100% rename from bpf/aya-bpf-cty/README.md rename to ebpf/aya-bpf-cty/README.md diff --git a/bpf/aya-bpf-cty/build.rs b/ebpf/aya-bpf-cty/build.rs similarity index 100% rename from bpf/aya-bpf-cty/build.rs rename to ebpf/aya-bpf-cty/build.rs diff --git a/bpf/aya-bpf-cty/ci/install.sh b/ebpf/aya-bpf-cty/ci/install.sh similarity index 100% rename from bpf/aya-bpf-cty/ci/install.sh rename to ebpf/aya-bpf-cty/ci/install.sh diff --git a/bpf/aya-bpf-cty/ci/script.sh b/ebpf/aya-bpf-cty/ci/script.sh similarity index 100% rename from bpf/aya-bpf-cty/ci/script.sh rename to ebpf/aya-bpf-cty/ci/script.sh diff --git a/bpf/aya-bpf-cty/src/lib.rs b/ebpf/aya-bpf-cty/src/lib.rs similarity index 100% rename from bpf/aya-bpf-cty/src/lib.rs rename to ebpf/aya-bpf-cty/src/lib.rs diff --git a/bpf/aya-bpf/Cargo.toml b/ebpf/aya-bpf/Cargo.toml similarity index 100% rename from bpf/aya-bpf/Cargo.toml rename to ebpf/aya-bpf/Cargo.toml diff --git a/bpf/aya-bpf/build.rs b/ebpf/aya-bpf/build.rs similarity index 100% rename from bpf/aya-bpf/build.rs rename to ebpf/aya-bpf/build.rs diff --git a/bpf/aya-bpf/src/args.rs b/ebpf/aya-bpf/src/args.rs similarity index 100% rename from bpf/aya-bpf/src/args.rs rename to ebpf/aya-bpf/src/args.rs diff --git a/bpf/aya-bpf/src/helpers.rs b/ebpf/aya-bpf/src/helpers.rs similarity index 100% rename from bpf/aya-bpf/src/helpers.rs rename to ebpf/aya-bpf/src/helpers.rs diff --git a/bpf/aya-bpf/src/lib.rs b/ebpf/aya-bpf/src/lib.rs similarity index 100% rename from bpf/aya-bpf/src/lib.rs rename to ebpf/aya-bpf/src/lib.rs diff --git a/bpf/aya-bpf/src/maps/array.rs b/ebpf/aya-bpf/src/maps/array.rs similarity index 100% rename from bpf/aya-bpf/src/maps/array.rs rename to ebpf/aya-bpf/src/maps/array.rs diff --git a/bpf/aya-bpf/src/maps/bloom_filter.rs b/ebpf/aya-bpf/src/maps/bloom_filter.rs similarity index 100% rename from bpf/aya-bpf/src/maps/bloom_filter.rs rename to ebpf/aya-bpf/src/maps/bloom_filter.rs diff --git a/bpf/aya-bpf/src/maps/hash_map.rs b/ebpf/aya-bpf/src/maps/hash_map.rs similarity index 100% rename from bpf/aya-bpf/src/maps/hash_map.rs rename to ebpf/aya-bpf/src/maps/hash_map.rs diff --git a/bpf/aya-bpf/src/maps/lpm_trie.rs b/ebpf/aya-bpf/src/maps/lpm_trie.rs similarity index 100% rename from bpf/aya-bpf/src/maps/lpm_trie.rs rename to ebpf/aya-bpf/src/maps/lpm_trie.rs diff --git a/bpf/aya-bpf/src/maps/mod.rs b/ebpf/aya-bpf/src/maps/mod.rs similarity index 100% rename from bpf/aya-bpf/src/maps/mod.rs rename to ebpf/aya-bpf/src/maps/mod.rs diff --git a/bpf/aya-bpf/src/maps/per_cpu_array.rs b/ebpf/aya-bpf/src/maps/per_cpu_array.rs similarity index 100% rename from bpf/aya-bpf/src/maps/per_cpu_array.rs rename to ebpf/aya-bpf/src/maps/per_cpu_array.rs diff --git a/bpf/aya-bpf/src/maps/perf/mod.rs b/ebpf/aya-bpf/src/maps/perf/mod.rs similarity index 100% rename from bpf/aya-bpf/src/maps/perf/mod.rs rename to ebpf/aya-bpf/src/maps/perf/mod.rs diff --git a/bpf/aya-bpf/src/maps/perf/perf_event_array.rs b/ebpf/aya-bpf/src/maps/perf/perf_event_array.rs similarity index 100% rename from bpf/aya-bpf/src/maps/perf/perf_event_array.rs rename to ebpf/aya-bpf/src/maps/perf/perf_event_array.rs diff --git a/bpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs b/ebpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs similarity index 100% rename from bpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs rename to ebpf/aya-bpf/src/maps/perf/perf_event_byte_array.rs diff --git a/bpf/aya-bpf/src/maps/program_array.rs b/ebpf/aya-bpf/src/maps/program_array.rs similarity index 100% rename from bpf/aya-bpf/src/maps/program_array.rs rename to ebpf/aya-bpf/src/maps/program_array.rs diff --git a/bpf/aya-bpf/src/maps/queue.rs b/ebpf/aya-bpf/src/maps/queue.rs similarity index 100% rename from bpf/aya-bpf/src/maps/queue.rs rename to ebpf/aya-bpf/src/maps/queue.rs diff --git a/bpf/aya-bpf/src/maps/ring_buf.rs b/ebpf/aya-bpf/src/maps/ring_buf.rs similarity index 100% rename from bpf/aya-bpf/src/maps/ring_buf.rs rename to ebpf/aya-bpf/src/maps/ring_buf.rs diff --git a/bpf/aya-bpf/src/maps/sock_hash.rs b/ebpf/aya-bpf/src/maps/sock_hash.rs similarity index 100% rename from bpf/aya-bpf/src/maps/sock_hash.rs rename to ebpf/aya-bpf/src/maps/sock_hash.rs diff --git a/bpf/aya-bpf/src/maps/sock_map.rs b/ebpf/aya-bpf/src/maps/sock_map.rs similarity index 100% rename from bpf/aya-bpf/src/maps/sock_map.rs rename to ebpf/aya-bpf/src/maps/sock_map.rs diff --git a/bpf/aya-bpf/src/maps/stack.rs b/ebpf/aya-bpf/src/maps/stack.rs similarity index 100% rename from bpf/aya-bpf/src/maps/stack.rs rename to ebpf/aya-bpf/src/maps/stack.rs diff --git a/bpf/aya-bpf/src/maps/stack_trace.rs b/ebpf/aya-bpf/src/maps/stack_trace.rs similarity index 100% rename from bpf/aya-bpf/src/maps/stack_trace.rs rename to ebpf/aya-bpf/src/maps/stack_trace.rs diff --git a/bpf/aya-bpf/src/maps/xdp/cpu_map.rs b/ebpf/aya-bpf/src/maps/xdp/cpu_map.rs similarity index 100% rename from bpf/aya-bpf/src/maps/xdp/cpu_map.rs rename to ebpf/aya-bpf/src/maps/xdp/cpu_map.rs diff --git a/bpf/aya-bpf/src/maps/xdp/dev_map.rs b/ebpf/aya-bpf/src/maps/xdp/dev_map.rs similarity index 100% rename from bpf/aya-bpf/src/maps/xdp/dev_map.rs rename to ebpf/aya-bpf/src/maps/xdp/dev_map.rs diff --git a/bpf/aya-bpf/src/maps/xdp/dev_map_hash.rs b/ebpf/aya-bpf/src/maps/xdp/dev_map_hash.rs similarity index 100% rename from bpf/aya-bpf/src/maps/xdp/dev_map_hash.rs rename to ebpf/aya-bpf/src/maps/xdp/dev_map_hash.rs diff --git a/bpf/aya-bpf/src/maps/xdp/mod.rs b/ebpf/aya-bpf/src/maps/xdp/mod.rs similarity index 100% rename from bpf/aya-bpf/src/maps/xdp/mod.rs rename to ebpf/aya-bpf/src/maps/xdp/mod.rs diff --git a/bpf/aya-bpf/src/maps/xdp/xsk_map.rs b/ebpf/aya-bpf/src/maps/xdp/xsk_map.rs similarity index 100% rename from bpf/aya-bpf/src/maps/xdp/xsk_map.rs rename to ebpf/aya-bpf/src/maps/xdp/xsk_map.rs diff --git a/bpf/aya-bpf/src/programs/device.rs b/ebpf/aya-bpf/src/programs/device.rs similarity index 100% rename from bpf/aya-bpf/src/programs/device.rs rename to ebpf/aya-bpf/src/programs/device.rs diff --git a/bpf/aya-bpf/src/programs/fentry.rs b/ebpf/aya-bpf/src/programs/fentry.rs similarity index 100% rename from bpf/aya-bpf/src/programs/fentry.rs rename to ebpf/aya-bpf/src/programs/fentry.rs diff --git a/bpf/aya-bpf/src/programs/fexit.rs b/ebpf/aya-bpf/src/programs/fexit.rs similarity index 100% rename from bpf/aya-bpf/src/programs/fexit.rs rename to ebpf/aya-bpf/src/programs/fexit.rs diff --git a/bpf/aya-bpf/src/programs/lsm.rs b/ebpf/aya-bpf/src/programs/lsm.rs similarity index 100% rename from bpf/aya-bpf/src/programs/lsm.rs rename to ebpf/aya-bpf/src/programs/lsm.rs diff --git a/bpf/aya-bpf/src/programs/mod.rs b/ebpf/aya-bpf/src/programs/mod.rs similarity index 100% rename from bpf/aya-bpf/src/programs/mod.rs rename to ebpf/aya-bpf/src/programs/mod.rs diff --git a/bpf/aya-bpf/src/programs/perf_event.rs b/ebpf/aya-bpf/src/programs/perf_event.rs similarity index 100% rename from bpf/aya-bpf/src/programs/perf_event.rs rename to ebpf/aya-bpf/src/programs/perf_event.rs diff --git a/bpf/aya-bpf/src/programs/probe.rs b/ebpf/aya-bpf/src/programs/probe.rs similarity index 100% rename from bpf/aya-bpf/src/programs/probe.rs rename to ebpf/aya-bpf/src/programs/probe.rs diff --git a/bpf/aya-bpf/src/programs/raw_tracepoint.rs b/ebpf/aya-bpf/src/programs/raw_tracepoint.rs similarity index 100% rename from bpf/aya-bpf/src/programs/raw_tracepoint.rs rename to ebpf/aya-bpf/src/programs/raw_tracepoint.rs diff --git a/bpf/aya-bpf/src/programs/sk_buff.rs b/ebpf/aya-bpf/src/programs/sk_buff.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sk_buff.rs rename to ebpf/aya-bpf/src/programs/sk_buff.rs diff --git a/bpf/aya-bpf/src/programs/sk_lookup.rs b/ebpf/aya-bpf/src/programs/sk_lookup.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sk_lookup.rs rename to ebpf/aya-bpf/src/programs/sk_lookup.rs diff --git a/bpf/aya-bpf/src/programs/sk_msg.rs b/ebpf/aya-bpf/src/programs/sk_msg.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sk_msg.rs rename to ebpf/aya-bpf/src/programs/sk_msg.rs diff --git a/bpf/aya-bpf/src/programs/sock.rs b/ebpf/aya-bpf/src/programs/sock.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sock.rs rename to ebpf/aya-bpf/src/programs/sock.rs diff --git a/bpf/aya-bpf/src/programs/sock_addr.rs b/ebpf/aya-bpf/src/programs/sock_addr.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sock_addr.rs rename to ebpf/aya-bpf/src/programs/sock_addr.rs diff --git a/bpf/aya-bpf/src/programs/sock_ops.rs b/ebpf/aya-bpf/src/programs/sock_ops.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sock_ops.rs rename to ebpf/aya-bpf/src/programs/sock_ops.rs diff --git a/bpf/aya-bpf/src/programs/sockopt.rs b/ebpf/aya-bpf/src/programs/sockopt.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sockopt.rs rename to ebpf/aya-bpf/src/programs/sockopt.rs diff --git a/bpf/aya-bpf/src/programs/sysctl.rs b/ebpf/aya-bpf/src/programs/sysctl.rs similarity index 100% rename from bpf/aya-bpf/src/programs/sysctl.rs rename to ebpf/aya-bpf/src/programs/sysctl.rs diff --git a/bpf/aya-bpf/src/programs/tc.rs b/ebpf/aya-bpf/src/programs/tc.rs similarity index 100% rename from bpf/aya-bpf/src/programs/tc.rs rename to ebpf/aya-bpf/src/programs/tc.rs diff --git a/bpf/aya-bpf/src/programs/tp_btf.rs b/ebpf/aya-bpf/src/programs/tp_btf.rs similarity index 100% rename from bpf/aya-bpf/src/programs/tp_btf.rs rename to ebpf/aya-bpf/src/programs/tp_btf.rs diff --git a/bpf/aya-bpf/src/programs/tracepoint.rs b/ebpf/aya-bpf/src/programs/tracepoint.rs similarity index 100% rename from bpf/aya-bpf/src/programs/tracepoint.rs rename to ebpf/aya-bpf/src/programs/tracepoint.rs diff --git a/bpf/aya-bpf/src/programs/xdp.rs b/ebpf/aya-bpf/src/programs/xdp.rs similarity index 100% rename from bpf/aya-bpf/src/programs/xdp.rs rename to ebpf/aya-bpf/src/programs/xdp.rs diff --git a/bpf/aya-log-ebpf/Cargo.toml b/ebpf/aya-log-ebpf/Cargo.toml similarity index 100% rename from bpf/aya-log-ebpf/Cargo.toml rename to ebpf/aya-log-ebpf/Cargo.toml diff --git a/bpf/aya-log-ebpf/src/lib.rs b/ebpf/aya-log-ebpf/src/lib.rs similarity index 100% rename from bpf/aya-log-ebpf/src/lib.rs rename to ebpf/aya-log-ebpf/src/lib.rs diff --git a/bpf/rust-toolchain.toml b/ebpf/rust-toolchain.toml similarity index 100% rename from bpf/rust-toolchain.toml rename to ebpf/rust-toolchain.toml diff --git a/test/integration-ebpf/Cargo.toml b/test/integration-ebpf/Cargo.toml index ea7030a2..785a3466 100644 --- a/test/integration-ebpf/Cargo.toml +++ b/test/integration-ebpf/Cargo.toml @@ -9,8 +9,8 @@ homepage.workspace = true edition.workspace = true [dependencies] -aya-bpf = { path = "../../bpf/aya-bpf" } -aya-log-ebpf = { path = "../../bpf/aya-log-ebpf" } +aya-bpf = { path = "../../ebpf/aya-bpf" } +aya-log-ebpf = { path = "../../ebpf/aya-log-ebpf" } [build-dependencies] which = { workspace = true }