From 325391892c33fd92148951b5008cb53e7c1eaa31 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <vadorovsky@gmail.com>
Date: Mon, 3 Oct 2022 15:48:55 +0200
Subject: [PATCH] integration-test: Remove multimap C test

libbpf 1.0 doesn't support multimaps defined in `maps` section, it
supports only BTF maps.

At the same time, we already test multimaps loading with the Rust
example (`integration-ebpf/src/bpf/map_test.rs`), so we can just remove
the failing C test.

Signed-off-by: Michal Rostecki <vadorovsky@gmail.com>
---
 test/integration-ebpf/src/bpf/multimap.bpf.c | 47 --------------------
 test/integration-test/src/tests/load.rs      | 11 -----
 2 files changed, 58 deletions(-)
 delete mode 100644 test/integration-ebpf/src/bpf/multimap.bpf.c

diff --git a/test/integration-ebpf/src/bpf/multimap.bpf.c b/test/integration-ebpf/src/bpf/multimap.bpf.c
deleted file mode 100644
index 615935eb..00000000
--- a/test/integration-ebpf/src/bpf/multimap.bpf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <linux/bpf.h>
-#include <bpf/bpf_helpers.h>
-
-const int XDP_ACTION_MAX = (XDP_TX + 1);
-
-struct datarec {
-	__u64 rx_packets;
-};
-
-// stats keyed by XDP Action
-struct bpf_map_def SEC("maps") xdp_stats_map = {
-	.type        = BPF_MAP_TYPE_ARRAY,
-	.key_size    = sizeof(__u32),
-	.value_size  = sizeof(struct datarec),
-	.max_entries = XDP_ACTION_MAX,
-};
-
-// tracks number of times called
-struct bpf_map_def SEC("maps") prog_stats_map = {
-	.type        = BPF_MAP_TYPE_ARRAY,
-	.key_size    = sizeof(__u32),
-	.value_size  = sizeof(__u64),
-	.max_entries = 1,
-};
-
-SEC("xdp/stats")
-int  xdp_stats(struct xdp_md *ctx)
-{
-    __u64 *stats;
-	struct datarec *rec;
-	__u32 key = XDP_PASS;
-	__u32 k1 = 0;
-
-    stats = bpf_map_lookup_elem(&prog_stats_map, &k1);
-    if (!stats)
-        return XDP_ABORTED;
-    __sync_fetch_and_add(stats, 1);
-
-	rec = bpf_map_lookup_elem(&xdp_stats_map, &key);
-	if (!rec)
-		return XDP_ABORTED;
-	__sync_fetch_and_add(&rec->rx_packets, 1);
-	
-	return XDP_PASS;
-}
-
-char _license[] SEC("license") = "GPL";
diff --git a/test/integration-test/src/tests/load.rs b/test/integration-test/src/tests/load.rs
index 37ff0e8f..846ee8a9 100644
--- a/test/integration-test/src/tests/load.rs
+++ b/test/integration-test/src/tests/load.rs
@@ -27,17 +27,6 @@ fn long_name() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[integration_test]
-fn multiple_maps() -> anyhow::Result<()> {
-    let bytes =
-        include_bytes_aligned!("../../../../target/bpfel-unknown-none/debug/multimap.bpf.o");
-    let mut bpf = Bpf::load(bytes)?;
-    let pass: &mut Xdp = bpf.program_mut("stats").unwrap().try_into().unwrap();
-    pass.load().unwrap();
-    pass.attach("lo", XdpFlags::default()).unwrap();
-    Ok(())
-}
-
 #[integration_test]
 fn multiple_btf_maps() -> anyhow::Result<()> {
     let bytes =