Merge pull request #485 from MatteoNardi/remove_libbpf_dependency

Remove libbpf dependency from relocation tests

test/integration-test/src/tests/relocations.rs

@@ -27,7 +27,10 @@ fn relocate_field() {
         "#,
         relocation_code: r#"
             __u8 memory[] = {1, 2, 3, 4};
-            __u32 value = BPF_CORE_READ((struct foo *)&memory, c);
+            struct foo *ptr = (struct foo *) &memory;
+            bpf_probe_read_kernel(&value,
+                                  sizeof(__u8),
+                                  __builtin_preserve_access_index(&ptr->c));
         "#,
     }
     .build()
@@ -46,7 +49,8 @@ fn relocate_enum() {
             enum foo { D = 4 } e1;
         "#,
         relocation_code: r#"
-            __u32 value = bpf_core_enum_value(enum foo, D);
+            #define BPF_ENUMVAL_VALUE 1
+            value = __builtin_preserve_enum_value(*(typeof(enum foo) *)D, BPF_ENUMVAL_VALUE);
         "#,
     }
     .build()
@@ -68,8 +72,10 @@ fn relocate_pointer() {
         "#,
         relocation_code: r#"
             __u8 memory[] = {42, 0, 0, 0, 0, 0, 0, 0};
-            struct foo *f = BPF_CORE_READ((struct bar *)&memory, f);
+            struct bar* ptr = (struct bar *) &memory;
-            __u32 value = ((__u64) f);
+            bpf_probe_read_kernel(&value,
+                                  sizeof(void *),
+                                  __builtin_preserve_access_index(&ptr->f));
         "#,
     }
     .build()
@@ -114,27 +120,29 @@ impl RelocationTest {
             r#"
                 #include <linux/bpf.h>
 
-                #include <bpf/bpf_core_read.h>
+                static long (*bpf_map_update_elem)(void *map, const void *key, const void *value, __u64 flags) = (void *) 2;
-                #include <bpf/bpf_helpers.h>
+                static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 113;
-                #include <bpf/bpf_tracing.h>
 
                 {local_definition}
 
                 struct {{
-                  __uint(type, BPF_MAP_TYPE_ARRAY);
+                  int (*type)[BPF_MAP_TYPE_ARRAY];
-                  __type(key, __u32);
+                  __u32 *key;
-                  __type(value, __u32);
+                  __u32 *value;
-                  __uint(max_entries, 1);
+                  int (*max_entries)[1];
-                }} output_map SEC(".maps");
+                }} output_map
+                __attribute__((section(".maps"), used));
 
-                SEC("tracepoint/bpf_prog") int bpf_prog(void *ctx) {{
+                __attribute__((section("tracepoint/bpf_prog"), used))
+                int bpf_prog(void *ctx) {{
                   __u32 key = 0;
+                  __u32 value = 0;
                   {relocation_code}
                   bpf_map_update_elem(&output_map, &key, &value, BPF_ANY);
                   return 0;
                 }}
 
-                char _license[] SEC("license") = "GPL";
+                char _license[] __attribute__((section("license"), used)) = "GPL";
             "#
         ))
         .context("Failed to compile eBPF program")?;
@@ -157,12 +165,11 @@ impl RelocationTest {
             r#"
                 #include <linux/bpf.h>
 
-                #include <bpf/bpf_core_read.h>
+                static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 113;
-                #include <bpf/bpf_helpers.h>
-                #include <bpf/bpf_tracing.h>
 
                 {target_btf}
                 int main() {{
+                    __u32 value = 0;
                     // This is needed to make sure to emit BTF for the defined types,
                     // it could be dead code eliminated if we don't.
                     {relocation_code};
@@ -195,12 +202,6 @@ fn compile(source_code: &str) -> Result<(TempDir, PathBuf)> {
     Command::new("clang")
         .current_dir(&tmp_dir)
         .args(["-c", "-g", "-O2", "-target", "bpf"])
-        // NOTE: these tests depend on libbpf, LIBBPF_INCLUDE must point its headers.
-        // This is set automatically by the integration-test xtask.
-        .args([
-            "-I",
-            &std::env::var("LIBBPF_INCLUDE").context("LIBBPF_INCLUDE not set")?,
-        ])
         .arg(&source)
         .status()
         .context("Failed to run clang")?

test/run.sh

@@ -187,8 +187,5 @@ cargo xtask build-integration-test --musl --libbpf-dir "$1"
 scp_vm ../target/x86_64-unknown-linux-musl/debug/integration-test
 exec_vm sudo ./integration-test --skip relocations
 
-# Relocation tests build the eBPF programs and require libbpf. We run them outside VM.
+# Relocation tests build the eBPF programs themself. We run them outside VM.
-export LIBBPF_INCLUDE="${AYA_TMPDIR}/libbpf/"
-mkdir -p "$LIBBPF_INCLUDE"
-(cd "$1/src" && make INCLUDEDIR="$LIBBPF_INCLUDE" install_headers)
 sudo -E ../target/x86_64-unknown-linux-musl/debug/integration-test relocations

xtask/src/build_ebpf.rs

@@ -103,12 +103,6 @@ fn build_c_ebpf(opts: &BuildEbpfOptions) -> anyhow::Result<()> {
 
     let include_path = out_path.join("include");
     get_libbpf_headers(&opts.libbpf_dir, &include_path)?;
-    // Export libbpf location as an env variable since it's needed for building
-    // the relocation tests at test/integration-test/src/tests/relocations.rs
-    // We decided to make an exception and build its eBPF programs at run-time
-    // because of the many different permutations.
-    std::env::set_var("LIBBPF_INCLUDE", &include_path);
-
     let files = fs::read_dir(&src).unwrap();
     for file in files {
         let p = file.unwrap().path();