selftests/bpf: Fix compilation failure when CONFIG_NET_FOU!=y

Without CONFIG_NET_FOU bpf selftests are unable to build because of
missing definitions. Add ___local versions of struct bpf_fou_encap and
enum bpf_fou_encap_type to fix the issue.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240723071031.3389423-1-asavkov@redhat.com

diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
index 3f5abcf..32127f1 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
+++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c
@@ -26,6 +26,18 @@
  */
 #define ASSIGNED_ADDR_VETH1 0xac1001c8
 
+struct bpf_fou_encap___local {
+       __be16 sport;
+       __be16 dport;
+} __attribute__((preserve_access_index));
+
+enum bpf_fou_encap_type___local {
+       FOU_BPF_ENCAP_FOU___local,
+       FOU_BPF_ENCAP_GUE___local,
+};
+
+struct bpf_fou_encap;
+
 int bpf_skb_set_fou_encap(struct __sk_buff *skb_ctx,
                          struct bpf_fou_encap *encap, int type) __ksym;
 int bpf_skb_get_fou_encap(struct __sk_buff *skb_ctx,
@@ -745,7 +757,7 @@ SEC("tc")
 int ipip_gue_set_tunnel(struct __sk_buff *skb)
 {
        struct bpf_tunnel_key key = {};
-       struct bpf_fou_encap encap = {};
+       struct bpf_fou_encap___local encap = {};
        void *data = (void *)(long)skb->data;
        struct iphdr *iph = data;
        void *data_end = (void *)(long)skb->data_end;
@@ -769,7 +781,9 @@ int ipip_gue_set_tunnel(struct __sk_buff *skb)
        encap.sport = 0;
        encap.dport = bpf_htons(5555);
 
-       ret = bpf_skb_set_fou_encap(skb, &encap, FOU_BPF_ENCAP_GUE);
+       ret = bpf_skb_set_fou_encap(skb, (struct bpf_fou_encap *)&encap,
+                                   bpf_core_enum_value(enum bpf_fou_encap_type___local,
+                                                       FOU_BPF_ENCAP_GUE___local));
        if (ret < 0) {
                log_err(ret);
                return TC_ACT_SHOT;
@@ -782,7 +796,7 @@ SEC("tc")
 int ipip_fou_set_tunnel(struct __sk_buff *skb)
 {
        struct bpf_tunnel_key key = {};
-       struct bpf_fou_encap encap = {};
+       struct bpf_fou_encap___local encap = {};
        void *data = (void *)(long)skb->data;
        struct iphdr *iph = data;
        void *data_end = (void *)(long)skb->data_end;
@@ -806,7 +820,8 @@ int ipip_fou_set_tunnel(struct __sk_buff *skb)
        encap.sport = 0;
        encap.dport = bpf_htons(5555);
 
-       ret = bpf_skb_set_fou_encap(skb, &encap, FOU_BPF_ENCAP_FOU);
+       ret = bpf_skb_set_fou_encap(skb, (struct bpf_fou_encap *)&encap,
+                                   FOU_BPF_ENCAP_FOU___local);
        if (ret < 0) {
                log_err(ret);
                return TC_ACT_SHOT;
@@ -820,7 +835,7 @@ int ipip_encap_get_tunnel(struct __sk_buff *skb)
 {
        int ret;
        struct bpf_tunnel_key key = {};
-       struct bpf_fou_encap encap = {};
+       struct bpf_fou_encap___local encap = {};
 
        ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);
        if (ret < 0) {
@@ -828,7 +843,7 @@ int ipip_encap_get_tunnel(struct __sk_buff *skb)
                return TC_ACT_SHOT;
        }
 
-       ret = bpf_skb_get_fou_encap(skb, &encap);
+       ret = bpf_skb_get_fou_encap(skb, (struct bpf_fou_encap *)&encap);
        if (ret < 0) {
                log_err(ret);
                return TC_ACT_SHOT;